granicus.if.org Git

Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec

curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent
returned null. Now it returns an empty string fixing the incosistency

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 00:31:14 +0000 (17:31 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf

Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 00:03:28 +0000 (17:03 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix windows build

commit | commitdiff | tree

Stanislav Malyshev [Mon, 14 Apr 2014 00:02:21 +0000 (17:02 -0700)]

commit | commitdiff | tree

Stanislav Malyshev [Sun, 13 Apr 2014 22:54:26 +0000 (15:54 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #66721

commit | commitdiff | tree

Boro Sitnikovski [Mon, 17 Feb 2014 00:07:52 +0000 (01:07 +0100)]

Fix bug #66721

Add NULL check to php_date_parse_tzfile's retval

commit | commitdiff | tree

Stanislav Malyshev [Sun, 13 Apr 2014 22:37:19 +0000 (15:37 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce

fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce

commit | commitdiff | tree

Stanislav Malyshev [Sun, 13 Apr 2014 22:22:21 +0000 (15:22 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #67024 - getimagesize should recognize BMP files with negative height

Fixed bug #67024 - getimagesize should recognize BMP files with negative height

Merge branch 'PHP-5.4' into PHP-5.5

Reverted to 5a0da281e5a9fa02db18b4822d8b103c65849fa9
Discussion: http://news.php.net/php.cvs/76836

Merge branch 'PHP-5.4' into PHP-5.5

Forgot title in phpt for bug #67064

Merge branch 'PHP-5.4' into PHP-5.5

Fix bug #67064 in a BC safe way
You can use an optional parameter now when implementing the Countable interface
to get the $mode passed to count().

commit | commitdiff | tree

Ferenc Kovacs [Sat, 12 Apr 2014 23:56:47 +0000 (01:56 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix typo

commit | commitdiff | tree

Ferenc Kovacs [Sat, 12 Apr 2014 23:55:55 +0000 (01:55 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

Made usage of php_hash_environment useful by updating instead of just adding argc

commit | commitdiff | tree

Anatol Belski [Fri, 11 Apr 2014 09:00:10 +0000 (11:00 +0200)]

Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3

commit | commitdiff | tree

Popa Adrian Marius [Thu, 10 Apr 2014 14:43:09 +0000 (17:43 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Cleanup $ is not needed for git

commit | commitdiff | tree

Popa Adrian Marius [Thu, 10 Apr 2014 14:42:32 +0000 (17:42 +0300)]

Cleanup $ is not needed for git

commit | commitdiff | tree

Ferenc Kovacs [Thu, 10 Apr 2014 05:06:14 +0000 (07:06 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix typo

commit | commitdiff | tree

Ferenc Kovacs [Thu, 10 Apr 2014 05:05:55 +0000 (07:05 +0200)]

commit | commitdiff | tree

Ferenc Kovacs [Thu, 10 Apr 2014 05:05:07 +0000 (07:05 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
abstract namespace for unix sockets is a linux only feature

abstract namespace for unix sockets is a linux only feature

commit | commitdiff | tree

Tjerk Meesters [Wed, 9 Apr 2014 12:10:34 +0000 (20:10 +0800)]

Don't test for specific non-zero substr_compare() return value

commit | commitdiff | tree

Etienne Kneuss [Wed, 9 Apr 2014 09:28:49 +0000 (11:28 +0200)]

commit | commitdiff | tree

Joshua Thijssen [Wed, 12 Feb 2014 20:28:20 +0000 (21:28 +0100)]

fixed bug66702 : regexiterator's invert flag doesn't work as expected

commit | commitdiff | tree

Tjerk Meesters [Tue, 8 Apr 2014 23:33:55 +0000 (07:33 +0800)]

commit | commitdiff | tree

Popa Adrian Marius [Tue, 8 Apr 2014 14:51:54 +0000 (17:51 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
cleanup
Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret

commit | commitdiff | tree

Popa Adrian Marius [Tue, 8 Apr 2014 12:29:32 +0000 (15:29 +0300)]

commit | commitdiff | tree

Popa Adrian Marius [Tue, 8 Apr 2014 11:11:58 +0000 (14:11 +0300)]

Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret

updated libs versions

fixed the test for ICI >= 52.1

commit | commitdiff | tree

Stanislav Malyshev [Sun, 6 Apr 2014 03:09:53 +0000 (20:09 -0700)]

fix the test according to how new date code does it

commit | commitdiff | tree

Stanislav Malyshev [Sun, 6 Apr 2014 02:30:13 +0000 (19:30 -0700)]

fix to work on different ICU versions

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #66084 simplexml_load_string() mangles empty node name

Fixed bug #66084 simplexml_load_string() mangles empty node name

commit | commitdiff | tree

Stanislav Malyshev [Thu, 3 Apr 2014 22:56:46 +0000 (15:56 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
cleanup NEWS

commit | commitdiff | tree

Stanislav Malyshev [Thu, 3 Apr 2014 22:53:43 +0000 (15:53 -0700)]

commit | commitdiff | tree

Michael Wallner [Thu, 3 Apr 2014 08:40:42 +0000 (10:40 +0200)]

commit | commitdiff | tree

Michael Wallner [Thu, 3 Apr 2014 08:40:20 +0000 (10:40 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix Bug #66736 fpassthru broken

commit | commitdiff | tree

Michael Wallner [Thu, 3 Apr 2014 08:40:06 +0000 (10:40 +0200)]

Fix Bug #66736 fpassthru broken

commit | commitdiff | tree

Michael Wallner [Thu, 3 Apr 2014 07:09:15 +0000 (09:09 +0200)]

commit | commitdiff | tree

Michael Wallner [Thu, 3 Apr 2014 07:08:35 +0000 (09:08 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #66182 exit in stream filter produces segfault

commit | commitdiff | tree

Michael Wallner [Thu, 3 Apr 2014 07:07:35 +0000 (09:07 +0200)]

Fix bug #66182 exit in stream filter produces segfault

Unfortunately, a segv caused by exit cannot be tested reliably.

commit | commitdiff | tree

Michael Wallner [Wed, 2 Apr 2014 13:38:22 +0000 (15:38 +0200)]

commit | commitdiff | tree

Michael Wallner [Wed, 2 Apr 2014 13:37:50 +0000 (15:37 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #61019 (Out of memory on command stream_get_contents)

commit | commitdiff | tree

Michael Wallner [Wed, 2 Apr 2014 13:36:39 +0000 (15:36 +0200)]

Fixed bug #61019 (Out of memory on command stream_get_contents)

commit | commitdiff | tree

Michael Wallner [Wed, 2 Apr 2014 09:13:21 +0000 (11:13 +0200)]

commit | commitdiff | tree

Michael Wallner [Wed, 2 Apr 2014 09:10:59 +0000 (11:10 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #64330

commit | commitdiff | tree

Michael Wallner [Wed, 2 Apr 2014 09:09:26 +0000 (11:09 +0200)]

Fix bug #64330

stream_socket_server() creates wrong Abstract Namespace UNIX sockets

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS
  added test for bug #53965
  Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"

added test for bug #53965

Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)

Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)

On little endian:
map->p == php_magic_database
map->magic[i] = pointer into the map

map->p == NULL
map->magic[i] = pointer to allocated memory

On big endian (ppc64, s390x, ...):
map->p != php_magic_database and map->p != NULL
map->magic[i] = pointer into a copy of the map

Trying to efree pointer in the later cause memory corruption
Thanks to dkatulek / Red Hat for the report.

commit | commitdiff | tree

Anatol Belski [Thu, 27 Mar 2014 17:19:24 +0000 (18:19 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
update lib versions

Conflicts:
win32/build/libs_version.txt

commit | commitdiff | tree

Anatol Belski [Thu, 27 Mar 2014 17:18:06 +0000 (18:18 +0100)]

commit | commitdiff | tree

Andrey Hristov [Wed, 26 Mar 2014 11:57:13 +0000 (13:57 +0200)]

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

commit | commitdiff | tree

Andrey Hristov [Wed, 26 Mar 2014 11:56:58 +0000 (13:56 +0200)]

commit | commitdiff | tree

Derick Rethans [Tue, 25 Mar 2014 12:17:15 +0000 (12:17 +0000)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Derick Rethans [Tue, 25 Mar 2014 12:17:14 +0000 (12:17 +0000)]

- Updated to version 2014.2 (2014b)

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345

Fixed bug #66946 extensive backtracking in awk rule regular expression
CVE-2013-7345

Applied upstream patch:
https://github.com/file/file/commit/ef2329cf71acb59204dd981e2c6cce6c81fe467c

Add the magicdata.patch to track patches applied to upstream data file.