]>
granicus.if.org Git - php/log
Dmitry Stogov [Thu, 28 Nov 2013 14:40:46 +0000 (18:40 +0400)]
Removed unused "pHashFunction" argument in _zend_hash_init() and family (must be 99% source compatible)
Dmitry Stogov [Thu, 28 Nov 2013 13:04:54 +0000 (17:04 +0400)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
Updated NEWS for Constant Scalar Exprs RFC
Moved arrays again to "static_scalar:" & little cleanup
Renaming
Constant expressions refactoring
Removed operations on constant arrays. They make no sense as constants are not allowed to be arrays. And as just properties are allowed to; no problem, we still don't need operations on any constant array.
Added a few more operators
Whitespace fix
converted several switches to ifs and made more opcache friendly
Fatal error about self referencing constants fixed
Fixed mem leaks, added tests and ternary operator
Working commit for constant scalar expressions (with constants). Tests will follow.
Dmitry Stogov [Thu, 28 Nov 2013 13:02:01 +0000 (17:02 +0400)]
Some rare deprecated cases replaced by ZEND_ASSERT() (some extensions might need to be fixed)
Dmitry Stogov [Thu, 28 Nov 2013 13:01:10 +0000 (17:01 +0400)]
Removed duplicated hash function implementation (100% source compatible)
Bob Weinand [Thu, 28 Nov 2013 12:46:51 +0000 (13:46 +0100)]
Updated NEWS for Constant Scalar Exprs RFC
Bob Weinand [Thu, 28 Nov 2013 12:41:42 +0000 (13:41 +0100)]
Merge branch 'const_scalar_exprs' into PHP-5.6
Conflicts:
Zend/zend_extensions.h
Dmitry Stogov [Thu, 28 Nov 2013 07:46:28 +0000 (11:46 +0400)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
Dmitry Stogov [Thu, 28 Nov 2013 07:44:14 +0000 (11:44 +0400)]
Don't check argument types for internal functions without type hinting
Derick Rethans [Wed, 27 Nov 2013 22:01:09 +0000 (22:01 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Wed, 27 Nov 2013 22:01:03 +0000 (22:01 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Wed, 27 Nov 2013 22:00:53 +0000 (22:00 +0000)]
Merge branch 'bug53879' into PHP-5.4
Derick Rethans [Wed, 27 Nov 2013 21:59:46 +0000 (21:59 +0000)]
Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
Dmitry Stogov [Wed, 27 Nov 2013 17:04:00 +0000 (21:04 +0400)]
Fixed tests
Dmitry Stogov [Wed, 27 Nov 2013 16:30:35 +0000 (20:30 +0400)]
Removed deprecated AI_SET_PTR()s
Dmitry Stogov [Wed, 27 Nov 2013 10:58:54 +0000 (14:58 +0400)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
Fixed bug #66060 (Heap buffer over-read in DateInterval)
Dmitry Stogov [Wed, 27 Nov 2013 10:58:35 +0000 (14:58 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)
Dmitry Stogov [Wed, 27 Nov 2013 10:58:23 +0000 (14:58 +0400)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)
Dmitry Stogov [Wed, 27 Nov 2013 10:56:18 +0000 (14:56 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #65969 (Chain assignment with T_LIST failure)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Dmitry Stogov [Wed, 27 Nov 2013 10:39:40 +0000 (14:39 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #65969 (Chain assignment with T_LIST failure)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Dmitry Stogov [Wed, 27 Nov 2013 10:26:34 +0000 (14:26 +0400)]
Fixed bug #65969 (Chain assignment with T_LIST failure)
Remi Collet [Wed, 27 Nov 2013 10:15:58 +0000 (11:15 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)
Remi Collet [Wed, 27 Nov 2013 10:15:34 +0000 (11:15 +0100)]
NEWS
Remi Collet [Wed, 27 Nov 2013 10:15:08 +0000 (11:15 +0100)]
Fixed bug #66060 (Heap buffer over-read in DateInterval)
Remi Collet [Wed, 27 Nov 2013 10:13:16 +0000 (11:13 +0100)]
Fixed bug #66060 (Heap buffer over-read in DateInterval)
Julien Pauli [Wed, 27 Nov 2013 09:32:05 +0000 (10:32 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Julien Pauli [Wed, 27 Nov 2013 08:34:40 +0000 (09:34 +0100)]
5.5.8-dev now
Stanislav Malyshev [Wed, 27 Nov 2013 08:18:54 +0000 (00:18 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.4.24-dev now
merge fix
add test
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
Stanislav Malyshev [Wed, 27 Nov 2013 08:14:42 +0000 (00:14 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.24-dev now
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Wed, 27 Nov 2013 08:13:45 +0000 (00:13 -0800)]
5.4.24-dev now
Andrey Hristov [Tue, 26 Nov 2013 18:10:30 +0000 (20:10 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Dmitry Stogov [Tue, 26 Nov 2013 17:59:02 +0000 (21:59 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed opcahce_reset() crash when opcache.protect_memory is set
Dmitry Stogov [Tue, 26 Nov 2013 17:57:32 +0000 (21:57 +0400)]
Fixed opcahce_reset() crash when opcache.protect_memory is set
Dmitry Stogov [Tue, 26 Nov 2013 17:44:54 +0000 (21:44 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
Fixed a wrong test
Dmitry Stogov [Tue, 26 Nov 2013 17:44:32 +0000 (21:44 +0400)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
Fixed a wrong test
Dmitry Stogov [Tue, 26 Nov 2013 17:38:40 +0000 (21:38 +0400)]
Added an optimization of class constants and constant calls to some internal functions
Dmitry Stogov [Tue, 26 Nov 2013 17:37:31 +0000 (21:37 +0400)]
Added an optimization of class constants and constant calls to some internal functions
Andrey Hristov [Tue, 26 Nov 2013 17:15:43 +0000 (19:15 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Tue, 26 Nov 2013 17:15:30 +0000 (19:15 +0200)]
merge fix
Andrey Hristov [Tue, 26 Nov 2013 17:15:12 +0000 (19:15 +0200)]
add test
Andrey Hristov [Tue, 26 Nov 2013 17:02:45 +0000 (19:02 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
ext/mysqlnd/mysqlnd.c
Andrey Hristov [Tue, 26 Nov 2013 17:01:49 +0000 (19:01 +0200)]
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
Dmitry Stogov [Tue, 26 Nov 2013 17:01:01 +0000 (21:01 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66176 (Invalid constant substitution)
Fixed bug #66176 (Invalid constant substitution)
Dmitry Stogov [Tue, 26 Nov 2013 17:00:00 +0000 (21:00 +0400)]
Fixed bug #66176 (Invalid constant substitution)
Julien Pauli [Tue, 26 Nov 2013 16:43:45 +0000 (17:43 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed a wrong test
Julien Pauli [Tue, 26 Nov 2013 16:43:31 +0000 (17:43 +0100)]
Fixed a wrong test
Dmitry Stogov [Tue, 26 Nov 2013 15:55:49 +0000 (19:55 +0400)]
Fixed bug #66176 (Invalid constant substitution)
Dmitry Stogov [Tue, 26 Nov 2013 13:48:59 +0000 (17:48 +0400)]
Revert NEWS
Dmitry Stogov [Tue, 26 Nov 2013 13:48:11 +0000 (17:48 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66176 (Invalid constant substitution)
Conflicts:
NEWS
Dmitry Stogov [Tue, 26 Nov 2013 13:47:02 +0000 (17:47 +0400)]
Fixed bug #66176 (Invalid constant substitution)
Dmitry Stogov [Tue, 26 Nov 2013 08:14:12 +0000 (12:14 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Added test
Dmitry Stogov [Tue, 26 Nov 2013 08:13:42 +0000 (12:13 +0400)]
Added test
Dmitry Stogov [Tue, 26 Nov 2013 07:36:23 +0000 (11:36 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
bring the news
Conflicts:
NEWS
Dmitry Stogov [Tue, 26 Nov 2013 07:34:41 +0000 (11:34 +0400)]
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
Andrey Hristov [Mon, 25 Nov 2013 19:33:04 +0000 (21:33 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
Andrey Hristov [Mon, 25 Nov 2013 19:31:51 +0000 (21:31 +0200)]
bring the news
Dmitry Stogov [Mon, 25 Nov 2013 10:11:45 +0000 (14:11 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed compatibility with old PHP versions
Fixed bug #65915 (Inconsistent results with require return value)
Conflicts:
NEWS
Dmitry Stogov [Mon, 25 Nov 2013 10:09:57 +0000 (14:09 +0400)]
Fixed compatibility with old PHP versions
Dmitry Stogov [Mon, 25 Nov 2013 10:07:24 +0000 (14:07 +0400)]
Fixed bug #65915 (Inconsistent results with require return value)
Anatol Belski [Thu, 21 Nov 2013 20:29:35 +0000 (21:29 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed test
And here is the real fix for #66124
Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
Anatol Belski [Thu, 21 Nov 2013 20:29:02 +0000 (21:29 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed test
Anatol Belski [Thu, 21 Nov 2013 20:24:47 +0000 (21:24 +0100)]
fixed test
Andrey Hristov [Thu, 21 Nov 2013 19:29:37 +0000 (21:29 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Thu, 21 Nov 2013 19:29:21 +0000 (21:29 +0200)]
And here is the real fix for #66124
Andrey Hristov [Thu, 21 Nov 2013 19:15:22 +0000 (21:15 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Thu, 21 Nov 2013 19:14:42 +0000 (21:14 +0200)]
Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
krakjoe [Wed, 20 Nov 2013 16:26:21 +0000 (16:26 +0000)]
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
krakjoe [Sun, 17 Nov 2013 22:39:31 +0000 (22:39 +0000)]
export more Zend API
Anatol Belski [Wed, 20 Nov 2013 09:12:06 +0000 (10:12 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
permanently deactivate that place, not on runtime only
Anatol Belski [Wed, 20 Nov 2013 09:11:39 +0000 (10:11 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
permanently deactivate that place, not on runtime only
Anatol Belski [Wed, 20 Nov 2013 09:09:11 +0000 (10:09 +0100)]
permanently deactivate that place, not on runtime only
besides the two "if" checks, this fixes static analyze which is sometimes
broken because of this
Yasuo Ohgaki [Tue, 19 Nov 2013 22:25:04 +0000 (07:25 +0900)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
Yasuo Ohgaki [Tue, 19 Nov 2013 22:23:54 +0000 (07:23 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
Yasuo Ohgaki [Tue, 19 Nov 2013 22:17:53 +0000 (07:17 +0900)]
Fix WS in serialization_error_002.phpt
Aaron Hamid [Mon, 18 Nov 2013 03:59:42 +0000 (22:59 -0500)]
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
Jeff Welch [Fri, 8 Nov 2013 18:07:22 +0000 (13:07 -0500)]
Fixed tests that fail with non-default `serialize_precision` configurations.
See:
* https://bugs.php.net/bug.php?id=64760
*
4dc4302
Jeff Welch [Fri, 8 Nov 2013 18:07:22 +0000 (13:07 -0500)]
Fixed tests that fail with non-default `serialize_precision` configurations.
See:
* https://bugs.php.net/bug.php?id=64760
*
4dc4302
Jeff Welch [Fri, 8 Nov 2013 18:07:22 +0000 (13:07 -0500)]
Fixed tests that fail with non-default `serialize_precision` configurations.
See:
* https://bugs.php.net/bug.php?id=64760
*
4dc4302
Remi Collet [Tue, 19 Nov 2013 11:42:44 +0000 (12:42 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
avoid doing a stream_select on a closed stream
Remi Collet [Tue, 19 Nov 2013 11:42:25 +0000 (12:42 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
avoid doing a stream_select on a closed stream
Remi Collet [Tue, 19 Nov 2013 11:41:58 +0000 (12:41 +0100)]
avoid doing a stream_select on a closed stream
Andrea Faulds [Mon, 18 Nov 2013 21:43:59 +0000 (21:43 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Removed UPGRADING note
Rewrote test using tcp instead of http:// stream
Implemented FR #65917 (getallheaders() is not supported by the built-in...)
Andrea Faulds [Mon, 18 Nov 2013 21:23:45 +0000 (21:23 +0000)]
Updated NEWS
Andrea Faulds [Mon, 18 Nov 2013 21:19:07 +0000 (21:19 +0000)]
Merge branch 'CLIGetAllHeadersBackport' into PHP-5.5
* CLIGetAllHeadersBackport:
Removed UPGRADING note
Rewrote test using tcp instead of http:// stream
Implemented FR #65917 (getallheaders() is not supported by the built-in...)
kovacs.ferenc [Mon, 18 Nov 2013 11:12:24 +0000 (12:12 +0100)]
Merge branch 'JSONCaseFix' of git://github.com/TazeTSchnitzel/php-src into TazeTSchnitzel-JSONCaseFix
Xinchen Hui [Sun, 17 Nov 2013 09:20:13 +0000 (17:20 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Sun, 17 Nov 2013 09:06:27 +0000 (17:06 +0800)]
Update NEWS
Xinchen Hui [Sun, 17 Nov 2013 09:05:04 +0000 (17:05 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sun, 17 Nov 2013 09:04:37 +0000 (17:04 +0800)]
Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string)
Christopher Jones [Fri, 15 Nov 2013 20:37:52 +0000 (12:37 -0800)]
Update NEWS
Christopher Jones [Fri, 15 Nov 2013 20:37:17 +0000 (12:37 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
This is CLI web server change. Added some common MIME types to the existing lookup list, pending a more thorough lookup solution, if anyone wants to do that. Ref http://news.php.net/php.internals/69990
Christopher Jones [Fri, 15 Nov 2013 20:36:25 +0000 (12:36 -0800)]
This is CLI web server change. Added some common MIME types to the
existing lookup list, pending a more thorough lookup solution, if
anyone wants to do that. Ref http://news.php.net/php.internals/69990
A router can be used to add to, or override, the MIME type lookups,
see http://php.net/manual/en/features.commandline.webserver.php
Remi Collet [Fri, 15 Nov 2013 08:53:07 +0000 (09:53 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fix Bug #65714 PHP cli forces the tty to cooked mode
Remi Collet [Fri, 15 Nov 2013 08:52:48 +0000 (09:52 +0100)]
NEWS
Remi Collet [Fri, 15 Nov 2013 08:49:42 +0000 (09:49 +0100)]
Fix Bug #65714 PHP cli forces the tty to cooked mode
Only drop the using_history() call with libedit as I don't know
if it is required with readline.
This also allow to run a php script in background without
it being aborted on first output.
Adam Harvey [Thu, 14 Nov 2013 18:52:43 +0000 (10:52 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
NEWS
Adam Harvey [Thu, 14 Nov 2013 18:52:07 +0000 (10:52 -0800)]
Move the JSON bugfix into the 5.5.6 changelog.
Andrea Faulds [Wed, 13 Nov 2013 17:03:02 +0000 (17:03 +0000)]
Removed UPGRADING note
Conflicts:
UPGRADING
Remi Collet [Wed, 13 Nov 2013 12:21:12 +0000 (13:21 +0100)]
fix merge
Remi Collet [Wed, 13 Nov 2013 12:19:10 +0000 (13:19 +0100)]
Fix failed test with recent glibc
In recent version of strptime glibc upstream has fixed a discrepancy between
documentation and actual behaviour by skipping over the sequence that would match %Z.
See http://repo.or.cz/w/glibc.git/commitdiff/
ddc7e412ab252e7360a4357664beb3b5d9c4f42b
So when %Z is used in format
glibc <= 2.18 returns the GMT as unparsed
glibc >= 2.19 returns empty string
Removing %Z from tested format gives the same behavior with all version.
Nikita Popov [Tue, 12 Nov 2013 20:56:50 +0000 (21:56 +0100)]
Allow $num=0 in array_fill()
Implemented request #49824.