]>
granicus.if.org Git - php/log
Bob Weinand [Sun, 15 Jun 2014 13:50:36 +0000 (15:50 +0200)]
Update NEWS
Bob Weinand [Sun, 15 Jun 2014 13:47:14 +0000 (15:47 +0200)]
Merge sapi/phpdbg into PHP-5.6
Stanislav Malyshev [Sun, 15 Jun 2014 08:07:48 +0000 (01:07 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
update NEWS
Stanislav Malyshev [Sun, 15 Jun 2014 08:07:39 +0000 (01:07 -0700)]
update NEWS
Stanislav Malyshev [Sun, 15 Jun 2014 08:06:46 +0000 (01:06 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update NEWS
Stanislav Malyshev [Sun, 15 Jun 2014 08:06:37 +0000 (01:06 -0700)]
update NEWS
Stanislav Malyshev [Sun, 15 Jun 2014 07:46:31 +0000 (00:46 -0700)]
update NEWS
kovacs.ferenc [Sat, 14 Jun 2014 21:48:17 +0000 (23:48 +0200)]
fix bugsnet #67212: phpdbg uses non-standard TIOCGWINSZ
kovacs.ferenc [Thu, 12 Jun 2014 21:13:50 +0000 (23:13 +0200)]
change the default terminal width from 100 to 80, as that is the most common value
Derick Rethans [Fri, 13 Jun 2014 22:26:47 +0000 (23:26 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Fri, 13 Jun 2014 22:26:43 +0000 (23:26 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Fri, 13 Jun 2014 22:26:42 +0000 (23:26 +0100)]
- Updated to version 2014.5 (2014e)
Matteo Beccati [Fri, 13 Jun 2014 11:14:12 +0000 (13:14 +0200)]
Fix bug #67433 SIGSEGV when using count() on an object implementing Countable
krakjoe [Fri, 13 Jun 2014 06:35:11 +0000 (07:35 +0100)]
remove all references
Adam Harvey [Fri, 13 Jun 2014 01:17:18 +0000 (18:17 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Follow 308 Permanent Redirect responses.
Adam Harvey [Fri, 13 Jun 2014 01:15:07 +0000 (18:15 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Follow 308 Permanent Redirect responses.
Adam Harvey [Fri, 13 Jun 2014 01:12:53 +0000 (18:12 -0700)]
Follow 308 Permanent Redirect responses.
Fixes bug #67430 (http:// wrapper doesn't follow 308 redirects).
Adam Harvey [Fri, 13 Jun 2014 00:57:36 +0000 (17:57 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add 308 and 426 to the HTTP response code map in the CLI server.
Adam Harvey [Fri, 13 Jun 2014 00:56:10 +0000 (17:56 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add 308 and 426 to the HTTP response code map in the CLI server.
Adam Harvey [Fri, 13 Jun 2014 00:54:29 +0000 (17:54 -0700)]
Add 308 and 426 to the HTTP response code map in the CLI server.
Implements FR #67429 (CLI server is missing some new HTTP response codes).
Adam Harvey [Fri, 13 Jun 2014 00:40:51 +0000 (17:40 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Keep 308-399 HTTP response codes when header('Location:') is called.
Adam Harvey [Fri, 13 Jun 2014 00:38:52 +0000 (17:38 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Keep 308-399 HTTP response codes when header('Location:') is called.
Adam Harvey [Fri, 13 Jun 2014 00:35:05 +0000 (17:35 -0700)]
Keep 308-399 HTTP response codes when header('Location:') is called.
Fixes bug #67428 (header('Location: foo') will override a 308-399 response
code).
Bob Weinand [Thu, 12 Jun 2014 15:49:02 +0000 (18:49 +0300)]
Make run-tests.php PHP-5.4 compatible
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(
Bob Weinand [Wed, 11 Jun 2014 21:18:47 +0000 (00:18 +0300)]
Fixed order in travis script
Bob Weinand [Wed, 11 Jun 2014 21:08:55 +0000 (23:08 +0200)]
Check for all phpdbg compitble php versions
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.
Bob Weinand [Wed, 11 Jun 2014 20:35:12 +0000 (23:35 +0300)]
Fix issue #89 — Compile failure in PHP 5.4
zend_hash_get_current_key_zval_ex isn't defined in PHP 5.4. (used in phpdbg_watch.c)
Ferenc Kovacs [Wed, 11 Jun 2014 12:43:09 +0000 (14:43 +0200)]
Revert "Add optional second arg to unserialize()"
This reverts commit
cfd104582220d578ab1b78a5991065d038e1f931.
Julien Pauli [Wed, 11 Jun 2014 08:21:26 +0000 (10:21 +0200)]
5.5.15 now
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: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
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
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: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: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: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: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.
Bob Weinand [Mon, 9 Jun 2014 13:38:38 +0000 (15:38 +0200)]
Add line in run-tests.php help
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
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: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 [Mon, 9 Jun 2014 05:07:17 +0000 (07:07 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
Matteo Beccati [Mon, 9 Jun 2014 05:07:07 +0000 (07:07 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
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.
Stanislav Malyshev [Mon, 9 Jun 2014 02:47:38 +0000 (19:47 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add news
Bug 49898 __getCookies() method implementation
Stanislav Malyshev [Mon, 9 Jun 2014 02:47:14 +0000 (19:47 -0700)]
update news
Stanislav Malyshev [Mon, 9 Jun 2014 02:44:49 +0000 (19:44 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add news
Bug 49898 __getCookies() method implementation
Stanislav Malyshev [Mon, 9 Jun 2014 02:38:07 +0000 (19:38 -0700)]
add news
Boro Sitnikovski [Thu, 26 Sep 2013 00:03:48 +0000 (02:03 +0200)]
Bug 49898
__getCookies() method implementation
Sobak [Sat, 10 May 2014 11:30:54 +0000 (13:30 +0200)]
Removed another cvsclean file
Sobak [Sat, 10 May 2014 11:16:48 +0000 (13:16 +0200)]
Removed cvsclean and svnclean tools
Boro Sitnikovski [Fri, 20 Sep 2013 00:58:11 +0000 (02:58 +0200)]
Bug 64744
Show the type of the non-object for more descriptive errors
Stanislav Malyshev [Mon, 9 Jun 2014 02:04:47 +0000 (19:04 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix order
fix order
Stanislav Malyshev [Mon, 9 Jun 2014 02:04:35 +0000 (19:04 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix order
Stanislav Malyshev [Mon, 9 Jun 2014 02:04:21 +0000 (19:04 -0700)]
fix order
Stanislav Malyshev [Mon, 9 Jun 2014 02:03:50 +0000 (19:03 -0700)]
fix order
Stanislav Malyshev [Mon, 9 Jun 2014 02:03:31 +0000 (19:03 -0700)]
add news
Stanislav Malyshev [Mon, 9 Jun 2014 02:02:24 +0000 (19:02 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug 666222
Fix bug 666222
projects / php / log