]>
granicus.if.org Git - php/log
Dmitry Stogov [Mon, 16 Jun 2014 17:49:46 +0000 (21:49 +0400)]
Optimize out useles paths
Dmitry Stogov [Mon, 16 Jun 2014 17:11:52 +0000 (21:11 +0400)]
Use new zend_hash iteration API
Dmitry Stogov [Mon, 16 Jun 2014 09:25:23 +0000 (13:25 +0400)]
Small call/return improvement
Dmitry Stogov [Mon, 16 Jun 2014 09:08:48 +0000 (13:08 +0400)]
Fixed support for references
Xinchen Hui [Mon, 16 Jun 2014 06:59:03 +0000 (14:59 +0800)]
Refactoring imap (in progress)
Dmitry Stogov [Thu, 12 Jun 2014 09:01:44 +0000 (13:01 +0400)]
Fixed reference counting
Dmitry Stogov [Thu, 12 Jun 2014 01:07:33 +0000 (05:07 +0400)]
Merge branch 'master' into phpng
* master: (77 commits)
NEWS entry for Fix potential segfault in dns_get_record()
NEWS entry for "Fix potential segfault in dns_get_record()"
NEWS entry for Fix potential segfault in dns_get_record(
Fix potential segfault in dns_get_record()
Revert "Add optional second arg to unserialize()"
5.5.15 now
update NEWS
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
Fix broken test.
Add a mime type map generation script and update the header.
Move the mime type map out of php_cli_server.c for easier generation.
Replace the CLI server's linear search for extensions with a hash table.
fix test
Remove unused included file
NEWS
NEWS
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
...
Conflicts:
Zend/zend_closures.c
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/spl/spl_array.c
ext/standard/basic_functions.c
ext/standard/dns.c
ext/standard/var.c
Dmitry Stogov [Wed, 11 Jun 2014 23:14:57 +0000 (03:14 +0400)]
Fixed reference handling
Adam Harvey [Wed, 11 Jun 2014 21:44:07 +0000 (21:44 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS entry for Fix potential segfault in dns_get_record()
NEWS entry for "Fix potential segfault in dns_get_record()"
NEWS entry for Fix potential segfault in dns_get_record(
5.5.15 now
Adam Harvey [Wed, 11 Jun 2014 21:43:39 +0000 (21:43 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS entry for "Fix potential segfault in dns_get_record()"
NEWS entry for Fix potential segfault in dns_get_record(
5.5.15 now
Conflicts:
configure.in
main/php_version.h
Adam Harvey [Wed, 11 Jun 2014 21:42:26 +0000 (21:42 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS entry for "Fix potential segfault in dns_get_record()"
Sara Golemon [Wed, 11 Jun 2014 21:24:50 +0000 (14:24 -0700)]
NEWS entry for Fix potential segfault in dns_get_record()
Sara Golemon [Wed, 11 Jun 2014 21:20:36 +0000 (14:20 -0700)]
NEWS entry for "Fix potential segfault in dns_get_record()"
Sara Golemon [Wed, 11 Jun 2014 21:22:59 +0000 (14:22 -0700)]
NEWS entry for Fix potential segfault in dns_get_record(
Dmitry Stogov [Wed, 11 Jun 2014 20:57:10 +0000 (00:57 +0400)]
Fixed call to mysqli_init() from an object. (We should find some better fix)
Sara Golemon [Wed, 11 Jun 2014 20:53:59 +0000 (13:53 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix potential segfault in dns_get_record()
Sara Golemon [Wed, 11 Jun 2014 20:51:53 +0000 (13:51 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix potential segfault in dns_get_record()
Sara Golemon [Wed, 11 Jun 2014 20:37:40 +0000 (13:37 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix potential segfault in dns_get_record()
Sara Golemon [Tue, 10 Jun 2014 18:18:02 +0000 (11:18 -0700)]
Fix potential segfault in dns_get_record()
If the remote sends us a packet with a malformed TXT record,
we could end up trying to over-consume the packet and wander
off into overruns.
Dmitry Stogov [Wed, 11 Jun 2014 20:33:43 +0000 (00:33 +0400)]
Fixed error messages
Ferenc Kovacs [Wed, 11 Jun 2014 12:59:39 +0000 (14:59 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Revert "Add optional second arg to unserialize()"
Ferenc Kovacs [Wed, 11 Jun 2014 12:43:09 +0000 (14:43 +0200)]
Revert "Add optional second arg to unserialize()"
This reverts commit
cfd104582220d578ab1b78a5991065d038e1f931 .
Dmitry Stogov [Wed, 11 Jun 2014 11:11:29 +0000 (15:11 +0400)]
Improved assignment code
Julien Pauli [Wed, 11 Jun 2014 08:21:26 +0000 (10:21 +0200)]
5.5.15 now
Dmitry Stogov [Wed, 11 Jun 2014 07:39:42 +0000 (11:39 +0400)]
Use absolute addresses as branch targets for NEW, FE_RESET and FE_FETCH
Stanislav Malyshev [Wed, 11 Jun 2014 06:25:01 +0000 (23:25 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update NEWS
Stanislav Malyshev [Wed, 11 Jun 2014 06:24:02 +0000 (23:24 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
Stanislav Malyshev [Wed, 11 Jun 2014 06:23:37 +0000 (23:23 -0700)]
update NEWS
Stanislav Malyshev [Wed, 11 Jun 2014 06:21:17 +0000 (23:21 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Stanislav Malyshev [Wed, 11 Jun 2014 06:20:07 +0000 (23:20 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Stanislav Malyshev [Wed, 11 Jun 2014 06:19:21 +0000 (23:19 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Wed, 11 Jun 2014 06:17:30 +0000 (23:17 -0700)]
Fix bug #66127 (Segmentation fault with ArrayObject unset)
Stanislav Malyshev [Wed, 11 Jun 2014 06:03:40 +0000 (23:03 -0700)]
5.4.31 next
Adam Harvey [Wed, 11 Jun 2014 00:31:04 +0000 (00:31 +0000)]
Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
Adam Harvey [Wed, 11 Jun 2014 00:22:13 +0000 (00:22 +0000)]
Fix broken test.
Adam Harvey [Wed, 11 Jun 2014 00:19:49 +0000 (00:19 +0000)]
Add a mime type map generation script and update the header.
Adam Harvey [Wed, 11 Jun 2014 00:18:33 +0000 (00:18 +0000)]
Move the mime type map out of php_cli_server.c for easier generation.
Adam Harvey [Tue, 10 Jun 2014 23:56:53 +0000 (23:56 +0000)]
Replace the CLI server's linear search for extensions with a hash table.
This doesn't make a statistically significant performance impact either way
today, but gives us more scope to grow the MIME type list.
Dmitry Stogov [Tue, 10 Jun 2014 22:46:50 +0000 (02:46 +0400)]
Improved conditions order
Stanislav Malyshev [Tue, 10 Jun 2014 21:25:49 +0000 (14:25 -0700)]
fix test
Xinchen Hui [Tue, 10 Jun 2014 13:58:31 +0000 (21:58 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Tue, 10 Jun 2014 13:58:16 +0000 (21:58 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
Zend/zend_execute_API.c
Xinchen Hui [Tue, 10 Jun 2014 13:56:30 +0000 (21:56 +0800)]
Remove unused included file
Xinchen Hui [Tue, 10 Jun 2014 13:53:46 +0000 (21:53 +0800)]
Remove unused codes
Remi Collet [Tue, 10 Jun 2014 12:36:38 +0000 (14:36 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
Remi Collet [Tue, 10 Jun 2014 12:36:31 +0000 (14:36 +0200)]
NEWS
Remi Collet [Tue, 10 Jun 2014 12:36:02 +0000 (14:36 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
Remi Collet [Tue, 10 Jun 2014 12:35:57 +0000 (14:35 +0200)]
NEWS
Remi Collet [Tue, 10 Jun 2014 12:35:23 +0000 (14:35 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
Remi Collet [Tue, 10 Jun 2014 12:35:14 +0000 (14:35 +0200)]
NEWS
Remi Collet [Tue, 10 Jun 2014 12:33:37 +0000 (14:33 +0200)]
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
Upstream:
https://github.com/file/file/commit/
93e063ee374b6a75729df9e7201fb511e47e259d
Adapted for C standard.
Remi Collet [Tue, 10 Jun 2014 12:24:28 +0000 (14:24 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
NEWS
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
Remi Collet [Tue, 10 Jun 2014 12:24:22 +0000 (14:24 +0200)]
NEWS
Remi Collet [Tue, 10 Jun 2014 12:24:07 +0000 (14:24 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
Remi Collet [Tue, 10 Jun 2014 12:24:00 +0000 (14:24 +0200)]
NEWS
Remi Collet [Tue, 10 Jun 2014 12:23:37 +0000 (14:23 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
Remi Collet [Tue, 10 Jun 2014 12:23:31 +0000 (14:23 +0200)]
NEWS
Remi Collet [Tue, 10 Jun 2014 12:22:04 +0000 (14:22 +0200)]
Bug #67412 fileinfo: cdf_count_chain insufficient boundary check
Upstream:
https://github.com/file/file/commit/
40bade80cbe2af1d0b2cd0420cebd5d5905a2382
Remi Collet [Tue, 10 Jun 2014 12:17:06 +0000 (14:17 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
NEWS
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
Remi Collet [Tue, 10 Jun 2014 12:16:58 +0000 (14:16 +0200)]
NEWS
Remi Collet [Tue, 10 Jun 2014 12:16:39 +0000 (14:16 +0200)]
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
Remi Collet [Tue, 10 Jun 2014 12:16:32 +0000 (14:16 +0200)]
NEWS
Remi Collet [Tue, 10 Jun 2014 12:16:07 +0000 (14:16 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
Remi Collet [Tue, 10 Jun 2014 12:16:00 +0000 (14:16 +0200)]
NEWS
Remi Collet [Tue, 10 Jun 2014 12:13:14 +0000 (14:13 +0200)]
Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary check
Upstream:
https://github.com/file/file/commit/
36fadd29849b8087af9f4586f89dbf74ea45be67
Remi Collet [Tue, 10 Jun 2014 12:05:44 +0000 (14:05 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
NEWS
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
Remi Collet [Tue, 10 Jun 2014 12:05:34 +0000 (14:05 +0200)]
NEWS
Remi Collet [Tue, 10 Jun 2014 12:05:02 +0000 (14:05 +0200)]
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
Remi Collet [Tue, 10 Jun 2014 12:04:52 +0000 (14:04 +0200)]
NEWS
Remi Collet [Tue, 10 Jun 2014 12:04:36 +0000 (14:04 +0200)]
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
Remi Collet [Tue, 10 Jun 2014 12:04:27 +0000 (14:04 +0200)]
NEWS
Remi Collet [Tue, 10 Jun 2014 12:02:36 +0000 (14:02 +0200)]
Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
Upstream
https://github.com/file/file/commit/
27a14bc7ba285a0a5ebfdb55e54001aa11932b08
Remi Collet [Tue, 10 Jun 2014 08:39:10 +0000 (10:39 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
Fixed bug #67406 built-in web-server segfaults on startup
Remi Collet [Tue, 10 Jun 2014 08:38:39 +0000 (10:38 +0200)]
fix merge from php 5.5 (already fixed, differently)
Remi Collet [Tue, 10 Jun 2014 08:32:26 +0000 (10:32 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fixed bug #67406 built-in web-server segfaults on startup
Remi Collet [Tue, 10 Jun 2014 08:32:15 +0000 (10:32 +0200)]
NEWS
Remi Collet [Tue, 10 Jun 2014 08:31:17 +0000 (10:31 +0200)]
NEWS
Remi Collet [Tue, 10 Jun 2014 08:28:34 +0000 (10:28 +0200)]
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.
Dmitry Stogov [Mon, 9 Jun 2014 21:58:28 +0000 (01:58 +0400)]
Optimized for fast path
Dmitry Stogov [Mon, 9 Jun 2014 20:16:18 +0000 (00:16 +0400)]
Avoid repeatable zend_is_autogolobal() calls
Dmitry Stogov [Mon, 9 Jun 2014 20:15:44 +0000 (00:15 +0400)]
Optimized for fast path
Dmitry Stogov [Mon, 9 Jun 2014 17:29:20 +0000 (21:29 +0400)]
Improved ZTS support
Dmitry Stogov [Mon, 9 Jun 2014 13:36:37 +0000 (17:36 +0400)]
Avoid reallocation
Ferenc Kovacs [Mon, 9 Jun 2014 13:30:49 +0000 (15:30 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
enable phpdbg for the travis build, and also run the testsuite for it
Ferenc Kovacs [Mon, 9 Jun 2014 13:30:09 +0000 (15:30 +0200)]
enable phpdbg for the travis build, and also run the testsuite for it
Dmitry Stogov [Mon, 9 Jun 2014 13:00:22 +0000 (17:00 +0400)]
Comparison optimization
Dmitry Stogov [Mon, 9 Jun 2014 11:42:32 +0000 (15:42 +0400)]
Avoid unnecessary memory allocation/deallocations and pcre calls
Dmitry Stogov [Mon, 9 Jun 2014 11:41:29 +0000 (15:41 +0400)]
Avoid extra function call on hot path
Bob Weinand [Mon, 9 Jun 2014 08:07:36 +0000 (10:07 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Mon, 9 Jun 2014 08:06:29 +0000 (10:06 +0200)]
Merge sapi/phpdbg into PHP-5.6
Bob Weinand [Mon, 9 Jun 2014 07:49:21 +0000 (09:49 +0200)]
Finish fixing phpdbg on ZTS build
Stanislav Malyshev [Mon, 9 Jun 2014 06:10:52 +0000 (23:10 -0700)]
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)
Stanislav Malyshev [Mon, 9 Jun 2014 06:00:38 +0000 (23:00 -0700)]
Fixed bug #67399 (putenv with empty variable may lead to crash)
Stanislav Malyshev [Mon, 9 Jun 2014 06:10:11 +0000 (23:10 -0700)]
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)
Stanislav Malyshev [Mon, 9 Jun 2014 06:00:38 +0000 (23:00 -0700)]
Fixed bug #67399 (putenv with empty variable may lead to crash)
Stanislav Malyshev [Mon, 9 Jun 2014 06:09:37 +0000 (23:09 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #67399 (putenv with empty variable may lead to crash)
Stanislav Malyshev [Mon, 9 Jun 2014 06:00:38 +0000 (23:00 -0700)]
Fixed bug #67399 (putenv with empty variable may lead to crash)
Stanislav Malyshev [Mon, 9 Jun 2014 06:00:38 +0000 (23:00 -0700)]
Fixed bug #67399 (putenv with empty variable may lead to crash)
Matteo Beccati [Wed, 4 Jun 2014 11:26:24 +0000 (13:26 +0200)]
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.
Matteo Beccati [Mon, 9 Jun 2014 05:07:28 +0000 (07:07 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191