]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Thu, 20 Mar 2014 14:18:50 +0000 (15:18 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add info: empty strings are interned

11 years agoadd info: empty strings are interned
commit | commitdiff | tree
Remi Collet [Thu, 20 Mar 2014 14:18:41 +0000 (15:18 +0100)]
add info: empty strings are interned

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Yasuo Ohgaki [Thu, 20 Mar 2014 02:04:23 +0000 (11:04 +0900)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add default_charset handling

11 years agoAdd default_charset handling
commit | commitdiff | tree
Yasuo Ohgaki [Thu, 20 Mar 2014 01:49:23 +0000 (10:49 +0900)]
Add default_charset handling

11 years agoAdd default_charset handling
commit | commitdiff | tree
Yasuo Ohgaki [Thu, 20 Mar 2014 01:49:23 +0000 (10:49 +0900)]
Add default_charset handling

11 years agoUpdated UPGRADING to add three changes
commit | commitdiff | tree
Tjerk Meesters [Wed, 19 Mar 2014 23:44:23 +0000 (07:44 +0800)]
Updated UPGRADING to add three changes

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Christopher Jones [Wed, 19 Mar 2014 22:23:40 +0000 (15:23 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  OCI8: fix prototypes for oci_field_*().  They can take a column index or name.

11 years agoMerge branch 'oci_field_doc_prototype_fixes' into PHP-5.6
commit | commitdiff | tree
Christopher Jones [Wed, 19 Mar 2014 22:23:07 +0000 (15:23 -0700)]
Merge branch 'oci_field_doc_prototype_fixes' into PHP-5.6

* oci_field_doc_prototype_fixes:
  OCI8: fix prototypes for oci_field_*().  They can take a column index or name.

11 years agoOCI8: fix prototypes for oci_field_*(). They can take a column index or name.
commit | commitdiff | tree
Christopher Jones [Wed, 19 Mar 2014 22:20:40 +0000 (15:20 -0700)]
OCI8: fix prototypes for oci_field_*().  They can take a column index or name.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Christopher Jones [Wed, 19 Mar 2014 21:13:40 +0000 (14:13 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing

11 years agoChange test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel...
commit | commitdiff | tree
Christopher Jones [Wed, 19 Mar 2014 21:10:56 +0000 (14:10 -0700)]
Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Wed, 19 Mar 2014 17:15:15 +0000 (19:15 +0200)]
Merge branch 'PHP-5.6'

11 years agofix compilation error
commit | commitdiff | tree
Andrey Hristov [Wed, 19 Mar 2014 17:15:04 +0000 (19:15 +0200)]
fix compilation error

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Wed, 19 Mar 2014 16:55:40 +0000 (18:55 +0200)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Andrey Hristov [Wed, 19 Mar 2014 16:55:29 +0000 (18:55 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
NEWS

11 years agofix typo
commit | commitdiff | tree
Andrey Hristov [Wed, 19 Mar 2014 16:54:56 +0000 (18:54 +0200)]
fix typo

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Andrey Hristov [Wed, 19 Mar 2014 16:54:39 +0000 (18:54 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
NEWS
configure.in
ext/mysqli/mysqli_api.c
main/php_version.h

11 years agoFix problem with mysqli_commt()/mysqli_rollback()
commit | commitdiff | tree
Andrey Hristov [Wed, 19 Mar 2014 16:32:19 +0000 (18:32 +0200)]
Fix problem with mysqli_commt()/mysqli_rollback()

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Adam Harvey [Wed, 19 Mar 2014 13:25:06 +0000 (06:25 -0700)]
Merge branch 'PHP-5.6'

11 years agoRestore NEWS and UPGRADING for hash_equals().
commit | commitdiff | tree
Adam Harvey [Wed, 19 Mar 2014 13:24:01 +0000 (06:24 -0700)]
Restore NEWS and UPGRADING for hash_equals().

11 years ago5.5.11RC1 preparation
commit | commitdiff | tree
Julien Pauli [Wed, 19 Mar 2014 09:43:32 +0000 (10:43 +0100)]
5.5.11RC1 preparation

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 19 Mar 2014 09:14:32 +0000 (18:14 +0900)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding

11 years agoMerge branch 'pull-request/622' into PHP-5.6
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 19 Mar 2014 08:29:24 +0000 (17:29 +0900)]
Merge branch 'pull-request/622' into PHP-5.6

* pull-request/622:
  Fixed typo
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding

11 years agoFixed typo
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 19 Mar 2014 08:25:45 +0000 (17:25 +0900)]
Fixed typo

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Wed, 19 Mar 2014 06:25:32 +0000 (23:25 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  prep for 5.4.27 rc1

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Wed, 19 Mar 2014 06:25:08 +0000 (23:25 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  prep for 5.4.27 rc1

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Stanislav Malyshev [Wed, 19 Mar 2014 06:24:09 +0000 (23:24 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  prep for 5.4.27 rc1

Conflicts:
configure.in
main/php_version.h

11 years agoprep for 5.4.27 rc1
commit | commitdiff | tree
Stanislav Malyshev [Wed, 19 Mar 2014 06:14:18 +0000 (23:14 -0700)]
prep for 5.4.27 rc1

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Wed, 19 Mar 2014 05:38:18 +0000 (06:38 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  remove obsolete comment
  Fixes to various stream cast on win64

11 years agoremove obsolete comment
commit | commitdiff | tree
Anatol Belski [Wed, 19 Mar 2014 05:35:58 +0000 (06:35 +0100)]
remove obsolete comment

11 years agoFixes to various stream cast on win64
commit | commitdiff | tree
Anatol Belski [Wed, 19 Mar 2014 05:26:54 +0000 (06:26 +0100)]
Fixes to various stream cast on win64

This fixes further issues on win64 with casts from the streams.
Sockets/descriptors handling was unitized. This has an impact only on
win64, php_socket_t otherwise can be feed back to int datatype.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Adam Harvey [Tue, 18 Mar 2014 16:33:22 +0000 (09:33 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add hash_equals() to perform string comparisons that are not vulnerable to timing attacks.

11 years agoMerge accepted RFC https://wiki.php.net/rfc/timing_attack into 5.6.
commit | commitdiff | tree
Adam Harvey [Tue, 18 Mar 2014 16:22:13 +0000 (09:22 -0700)]
Merge accepted RFC https://wiki.php.net/rfc/timing_attack into 5.6.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Derick Rethans [Tue, 18 Mar 2014 15:02:27 +0000 (15:02 +0000)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Derick Rethans [Tue, 18 Mar 2014 15:02:25 +0000 (15:02 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Derick Rethans [Tue, 18 Mar 2014 14:48:56 +0000 (14:48 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years ago- Updated to version 2014.1 (2014a)
commit | commitdiff | tree
Derick Rethans [Tue, 18 Mar 2014 14:48:55 +0000 (14:48 +0000)]
- Updated to version 2014.1 (2014a)

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Andrey Hristov [Tue, 18 Mar 2014 14:19:34 +0000 (16:19 +0200)]
Merge branch 'PHP-5.6'

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Andrey Hristov [Tue, 18 Mar 2014 13:42:57 +0000 (15:42 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoAdd a test
commit | commitdiff | tree
Andrey Hristov [Tue, 18 Mar 2014 13:42:38 +0000 (15:42 +0200)]
Add a test

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Mateusz Kocielski [Tue, 18 Mar 2014 09:50:16 +0000 (10:50 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed wrong indentation

11 years agoFixed wrong indentation
commit | commitdiff | tree
Mateusz Kocielski [Tue, 18 Mar 2014 09:49:28 +0000 (10:49 +0100)]
Fixed wrong indentation

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Mateusz Kocielski [Tue, 18 Mar 2014 09:03:06 +0000 (10:03 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix phpdbg build on FreeBSD
  Fixed off-by-one in php_url_parse_ex

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Mateusz Kocielski [Tue, 18 Mar 2014 08:53:58 +0000 (09:53 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed off-by-one in php_url_parse_ex

11 years agoFix phpdbg build on FreeBSD
commit | commitdiff | tree
Mateusz Kocielski [Tue, 18 Mar 2014 08:51:39 +0000 (09:51 +0100)]
Fix phpdbg build on FreeBSD

Added missing netinet/in.h header.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Mateusz Kocielski [Tue, 18 Mar 2014 07:57:30 +0000 (08:57 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed off-by-one in php_url_parse_ex

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
Mateusz Kocielski [Tue, 18 Mar 2014 07:54:57 +0000 (08:54 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed off-by-one in php_url_parse_ex

Conflicts:
ext/standard/url.c

11 years agoFixed off-by-one in php_url_parse_ex
commit | commitdiff | tree
Mateusz Kocielski [Tue, 18 Mar 2014 07:48:41 +0000 (08:48 +0100)]
Fixed off-by-one in php_url_parse_ex

Change order of condition, previously pointer could be derefrenced before
bound check was done.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Yasuo Ohgaki [Mon, 17 Mar 2014 22:29:22 +0000 (07:29 +0900)]
Merge branch 'PHP-5.6'

* PHP-5.6:
 Modified php.ini-* description for encoding related changes

11 years agoFixed typo in UPGRADING and modified php.ini-* description for encoding related changes
commit | commitdiff | tree
Yasuo Ohgaki [Mon, 17 Mar 2014 22:27:45 +0000 (07:27 +0900)]
Fixed typo in UPGRADING and modified php.ini-* description for encoding related changes

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Nikita Popov [Mon, 17 Mar 2014 21:32:45 +0000 (22:32 +0100)]
Merge branch 'PHP-5.6'

11 years agoAdd support for PCRE marks
commit | commitdiff | tree
Nikita Popov [Fri, 28 Feb 2014 16:14:26 +0000 (17:14 +0100)]
Add support for PCRE marks

If a MARK is set then it will be returned in the $matches array
unter key "MARK". If no MARK is used or passed, the key will not
be set.

11 years agoUpdate UPGRADING.
commit | commitdiff | tree
Yasuo Ohgaki [Mon, 17 Mar 2014 20:45:01 +0000 (05:45 +0900)]
Update UPGRADING.
Add more descriptions about default_charset and encoding related changes.
Many thanks to Christopher.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Daniel Lowrey [Mon, 17 Mar 2014 14:03:54 +0000 (08:03 -0600)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Support async pgsql connections and non-blocking queries

11 years agoUPGRADING (openssl updates)
commit | commitdiff | tree
Daniel Lowrey [Mon, 17 Mar 2014 14:03:40 +0000 (08:03 -0600)]
UPGRADING (openssl updates)

11 years agoMerge branch 'pgsql-async' into PHP-5.6
commit | commitdiff | tree
Daniel Lowrey [Mon, 17 Mar 2014 12:45:37 +0000 (06:45 -0600)]
Merge branch 'pgsql-async' into PHP-5.6

* pgsql-async:
  Support async pgsql connections and non-blocking queries

11 years agoSupport async pgsql connections and non-blocking queries
commit | commitdiff | tree
Daniel Lowrey [Thu, 13 Mar 2014 18:55:33 +0000 (12:55 -0600)]
Support async pgsql connections and non-blocking queries

- New functions (each accepts a pgsql $connection resource):

  . pg_connect_poll
  . pg_socket
  . pg_consume_input
  . pg_flush

- Modified functions

  The following functions now additionally return zero if the
  underlying socket is set to non-blocking mode and the send
  operation does not complete immediately. Previously these
  functions returned only boolean TRUE/FALSE and blocked
  execution while polling until all data was sent:

  . pg_send_execute
  . pg_send_prepare
  . pg_send_query
  . pg_send_query_params

- New constants

  Used with pg_connect() to initiate an asynchronous connection
  attempt:

  . PGSQL_CONNECT_ASYNC

  Used with pg_connection_status() to determine the current state
  of an async connection attempt:

  . PGSQL_CONNECTION_STARTED
  . PGSQL_CONNECTION_MADE
  . PGSQL_CONNECTION_AWAITING_RESPONSE
  . PGSQL_CONNECTION_AUTH_OK
  . PGSQL_CONNECTION_SSL_STARTUP
  . PGSQL_CONNECTION_SETENV

  Used with pg_connect_poll() to determine the result of an
  async connection attempt:

  . PGSQL_POLLING_FAILED
  . PGSQL_POLLING_READING
  . PGSQL_POLLING_WRITING
  . PGSQL_POLLING_OK
  . PGSQL_POLLING_ACTIVE

- Polling via returned pg_socket() stream

  pg_socket() returns a read-only socket stream that may be
  cast to a file descriptor for select (and similar) polling
  operations. Blocking behavior of the pgsql connection socket
  can be controlled by calling stream_set_blocking() on the
  stream returned by pg_socket().

11 years agoAdd hash_equals() to perform string comparisons that are not vulnerable to timing...
commit | commitdiff | tree
Rouven Weßling [Sun, 10 Nov 2013 21:37:10 +0000 (22:37 +0100)]
Add hash_equals() to perform string comparisons that are not vulnerable to timing attacks.

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Stanislav Malyshev [Mon, 17 Mar 2014 08:20:31 +0000 (01:20 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #66873: check if obj->src is set

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Stanislav Malyshev [Mon, 17 Mar 2014 08:19:45 +0000 (01:19 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #66873: check if obj->src is set

11 years agoFix bug #66873: check if obj->src is set
commit | commitdiff | tree
Stanislav Malyshev [Mon, 17 Mar 2014 08:17:09 +0000 (01:17 -0700)]
Fix bug #66873: check if obj->src is set

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Sat, 15 Mar 2014 17:00:38 +0000 (18:00 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated to oniguruma to 5.9.5

11 years agoupdated NEWS
commit | commitdiff | tree
Anatol Belski [Sat, 15 Mar 2014 17:00:16 +0000 (18:00 +0100)]
updated NEWS

11 years agoupdated to oniguruma to 5.9.5
commit | commitdiff | tree
Anatol Belski [Sat, 15 Mar 2014 16:56:04 +0000 (17:56 +0100)]
updated to oniguruma to 5.9.5

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Fri, 14 Mar 2014 08:53:35 +0000 (09:53 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5
  Fix 5.5.10 NEWS

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Fri, 14 Mar 2014 08:53:11 +0000 (09:53 +0100)]
NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Remi Collet [Fri, 14 Mar 2014 08:52:47 +0000 (09:52 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5
  Fix 5.5.10 NEWS

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Fri, 14 Mar 2014 08:52:37 +0000 (09:52 +0100)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Remi Collet [Fri, 14 Mar 2014 08:52:02 +0000 (09:52 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Fri, 14 Mar 2014 08:51:53 +0000 (09:51 +0100)]
NEWS

11 years agoFixed Bug #66833 Default digest algo is still MD5
commit | commitdiff | tree
Remi Collet [Fri, 14 Mar 2014 08:50:15 +0000 (09:50 +0100)]
Fixed Bug #66833 Default digest algo is still MD5

Switch to SHA1, which match internal openssl hardcoded algo.

In most case, won't even be noticed
- priority on user input (default_md)
- fallback on system config
- fallback on this default value

Recent system reject MD5 digest, noticed in bug36732.phpt failure.

While SHA1 is better than MD5, SHA256 is recommenced,
and defined as default algo in provided configuration on
recent system (Fedora 21, RHEL-7, ...). But the idea is to
keep in sync with openssl internal value for PHP internal value.

11 years agoFix 5.5.10 NEWS
commit | commitdiff | tree
David Zülke [Thu, 13 Mar 2014 15:51:44 +0000 (16:51 +0100)]
Fix 5.5.10 NEWS

The FPM change didn't make it into 5.5.10 but will instead be in 5.5.11; http://php.net/Changelog-5.php, the release and the NEWS file in the release accurately reflect this, but the 5.5 branch NEWS doesn't (as the release was made and tagged from the last RC, which didn't contain that change yet).

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Lior Kaplan [Thu, 13 Mar 2014 10:43:15 +0000 (12:43 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Typo fix: sicret -> secret

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Lior Kaplan [Thu, 13 Mar 2014 10:41:48 +0000 (12:41 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Typo fix: sicret -> secret

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Lior Kaplan [Thu, 13 Mar 2014 10:40:14 +0000 (12:40 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Typo fix: sicret -> secret

11 years agoTypo fix: sicret -> secret
commit | commitdiff | tree
Michael Meyer [Thu, 13 Mar 2014 10:37:25 +0000 (12:37 +0200)]
Typo fix: sicret -> secret

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Thu, 13 Mar 2014 09:31:26 +0000 (10:31 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  updated libs_version.txt

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Thu, 13 Mar 2014 09:31:03 +0000 (10:31 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libs_version.txt

Conflicts:
win32/build/libs_version.txt

11 years agoupdated libs_version.txt
commit | commitdiff | tree
Anatol Belski [Thu, 13 Mar 2014 09:28:04 +0000 (10:28 +0100)]
updated libs_version.txt

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 12 Mar 2014 21:55:10 +0000 (06:55 +0900)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Remove unneeded test

11 years agoRemove unneeded test
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 12 Mar 2014 21:54:52 +0000 (06:54 +0900)]
Remove unneeded test

11 years agoUpdate NEWS
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 12 Mar 2014 21:34:46 +0000 (06:34 +0900)]
Update NEWS

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 12 Mar 2014 21:33:28 +0000 (06:33 +0900)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert "Implement Bug #54649 Create session_serializer_name()"
  Revert "Implemented Request #11100 (session_gc() function)."

11 years agoRevert "Implement Bug #54649 Create session_serializer_name()"
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 12 Mar 2014 21:32:49 +0000 (06:32 +0900)]
Revert "Implement Bug #54649 Create session_serializer_name()"

This reverts commit 678ec306557f61bf54b6df454387e7d9c3f50de5.

Conflicts:
ext/session/tests/session_serializer_name_basic.phpt

11 years agoRevert "Implemented Request #11100 (session_gc() function)."
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 12 Mar 2014 21:30:32 +0000 (06:30 +0900)]
Revert "Implemented Request #11100 (session_gc() function)."

This reverts commit 54a42f0d0cf85fe0c032009b1f601427ae1c8566.

Conflicts:
ext/session/tests/session_gc_basic.phpt

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Wed, 12 Mar 2014 18:31:21 +0000 (19:31 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  made libgd recognize the 9 version series

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Anatol Belski [Wed, 12 Mar 2014 18:31:07 +0000 (19:31 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  made libgd recognize the 9 version series

11 years agomade libgd recognize the 9 version series
commit | commitdiff | tree
Anatol Belski [Wed, 12 Mar 2014 18:30:27 +0000 (19:30 +0100)]
made libgd recognize the 9 version series

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Anatol Belski [Wed, 12 Mar 2014 18:25:44 +0000 (19:25 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix include search

11 years agofix include search
commit | commitdiff | tree
Anatol Belski [Wed, 12 Mar 2014 18:25:20 +0000 (19:25 +0100)]
fix include search

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 16:13:55 +0000 (17:13 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 16:13:47 +0000 (17:13 +0100)]
NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 16:13:31 +0000 (17:13 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 16:13:24 +0000 (17:13 +0100)]
NEWS

11 years agoFix bug #66887 imagescale - poor quality of scaled image
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 16:10:51 +0000 (17:10 +0100)]
Fix bug  #66887 imagescale - poor quality of scaled image

Issue with signed char overflow.

Upstream fix:
https://bitbucket.org/libgd/gd-libgd/commits/4b86e06937bc5ff116be969137f8da9d1a7869d5

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 14:36:52 +0000 (15:36 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  Fixed Bug #66893i imagescale ignore method argument

11 years agoNEWS
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 14:36:38 +0000 (15:36 +0100)]
NEWS

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 14:36:08 +0000 (15:36 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed Bug #66893i imagescale ignore method argument

11 years agoFixed Bug #66893i imagescale ignore method argument
commit | commitdiff | tree
Remi Collet [Wed, 12 Mar 2014 14:33:41 +0000 (15:33 +0100)]
Fixed Bug #66893i imagescale ignore method argument

We also have our goto fail; bug.

Upstream fix for libgd
https://bitbucket.org/libgd/gd-libgd/commits/5b42b1178c37ffd30c9a15733058656be0277da0

11 years agoMerge branch 'PHP-5.6'
commit | commitdiff | tree
Nikita Popov [Wed, 12 Mar 2014 13:17:27 +0000 (14:17 +0100)]
Merge branch 'PHP-5.6'

next
Unnamed repository; edit this file 'description' to name the repository.