granicus.if.org Git

Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #66084 simplexml_load_string() mangles empty node name

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated NEWS
Fixed bug #66084 simplexml_load_string() mangles empty node name

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

Kalle Sommer Nielsen [Sat, 5 Apr 2014 04:45:02 +0000 (06:45 +0200)]

Merge branch 'master' of https://git.php.net/push/php-src

commit | commitdiff | tree

Kalle Sommer Nielsen [Sat, 5 Apr 2014 04:43:41 +0000 (06:43 +0200)]

Remove call_user_method() and call_user_method_array() from master, long time deprecated in favour of call_user_func*().

commit | commitdiff | tree

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

Merge branch 'PHP-5.6'

* PHP-5.6:
cleanup NEWS

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
cleanup NEWS

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:41:53 +0000 (10:41 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  Fix Bug #66736 fpassthru broken

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
NEWS
Fix Bug #66736 fpassthru broken

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:10:02 +0000 (09:10 +0200)]

Merge branch 'PHP-5.6'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

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

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:39:16 +0000 (15:39 +0200)]

Merge branch 'PHP-5.6'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

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

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:15:11 +0000 (11:15 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
NEWS
NEWS

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
NEWS

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:11:39 +0000 (11:11 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix bug #64330

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug #64330

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.6'

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  updated NEWS
  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:
  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://"

commit | commitdiff | tree

Anatol Belski [Mon, 31 Mar 2014 15:24:53 +0000 (17:24 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
updated libmagic.patch

commit | commitdiff | tree

Anatol Belski [Mon, 31 Mar 2014 15:24:15 +0000 (17:24 +0200)]

updated libmagic.patch

Merge branch 'PHP-5.6'

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

Merge branch 'PHP-5.5' into PHP-5.6

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

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:20:17 +0000 (18:20 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
update lib versions

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
update lib versions

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)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Remove unneeded string copy. Allow to set ''(empty string values) internal/input/output_encoding for better compatibility. i.e. Runtime INI value changes. More compliance to the RFC. Improve/add encoding handling tests. i.e. Rather than set encoding automagic way, detect it.

Remove unneeded string copy.
Allow to set ''(empty string values) internal/input/output_encoding for better compatibility. i.e. Runtime INI value changes.
More compliance to the RFC. Improve/add encoding handling tests. i.e. Rather than set encoding automagic way, detect it.

commit | commitdiff | tree

Andrey Hristov [Wed, 26 Mar 2014 13:40:54 +0000 (15:40 +0200)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Andrey Hristov [Wed, 26 Mar 2014 12:27:25 +0000 (14:27 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

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:22 +0000 (12:17 +0000)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

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)

commit | commitdiff | tree

Tjerk Meesters [Tue, 25 Mar 2014 11:05:43 +0000 (19:05 +0800)]

Added TSRMLS_CC to zend_is_true() calls

commit | commitdiff | tree

Tjerk Meesters [Tue, 25 Mar 2014 10:19:42 +0000 (18:19 +0800)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Tjerk Meesters [Tue, 25 Mar 2014 10:16:30 +0000 (18:16 +0800)]

Updated NEWS for #66834

commit | commitdiff | tree

Tjerk Meesters [Tue, 25 Mar 2014 10:15:18 +0000 (18:15 +0800)]

Call offsetGet() when called with isset() on ArrayObject derivatives

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  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

Fix merge (5.6 already have file 5.17)

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.

commit | commitdiff | tree

Anatol Belski [Tue, 25 Mar 2014 05:46:25 +0000 (06:46 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix disabling PGO for extensions, rel bug #65715

commit | commitdiff | tree

Anatol Belski [Tue, 25 Mar 2014 05:46:06 +0000 (06:46 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix disabling PGO for extensions, rel bug #65715

commit | commitdiff | tree

Anatol Belski [Tue, 25 Mar 2014 05:44:54 +0000 (06:44 +0100)]

fix disabling PGO for extensions, rel bug #65715

commit | commitdiff | tree

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

Merge branch 'PHP-5.6'

* PHP-5.6:
more fixes related to bug #65715

commit | commitdiff | tree

Anatol Belski [Mon, 24 Mar 2014 18:19:06 +0000 (19:19 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
more fixes related to bug #65715

commit | commitdiff | tree

Anatol Belski [Mon, 24 Mar 2014 18:18:39 +0000 (19:18 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
more fixes related to bug #65715

commit | commitdiff | tree

Anatol Belski [Mon, 24 Mar 2014 18:15:02 +0000 (19:15 +0100)]

more fixes related to bug #65715

commit | commitdiff | tree

Michael Wallner [Mon, 24 Mar 2014 16:53:08 +0000 (17:53 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix some warnings
PHP-5.6 compatibility for apache2 filter SAPI

Fixes bug #66595

commit | commitdiff | tree

Michael Wallner [Mon, 24 Mar 2014 16:51:50 +0000 (17:51 +0100)]

commit | commitdiff | tree

Michael Wallner [Mon, 24 Mar 2014 16:48:28 +0000 (17:48 +0100)]

PHP-5.6 compatibility for apache2 filter SAPI

commit | commitdiff | tree

Anatol Belski [Mon, 24 Mar 2014 09:32:07 +0000 (10:32 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  updated NEWS
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore

commit | commitdiff | tree

Anatol Belski [Mon, 24 Mar 2014 09:31:08 +0000 (10:31 +0100)]

commit | commitdiff | tree

Anatol Belski [Mon, 24 Mar 2014 09:30:05 +0000 (10:30 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore

commit | commitdiff | tree

Anatol Belski [Mon, 24 Mar 2014 09:29:39 +0000 (10:29 +0100)]

commit | commitdiff | tree

Anatol Belski [Mon, 24 Mar 2014 09:28:48 +0000 (10:28 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
updated NEWS
Fixed bug #65715 php5embed.lib isn't provided anymore

commit | commitdiff | tree

Anatol Belski [Mon, 24 Mar 2014 09:28:21 +0000 (10:28 +0100)]

commit | commitdiff | tree

Anatol Belski [Mon, 24 Mar 2014 09:24:37 +0000 (10:24 +0100)]