]>
granicus.if.org Git - php/log
Dmitry Stogov [Wed, 18 Jun 2014 13:50:27 +0000 (17:50 +0400)]
Merge branch 'master' into phpng
* master: (41 commits)
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
NEWS
Fix Request #67453 Allow to unserialize empty data.
Update copyright year to 2014
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
Fix patch for bug #67436
fix failed test
Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
Added tests for bug 67436
Fixed wrong XFAIL test - already fixed
Fix typo in Bug #67406 NEWS entry
Fix typo in Bug #67406 NEWS entry
...
Conflicts:
Zend/zend_compile.c
ext/session/session.c
ext/standard/array.c
ext/standard/http_fopen_wrapper.c
tests/classes/bug63462.phpt
Dmitry Stogov [Wed, 18 Jun 2014 13:09:37 +0000 (17:09 +0400)]
Use arena allocator for optimizer temporary data structures
Xinchen Hui [Wed, 18 Jun 2014 07:43:15 +0000 (15:43 +0800)]
Fixed segfaults
Xinchen Hui [Wed, 18 Jun 2014 07:13:43 +0000 (15:13 +0800)]
copy_data seems useless now
Xinchen Hui [Wed, 18 Jun 2014 07:11:46 +0000 (15:11 +0800)]
Fixed typo
Xinchen Hui [Wed, 18 Jun 2014 06:42:46 +0000 (14:42 +0800)]
Fixed segfault of stream handling
Xinchen Hui [Wed, 18 Jun 2014 06:26:17 +0000 (14:26 +0800)]
Fixed plugin fetching
Xinchen Hui [Wed, 18 Jun 2014 04:09:51 +0000 (12:09 +0800)]
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Xinchen Hui [Tue, 17 Jun 2014 09:50:54 +0000 (17:50 +0800)]
Refactoring mysqlnd (incompleted, only mysqlnd ext compilable)
Dmitry Stogov [Tue, 17 Jun 2014 22:47:01 +0000 (02:47 +0400)]
Use arena allocator for zend_class_entry, zend_op_array and zend_property_info that live till the end of request
Lior Kaplan [Tue, 17 Jun 2014 21:22:16 +0000 (00:22 +0300)]
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:21:20 +0000 (00:21 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:18:47 +0000 (00:18 +0300)]
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:16:23 +0000 (00:16 +0300)]
Update copyright year to 2014
Align with online version at http://www.php.net/license/3_01.txt
Lior Kaplan [Tue, 17 Jun 2014 21:14:18 +0000 (00:14 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:12:33 +0000 (00:12 +0300)]
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:11:55 +0000 (00:11 +0300)]
Update copyright year to 2014
Align with online version at http://www.php.net/license/3_01.txt
Lior Kaplan [Tue, 17 Jun 2014 21:11:35 +0000 (00:11 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update copyright year to 2014
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 20:57:20 +0000 (23:57 +0300)]
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 20:56:46 +0000 (23:56 +0300)]
Update copyright year to 2014
Dmitry Stogov [Tue, 17 Jun 2014 09:53:23 +0000 (13:53 +0400)]
Fixed HASH_FLAG_APPLY_PROTECTION flag usage
Remi Collet [Tue, 17 Jun 2014 07:41:30 +0000 (09:41 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Fix Request #67453 Allow to unserialize empty data.
Remi Collet [Tue, 17 Jun 2014 07:41:10 +0000 (09:41 +0200)]
NEWS
Remi Collet [Tue, 17 Jun 2014 07:38:54 +0000 (09:38 +0200)]
Fix Request #67453 Allow to unserialize empty data.
SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty
constructor (no arg), so it make sense to allow to unserialize empty
data.
This allow the hack (used in various place, including PHPUnit) to
instanciate class without call to constructor to work.
Dmitry Stogov [Mon, 16 Jun 2014 22:59:00 +0000 (02:59 +0400)]
Don't include trailing zero into hash function
Dmitry Stogov [Mon, 16 Jun 2014 21:15:51 +0000 (01:15 +0400)]
Fixed support for constants inherited from interfaces
Lior Kaplan [Mon, 16 Jun 2014 20:36:39 +0000 (23:36 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Update copyright year to 2014
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
Lior Kaplan [Mon, 16 Jun 2014 20:34:50 +0000 (23:34 +0300)]
Update copyright year to 2014
Lior Kaplan [Mon, 16 Jun 2014 20:32:10 +0000 (23:32 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
Lior Kaplan [Mon, 16 Jun 2014 20:30:44 +0000 (23:30 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
Lior Kaplan [Mon, 16 Jun 2014 20:28:36 +0000 (23:28 +0300)]
Update copyright year for re2c generated files
Lior Kaplan [Mon, 16 Jun 2014 20:27:45 +0000 (23:27 +0300)]
Update copyright year to 2014
Lior Kaplan [Mon, 16 Jun 2014 20:26:50 +0000 (23:26 +0300)]
Update copyright year for re2c files as well
Dmitry Stogov [Mon, 16 Jun 2014 19:32:58 +0000 (23:32 +0400)]
Avoid useles constants update
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
Bob Weinand [Mon, 16 Jun 2014 09:20:05 +0000 (11:20 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Mon, 16 Jun 2014 09:18:45 +0000 (11:18 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
Zend/zend_compile.c
Bob Weinand [Mon, 16 Jun 2014 09:16:33 +0000 (11:16 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Mon, 16 Jun 2014 09:10:50 +0000 (11:10 +0200)]
Fix patch for bug #67436
Dmitry Stogov [Mon, 16 Jun 2014 09:08:48 +0000 (13:08 +0400)]
Fixed support for references
Remi Collet [Mon, 16 Jun 2014 08:52:39 +0000 (10:52 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix failed test
Remi Collet [Mon, 16 Jun 2014 08:52:26 +0000 (10:52 +0200)]
fix failed test
Remi Collet [Mon, 16 Jun 2014 07:44:58 +0000 (09:44 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
Remi Collet [Mon, 16 Jun 2014 07:42:55 +0000 (09:42 +0200)]
Fix test on modern distro where old unsecure algo are disabled in openssl config.
Testing recent algo should be enough to check this function.
Xinchen Hui [Mon, 16 Jun 2014 06:59:03 +0000 (14:59 +0800)]
Refactoring imap (in progress)
Bob Weinand [Sun, 15 Jun 2014 22:43:31 +0000 (00:43 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Sun, 15 Jun 2014 22:42:50 +0000 (00:42 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Bob Weinand [Sun, 15 Jun 2014 22:41:46 +0000 (00:41 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Sun, 15 Jun 2014 22:35:20 +0000 (00:35 +0200)]
Merge branch 'pull-request/695' into PHP-5.4
Levi Morrison [Sun, 15 Jun 2014 22:10:40 +0000 (16:10 -0600)]
Added tests for bug 67436
Bob Weinand [Sun, 15 Jun 2014 21:56:14 +0000 (23:56 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Sun, 15 Jun 2014 21:55:44 +0000 (23:55 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Bob Weinand [Sun, 15 Jun 2014 21:54:05 +0000 (23:54 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Sun, 15 Jun 2014 21:51:51 +0000 (23:51 +0200)]
Fixed wrong XFAIL test - already fixed
Lior Kaplan [Sun, 15 Jun 2014 21:26:01 +0000 (00:26 +0300)]
Fix typo in Bug #67406 NEWS entry
Lior Kaplan [Sun, 15 Jun 2014 21:26:01 +0000 (00:26 +0300)]
Fix typo in Bug #67406 NEWS entry
Bob Weinand [Sun, 15 Jun 2014 21:16:21 +0000 (23:16 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Sun, 15 Jun 2014 21:06:15 +0000 (23:06 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
NEWS
Zend/zend_compile.c
Bob Weinand [Sun, 15 Jun 2014 20:36:13 +0000 (22:36 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Sun, 15 Jun 2014 20:32:47 +0000 (22:32 +0200)]
Updated NEWS
Bob Weinand [Sun, 15 Jun 2014 20:24:44 +0000 (22:24 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Sun, 15 Jun 2014 20:18:25 +0000 (22:18 +0200)]
Fix bug #67436
Bob Weinand [Sun, 15 Jun 2014 13:50:36 +0000 (15:50 +0200)]
Update NEWS
Bob Weinand [Sun, 15 Jun 2014 13:47:44 +0000 (15:47 +0200)]
Merge branch 'PHP-5.6'
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:08:16 +0000 (01:08 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update NEWS
update NEWS
update NEWS
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:50 +0000 (23:26 +0100)]
Merge branch 'PHP-5.6'
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:52 +0000 (13:14 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #67433 SIGSEGV when using count() on an object implementing Countable
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:19:11 +0000 (18:19 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Follow 308 Permanent Redirect responses.
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:55 +0000 (17:57 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Add 308 and 426 to the HTTP response code map in the CLI server.
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:42:29 +0000 (17:42 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Keep 308-399 HTTP response codes when header('Location:') is called.
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
Andrea Faulds [Thu, 12 Jun 2014 09:03:14 +0000 (10:03 +0100)]
Merge branch 'httponly-cookies' of https://github.com/mj/php-src
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