]>
granicus.if.org Git - php/log
Nikita Popov [Mon, 7 Apr 2014 18:46:45 +0000 (20:46 +0200)]
Remove some usages of hashtable internals
Etienne Kneuss [Wed, 9 Apr 2014 09:36:36 +0000 (11:36 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Etienne Kneuss [Wed, 9 Apr 2014 09:28:49 +0000 (11:28 +0200)]
Updated NEWS
Joshua Thijssen [Wed, 12 Feb 2014 20:28:20 +0000 (21:28 +0100)]
fixed bug66702 : regexiterator's invert flag doesn't work as expected
Tjerk Meesters [Tue, 8 Apr 2014 23:36:34 +0000 (07:36 +0800)]
Updated NEWS for #67043
Tjerk Meesters [Tue, 8 Apr 2014 23:34:49 +0000 (07:34 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Tjerk Meesters [Tue, 8 Apr 2014 23:33:55 +0000 (07:33 +0800)]
Fixed bug 67043
Popa Adrian Marius [Tue, 8 Apr 2014 14:52:22 +0000 (17:52 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
cleanup
Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret
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
Popa Adrian Marius [Tue, 8 Apr 2014 12:29:32 +0000 (15:29 +0300)]
cleanup
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
Anatol Belski [Tue, 8 Apr 2014 09:43:32 +0000 (11:43 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libs versions
Anatol Belski [Tue, 8 Apr 2014 09:42:58 +0000 (11:42 +0200)]
updated libs versions
Anatol Belski [Mon, 7 Apr 2014 15:41:32 +0000 (17:41 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed the test for ICI >= 52.1
Anatol Belski [Mon, 7 Apr 2014 15:40:56 +0000 (17:40 +0200)]
fixed the test for ICI >= 52.1
Bob Weinand [Mon, 7 Apr 2014 15:14:38 +0000 (17:14 +0200)]
Fix Linux specific fail in error traces
Linux apparently does not like memcpy in overlapping regions...
Ferenc Kovacs [Mon, 7 Apr 2014 14:57:52 +0000 (16:57 +0200)]
add missing skip to the output, so we actually skip this test
Stanislav Malyshev [Sun, 6 Apr 2014 03:13:24 +0000 (20:13 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix the test according to how new date code does it
fix to work on different ICU versions
Stanislav Malyshev [Sun, 6 Apr 2014 03:09:53 +0000 (20:09 -0700)]
fix the test according to how new date code does it
Stanislav Malyshev [Sun, 6 Apr 2014 02:30:13 +0000 (19:30 -0700)]
fix to work on different ICU versions
Stanislav Malyshev [Sun, 6 Apr 2014 01:34:39 +0000 (18:34 -0700)]
multibytes tests still fail, put them in XFAIL
clean up XFAIL from tests no longer failing
Anatol Belski [Sat, 5 Apr 2014 07:49:51 +0000 (09:49 +0200)]
updated NEWS
Anatol Belski [Sat, 5 Apr 2014 07:48:54 +0000 (09:48 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fixed bug #66084 simplexml_load_string() mangles empty node name
Anatol Belski [Sat, 5 Apr 2014 07:48:20 +0000 (09:48 +0200)]
updated NEWS
Anatol Belski [Sat, 5 Apr 2014 07:47:14 +0000 (09:47 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #66084 simplexml_load_string() mangles empty node name
Anatol Belski [Sat, 5 Apr 2014 07:46:24 +0000 (09:46 +0200)]
Fixed bug #66084 simplexml_load_string() mangles empty node name
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
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
Stanislav Malyshev [Thu, 3 Apr 2014 22:53:43 +0000 (15:53 -0700)]
cleanup NEWS
Michael Wallner [Thu, 3 Apr 2014 08:41:45 +0000 (10:41 +0200)]
NEWS
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
Michael Wallner [Thu, 3 Apr 2014 08:40:42 +0000 (10:40 +0200)]
NEWS
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
Michael Wallner [Thu, 3 Apr 2014 08:40:06 +0000 (10:40 +0200)]
Fix Bug #66736 fpassthru broken
Michael Wallner [Thu, 3 Apr 2014 07:09:51 +0000 (09:09 +0200)]
NEWS
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
Michael Wallner [Thu, 3 Apr 2014 07:09:15 +0000 (09:09 +0200)]
NEWS
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
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.
Michael Wallner [Wed, 2 Apr 2014 13:39:07 +0000 (15:39 +0200)]
NEWS
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)
Michael Wallner [Wed, 2 Apr 2014 13:38:22 +0000 (15:38 +0200)]
NEWS
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)
Michael Wallner [Wed, 2 Apr 2014 13:36:39 +0000 (15:36 +0200)]
Fixed bug #61019 (Out of memory on command stream_get_contents)
Michael Wallner [Wed, 2 Apr 2014 09:14:34 +0000 (11:14 +0200)]
NEWS
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
Michael Wallner [Wed, 2 Apr 2014 09:13:21 +0000 (11:13 +0200)]
NEWS
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
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
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
Anatol Belski [Tue, 1 Apr 2014 08:14:38 +0000 (10:14 +0200)]
update NEWS
Anatol Belski [Tue, 1 Apr 2014 08:13:38 +0000 (10:13 +0200)]
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://"
Anatol Belski [Tue, 1 Apr 2014 08:12:56 +0000 (10:12 +0200)]
updated NEWS
Anatol Belski [Tue, 1 Apr 2014 08:12:06 +0000 (10:12 +0200)]
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://"
Anatol Belski [Tue, 1 Apr 2014 08:11:40 +0000 (10:11 +0200)]
updated NEWS
Anatol Belski [Tue, 1 Apr 2014 08:08:08 +0000 (10:08 +0200)]
added test for bug #53965
Anatol Belski [Tue, 1 Apr 2014 08:07:18 +0000 (10:07 +0200)]
Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"
Anatol Belski [Mon, 31 Mar 2014 15:24:15 +0000 (17:24 +0200)]
updated libmagic.patch
Remi Collet [Mon, 31 Mar 2014 14:58:10 +0000 (16:58 +0200)]
NEWS
Remi Collet [Mon, 31 Mar 2014 14:57:39 +0000 (16:57 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
Remi Collet [Mon, 31 Mar 2014 14:57:29 +0000 (16:57 +0200)]
NEWS
Remi Collet [Mon, 31 Mar 2014 14:57:12 +0000 (16:57 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
Remi Collet [Mon, 31 Mar 2014 14:57:02 +0000 (16:57 +0200)]
NEWS
Remi Collet [Mon, 31 Mar 2014 14:50:47 +0000 (16:50 +0200)]
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.
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
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
Anatol Belski [Thu, 27 Mar 2014 17:18:06 +0000 (18:18 +0100)]
update lib versions
Yasuo Ohgaki [Mon, 24 Mar 2014 02:04:35 +0000 (11:04 +0900)]
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.
Andrey Hristov [Wed, 26 Mar 2014 12:27:25 +0000 (14:27 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
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
Andrey Hristov [Wed, 26 Mar 2014 11:56:58 +0000 (13:56 +0200)]
Fix test
Derick Rethans [Tue, 25 Mar 2014 12:17:19 +0000 (12:17 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Tue, 25 Mar 2014 12:17:15 +0000 (12:17 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Tue, 25 Mar 2014 12:17:14 +0000 (12:17 +0000)]
- Updated to version 2014.2 (2014b)
Remi Collet [Tue, 25 Mar 2014 11:06:18 +0000 (12:06 +0100)]
fix merge issue
Tjerk Meesters [Tue, 25 Mar 2014 10:16:30 +0000 (18:16 +0800)]
Updated NEWS for #66834
Tjerk Meesters [Tue, 25 Mar 2014 10:15:18 +0000 (18:15 +0800)]
Call offsetGet() when called with isset() on ArrayObject derivatives
Remi Collet [Tue, 25 Mar 2014 10:04:49 +0000 (11:04 +0100)]
NEWS
Remi Collet [Tue, 25 Mar 2014 10:03:59 +0000 (11:03 +0100)]
Fix merge (5.6 already have file 5.17)
Remi Collet [Tue, 25 Mar 2014 10:01:56 +0000 (11:01 +0100)]
NEWS
Remi Collet [Tue, 25 Mar 2014 10:01:20 +0000 (11:01 +0100)]
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
Remi Collet [Tue, 25 Mar 2014 10:00:47 +0000 (11:00 +0100)]
NEWS
Remi Collet [Tue, 25 Mar 2014 10:00:33 +0000 (11:00 +0100)]
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.
Remi Collet [Tue, 25 Mar 2014 09:58:50 +0000 (10:58 +0100)]
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.
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
Anatol Belski [Tue, 25 Mar 2014 05:44:54 +0000 (06:44 +0100)]
fix disabling PGO for extensions, rel bug #65715
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
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
Anatol Belski [Mon, 24 Mar 2014 18:15:02 +0000 (19:15 +0100)]
more fixes related to bug #65715
Michael Wallner [Mon, 24 Mar 2014 16:51:50 +0000 (17:51 +0100)]
fix some warnings
Michael Wallner [Mon, 24 Mar 2014 16:48:28 +0000 (17:48 +0100)]
PHP-5.6 compatibility for apache2 filter SAPI
Anatol Belski [Mon, 24 Mar 2014 09:31:08 +0000 (10:31 +0100)]
updated NEWS
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
Anatol Belski [Mon, 24 Mar 2014 09:29:39 +0000 (10:29 +0100)]
updated NEWS
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
Anatol Belski [Mon, 24 Mar 2014 09:28:21 +0000 (10:28 +0100)]
updated NEWS
Anatol Belski [Mon, 24 Mar 2014 09:24:37 +0000 (10:24 +0100)]
Fixed bug #65715 php5embed.lib isn't provided anymore
Anatol Belski [Sat, 22 Mar 2014 09:44:01 +0000 (10:44 +0100)]
fix C89 compat
Andrey Hristov [Fri, 21 Mar 2014 12:33:44 +0000 (14:33 +0200)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Nikita Popov [Fri, 21 Mar 2014 00:32:49 +0000 (01:32 +0100)]
Revert "Add helper function for updating bucket contents"
Reverting this for now, because it would require further changes
thanks to the zend signals tsrms-but-only-sometimes awesomeness.