Remi Collet
20b03c84ec
NEWS
2014-06-10 14:24:00 +02:00
Remi Collet
ff66c90af0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
2014-06-10 14:23:37 +02:00
Remi Collet
da5d40bae6
NEWS
2014-06-10 14:23:31 +02:00
Remi Collet
40ef6e07e0
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
...
Upstream:
40bade80cb
2014-06-10 14:22:04 +02:00
Remi Collet
59383273eb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
NEWS
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
2014-06-10 14:17:06 +02:00
Remi Collet
b999947dcd
NEWS
2014-06-10 14:16:58 +02:00
Remi Collet
1d6286c049
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
2014-06-10 14:16:39 +02:00
Remi Collet
9d0ca077ee
NEWS
2014-06-10 14:16:32 +02:00
Remi Collet
f6fee381be
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
2014-06-10 14:16:07 +02:00
Remi Collet
2b33a41162
NEWS
2014-06-10 14:16:00 +02:00
Remi Collet
5c9f967999
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
...
Upstream:
36fadd2984
2014-06-10 14:13:14 +02:00
Remi Collet
8cd184f14a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
NEWS
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
2014-06-10 14:05:44 +02:00
Remi Collet
7f8fa470f1
NEWS
2014-06-10 14:05:34 +02:00
Remi Collet
5e7cb43890
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
2014-06-10 14:05:02 +02:00
Remi Collet
da399ce6a8
NEWS
2014-06-10 14:04:52 +02:00
Remi Collet
18ff81eb1a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
2014-06-10 14:04:36 +02:00
Remi Collet
d02aa44090
NEWS
2014-06-10 14:04:27 +02:00
Remi Collet
e77659a8c8
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
...
Upstream
27a14bc7ba
2014-06-10 14:02:36 +02:00
Remi Collet
39885d0819
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
Fixed bug #67406 built-in web-server segfaults on startup
2014-06-10 10:39:10 +02:00
Remi Collet
e2493a3a08
fix merge from php 5.5 (already fixed, differently)
2014-06-10 10:38:39 +02:00
Remi Collet
d440bb3e68
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed bug #67406 built-in web-server segfaults on startup
2014-06-10 10:32:26 +02:00
Remi Collet
95fcf868d3
NEWS
2014-06-10 10:32:15 +02:00
Remi Collet
949cab09f2
NEWS
2014-06-10 10:31:17 +02:00
Remi Collet
58c6a08e00
Fixed bug #67406 built-in web-server segfaults on startup
...
Reproduce on aarch64.
From select man page:
"select() may update the timeout argument to indicate how much time was left."
So "const" is not ok.
2014-06-10 10:28:34 +02:00
Dmitry Stogov
eb9b0baaa9
Optimized for fast path
2014-06-10 01:58:28 +04:00
Dmitry Stogov
15ba03fc80
Avoid repeatable zend_is_autogolobal() calls
2014-06-10 00:16:18 +04:00
Dmitry Stogov
7c045c61f0
Optimized for fast path
2014-06-10 00:15:44 +04:00
Dmitry Stogov
9a9bb8877e
Improved ZTS support
2014-06-09 21:29:20 +04:00
Dmitry Stogov
371345bed6
Avoid reallocation
2014-06-09 17:36:37 +04:00
Ferenc Kovacs
ab074b408a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
enable phpdbg for the travis build, and also run the testsuite for it
2014-06-09 15:30:49 +02:00
Ferenc Kovacs
5ec5c80dc4
enable phpdbg for the travis build, and also run the testsuite for it
2014-06-09 15:30:09 +02:00
Dmitry Stogov
2d29f2d8d9
Comparison optimization
2014-06-09 17:00:22 +04:00
Dmitry Stogov
dbaef7c038
Avoid unnecessary memory allocation/deallocations and pcre calls
2014-06-09 15:42:32 +04:00
Dmitry Stogov
7bf4fa69be
Avoid extra function call on hot path
2014-06-09 15:41:29 +04:00
Bob Weinand
f0a9905759
Merge branch 'PHP-5.6'
2014-06-09 10:07:36 +02:00
Bob Weinand
6adc30028c
Merge sapi/phpdbg into PHP-5.6
2014-06-09 10:06:29 +02:00
Bob Weinand
158b03fdef
Finish fixing phpdbg on ZTS build
2014-06-09 09:49:21 +02:00
Stanislav Malyshev
857618161f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #67399 (putenv with empty variable may lead to crash)
Fixed bug #67399 (putenv with empty variable may lead to crash)
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:10:52 -07:00
Stanislav Malyshev
b060880c87
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:10:44 -07:00
Stanislav Malyshev
be133d4eeb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #67399 (putenv with empty variable may lead to crash)
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:10:11 -07:00
Stanislav Malyshev
336b5f59b6
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:10:04 -07:00
Stanislav Malyshev
954632e9ce
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:09:37 -07:00
Stanislav Malyshev
4b0b032676
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:09:31 -07:00
Stanislav Malyshev
62857998c5
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:09:09 -07:00
Matteo Beccati
8cfdf20ccf
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
...
DOMDocument::substituteEntities needs to be set to true in order for
external entities to be parsed.
2014-06-09 07:08:04 +02:00
Matteo Beccati
106b6faa7a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
2014-06-09 07:07:28 +02:00
Matteo Beccati
6eaadc0228
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
2014-06-09 07:07:17 +02:00
Matteo Beccati
af5057bea7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
2014-06-09 07:07:07 +02:00
Matteo Beccati
5c8c57aa6c
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
...
DOMDocument::substituteEntities needs to be set to true in order for
external entities to be parsed.
2014-06-09 07:05:23 +02:00
Stanislav Malyshev
d3eac6399b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update news
add news
Bug 49898 __getCookies() method implementation
2014-06-08 19:47:59 -07:00