]>
granicus.if.org Git - php/log
Nikita Popov [Mon, 2 Dec 2013 19:10:08 +0000 (20:10 +0100)]
Support gmp_remroot() on GMP 4.1
Bob Weinand [Mon, 2 Dec 2013 17:39:01 +0000 (18:39 +0100)]
Added note about const scalar exprs in UPGRADING file
Michael Wallner [Mon, 2 Dec 2013 16:02:13 +0000 (17:02 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
BFN
Fix bug #65196
Michael Wallner [Mon, 2 Dec 2013 16:02:01 +0000 (17:02 +0100)]
BFN
Michael Wallner [Mon, 2 Dec 2013 16:01:25 +0000 (17:01 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #65196
Michael Wallner [Mon, 2 Dec 2013 15:58:34 +0000 (16:58 +0100)]
Fix bug #65196
Passing DOMDocumentFragment to DOMDocument::saveHTML()
produces invalid markup, because a DocumentFragment is just a container
for child nodes and not a real node itself.
Michael Wallner [Mon, 2 Dec 2013 11:15:27 +0000 (12:15 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
BFN
fix bug #49634x
Michael Wallner [Mon, 2 Dec 2013 11:14:26 +0000 (12:14 +0100)]
BFN
Michael Wallner [Mon, 2 Dec 2013 11:10:59 +0000 (12:10 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix bug #49634x
Michael Wallner [Mon, 2 Dec 2013 11:08:22 +0000 (12:08 +0100)]
fix bug #49634x
Dmitry Stogov [Mon, 2 Dec 2013 08:05:29 +0000 (12:05 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed tests
Dmitry Stogov [Mon, 2 Dec 2013 08:04:07 +0000 (12:04 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed tests
Dmitry Stogov [Mon, 2 Dec 2013 07:53:35 +0000 (11:53 +0400)]
Fixed tests
Dmitry Stogov [Mon, 2 Dec 2013 07:03:17 +0000 (11:03 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed ability to build non-specialized GOTO VM
Dmitry Stogov [Mon, 2 Dec 2013 07:02:40 +0000 (11:02 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed ability to build non-specialized GOTO VM
Conflicts:
Zend/zend_vm_gen.php
Dmitry Stogov [Mon, 2 Dec 2013 06:59:32 +0000 (10:59 +0400)]
Fixed ability to build non-specialized GOTO VM
Nikita Popov [Sun, 1 Dec 2013 12:45:22 +0000 (13:45 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Sun, 1 Dec 2013 12:37:56 +0000 (13:37 +0100)]
Fix bug #65764
I'm not exactly sure whether this is the right way to fix it. The
question is whether Generator::throw() on a newborn generator (i.e.
a generator that is not yet at yield expression) should first advance to
the first yield and throw the exception there or whether it should
instead throw the exception in the caller's context.
The old behavior was to throw it at the start of the function (i.e.
the very first opcode), which causes issues like the one in #65764.
Effectively it's impossible to properly handle the exceptions in this
case.
For now I choose the variant where the generator advances to the
first yield before throwing, as that's consistent with how all other
methods on the Generator object currently behave. This does not
necessarily match the behavior in other languages, e.g. Python would throw
the exception in the caller's context. But then our send() method already
has this kind of deviation, so it stays internally consistent at least.
Felipe Pena [Sat, 30 Nov 2013 14:05:51 +0000 (12:05 -0200)]
- BFN
Felipe Pena [Sat, 30 Nov 2013 13:44:08 +0000 (11:44 -0200)]
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
Felipe Pena [Sat, 30 Nov 2013 13:43:51 +0000 (11:43 -0200)]
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
Felipe Pena [Sat, 30 Nov 2013 13:40:42 +0000 (11:40 -0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
- Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
Felipe Pena [Sat, 30 Nov 2013 13:39:57 +0000 (11:39 -0200)]
- Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
Nikita Popov [Sat, 30 Nov 2013 12:40:17 +0000 (13:40 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Sat, 30 Nov 2013 12:35:33 +0000 (13:35 +0100)]
Cleanup generator closing code a bit
All code dealing with unfinished execution cleanup is now in a separate
function (previously most of it was run even when execution was properly
finished.
Furthermore some code dealing with unclean shutdowns has been removed,
which is no longer necessary, because we no longer try to clean up in
this case.
Nikita Popov [Sat, 30 Nov 2013 12:05:40 +0000 (13:05 +0100)]
Fixed bug #66041: list() fails to unpack yielded ArrayAccess object
Yield return values now use IS_VAR rather than IS_TMP_VAR. This
fixes the issue with list() and should also be faster as it avoids
doing a zval copy.
ArunSK [Fri, 29 Nov 2013 22:54:17 +0000 (23:54 +0100)]
Fixed unused value compiler warning
Nikita Popov [Fri, 29 Nov 2013 22:31:13 +0000 (23:31 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
nikita2206 [Tue, 29 Oct 2013 15:40:17 +0000 (19:40 +0400)]
Fixed bug #65768: DateTimeImmutable::diff does not work
This commit also prevents user classes from directly implementing
DateTimeInterface, because ext/date relies on classes implementing
it to support certain internal structures.
Dmitry Stogov [Fri, 29 Nov 2013 08:55:11 +0000 (12:55 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Added validation of class names in the autoload process
Conflicts:
NEWS
Dmitry Stogov [Fri, 29 Nov 2013 08:54:22 +0000 (12:54 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Added validation of class names in the autoload process
Dmitry Stogov [Fri, 29 Nov 2013 08:53:02 +0000 (12:53 +0400)]
Added validation of class names in the autoload process
Nikita Popov [Thu, 28 Nov 2013 23:00:41 +0000 (00:00 +0100)]
Clean up GMP arginfos
Removed duplicate arginfos, specified number of required args
everywhere and removed weird pass-by-ref arguments.
Nikita Popov [Thu, 28 Nov 2013 22:42:23 +0000 (23:42 +0100)]
Add gmp_root() and gmp_rootrem() functions
Nikita Popov [Sat, 23 Nov 2013 23:43:12 +0000 (00:43 +0100)]
Use class handlers for GMP serialization
A bit faster and less boilerplate
Nikita Popov [Sat, 23 Nov 2013 11:54:20 +0000 (12:54 +0100)]
Remove duplicate / commented code in GMP
Dmitry Stogov [Thu, 28 Nov 2013 21:00:14 +0000 (01:00 +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 #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600)
Marking those two as XFAIL for now.
Fixed a few DST changeover issues.
Move add/sub to timelib.
Fix backwards transition diffs.
Split up tests into their different categories.
Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.
Fixed forward transitions in diffs.
Always reset those parameters.
Fixed "Forward Transition" construction of DateTime objects.
Dmitry Stogov [Thu, 28 Nov 2013 20:57:49 +0000 (00:57 +0400)]
Avoid interned hash key duplication and hash key length recaclulation
Derick Rethans [Thu, 28 Nov 2013 16:33:17 +0000 (16:33 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Thu, 28 Nov 2013 16:33:08 +0000 (16:33 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Thu, 28 Nov 2013 16:32:11 +0000 (16:32 +0000)]
Fixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600)
Derick Rethans [Thu, 28 Nov 2013 14:46:21 +0000 (14:46 +0000)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Derick Rethans [Thu, 28 Nov 2013 14:45:26 +0000 (14:45 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
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)
Derick Rethans [Thu, 28 Nov 2013 14:30:08 +0000 (14:30 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/date/php_date.c
Derick Rethans [Thu, 28 Nov 2013 14:26:01 +0000 (14:26 +0000)]
Merge branch 'date-time-dst-rfc' into PHP-5.4
This is a partial resolve of some DST issues, plenty of things to do, but as
this *does* fix a few issues it's worth merging it already.
Derick Rethans [Thu, 28 Nov 2013 14:24:39 +0000 (14:24 +0000)]
Marking those two as XFAIL for now.
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
Derick Rethans [Thu, 20 Jun 2013 08:28:23 +0000 (09:28 +0100)]
Fixed a few DST changeover issues.
Derick Rethans [Tue, 16 Apr 2013 15:31:10 +0000 (16:31 +0100)]
Move add/sub to timelib.
Derick Rethans [Sat, 13 Apr 2013 22:47:23 +0000 (23:47 +0100)]
Fix backwards transition diffs.
Derick Rethans [Sat, 13 Apr 2013 22:28:59 +0000 (23:28 +0100)]
Split up tests into their different categories.
Derick Rethans [Sat, 13 Apr 2013 17:45:51 +0000 (18:45 +0100)]
Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.
Derick Rethans [Fri, 12 Apr 2013 10:24:14 +0000 (11:24 +0100)]
Fixed forward transitions in diffs.
Derick Rethans [Fri, 12 Apr 2013 10:23:49 +0000 (11:23 +0100)]
Always reset those parameters.
Derick Rethans [Sun, 31 Mar 2013 17:11:35 +0000 (18:11 +0100)]
Fixed "Forward Transition" construction of DateTime objects.
This fixes the issue in
https://wiki.php.net/rfc/datetime_and_daylight_saving_time#forward_transitions
There is a period during transition to DST where a time (such as 02:30) does
not exist. PHP already calculated the correct timestamp for this, but failed to
"rounded forward" to the existing correct hour value.
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)