]>
granicus.if.org Git - php/log
Dmitry Stogov [Wed, 7 Oct 2015 01:28:43 +0000 (04:28 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Restored the original (php-5) behavior of convert_to_cstring(). It was broken in php7 by mistake and caused problems in ext/pgsql/tests/bug46408.phpt.
Dmitry Stogov [Wed, 7 Oct 2015 01:26:26 +0000 (04:26 +0300)]
Restored the original (php-5) behavior of convert_to_cstring(). It was broken in php7 by mistake and caused problems in ext/pgsql/tests/bug46408.phpt.
Dmitry Stogov [Wed, 7 Oct 2015 00:26:24 +0000 (03:26 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed test (system error messages may be different).
Dmitry Stogov [Wed, 7 Oct 2015 00:25:12 +0000 (03:25 +0300)]
Fixed test (system error messages may be different).
Dmitry Stogov [Wed, 7 Oct 2015 00:08:40 +0000 (03:08 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed test (it failed on 32-bit Linux and worked on 64-bit Linux just because of luck).
Dmitry Stogov [Wed, 7 Oct 2015 00:08:11 +0000 (03:08 +0300)]
Fixed test (it failed on 32-bit Linux and worked on 64-bit Linux just because of luck).
Dmitry Stogov [Tue, 6 Oct 2015 22:52:25 +0000 (01:52 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Split test into different versions for 32-bit and 64-bit systems
Dmitry Stogov [Tue, 6 Oct 2015 22:51:37 +0000 (01:51 +0300)]
Split test into different versions for 32-bit and 64-bit systems
Dmitry Stogov [Tue, 6 Oct 2015 22:50:28 +0000 (01:50 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Dmitry Stogov [Tue, 6 Oct 2015 22:49:54 +0000 (01:49 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Drop HAVE_PACKED_OBJECT_VALUE
More zpp cleanup in ext/intl
Dmitry Stogov [Tue, 6 Oct 2015 22:48:11 +0000 (01:48 +0300)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:php-src:
Drop HAVE_PACKED_OBJECT_VALUE
More zpp cleanup in ext/intl
Nikita Popov [Tue, 6 Oct 2015 21:15:27 +0000 (23:15 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Tue, 6 Oct 2015 21:12:08 +0000 (23:12 +0200)]
Drop HAVE_PACKED_OBJECT_VALUE
This check doesn't make sense anymore, we have no object_value
anymore.
Dmitry Stogov [Tue, 6 Oct 2015 21:00:40 +0000 (00:00 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Revert "Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())"
Dmitry Stogov [Tue, 6 Oct 2015 20:59:36 +0000 (23:59 +0300)]
Revert "Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())"
This reverts commit
517b5536259ecf7697f353f4bfbafde857fc1f81 .
Nikita Popov [Tue, 6 Oct 2015 20:58:11 +0000 (22:58 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Tue, 6 Oct 2015 20:32:28 +0000 (22:32 +0200)]
More zpp cleanup in ext/intl
Dmitry Stogov [Tue, 6 Oct 2015 20:50:16 +0000 (23:50 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Revert "Improve
517b55362 (scope rebinding on method Closures)"
Revert "Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src"
Revert "Allow random $this on non-internal Closures again"
Revert "Speed up self::method() calls (no ZEND_FETCH_CLASS)"
Revert "Speed up self::$property access by 20%"
Revert "Update NEWS"
Dmitry Stogov [Tue, 6 Oct 2015 20:48:15 +0000 (23:48 +0300)]
Revert "Improve
517b55362 (scope rebinding on method Closures)"
This reverts commit
881c50252066132f83e190325e344f532be19033 .
Dmitry Stogov [Tue, 6 Oct 2015 20:48:12 +0000 (23:48 +0300)]
Revert "Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src"
This reverts commit
a6be0f3fd6cdd59ac00ecd76630c6c04fee03417 .
Dmitry Stogov [Tue, 6 Oct 2015 20:48:10 +0000 (23:48 +0300)]
Revert "Allow random $this on non-internal Closures again"
This reverts commit
35d0405c4790f0ce668c9e1b8b05197e55d29a05 .
Dmitry Stogov [Tue, 6 Oct 2015 20:48:08 +0000 (23:48 +0300)]
Revert "Speed up self::method() calls (no ZEND_FETCH_CLASS)"
This reverts commit
8c33bdb976e957ea67ebffd424e0a133a79c6ebe .
Dmitry Stogov [Tue, 6 Oct 2015 20:48:04 +0000 (23:48 +0300)]
Revert "Speed up self::$property access by 20%"
This reverts commit
0fbd3e5fe7c2df5f8eb8cf2f217902f80a9fd894 .
Dmitry Stogov [Tue, 6 Oct 2015 20:47:49 +0000 (23:47 +0300)]
Revert "Update NEWS"
This reverts commit
60bb51c0d38292f434b8e16214ac0477f96932b4 .
Sara Golemon [Tue, 6 Oct 2015 19:04:44 +0000 (12:04 -0700)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Add some tests for unserialize() class filtering
Sara Golemon [Tue, 6 Oct 2015 18:59:43 +0000 (11:59 -0700)]
Add some tests for unserialize() class filtering
Rasmus Lerdorf [Tue, 6 Oct 2015 08:13:38 +0000 (17:13 +0900)]
zend.assertions is not a boolean
Rasmus Lerdorf [Tue, 6 Oct 2015 08:13:38 +0000 (17:13 +0900)]
zend.assertions is not a boolean
Bob Weinand [Mon, 5 Oct 2015 23:03:35 +0000 (01:03 +0200)]
Merge branch 'PHP-7.0'
Bob Weinand [Mon, 5 Oct 2015 23:02:52 +0000 (01:02 +0200)]
Update NEWS
Scott [Mon, 5 Oct 2015 15:39:55 +0000 (11:39 -0400)]
Fixed bug #70641 (Random_* - Better compatibility on Linux distros)
See:
* https://bugs.php.net/bug.php?id=70641
* https://github.com/php/php-src/pull/1513#issuecomment-
145571829
Anatol Belski [Mon, 5 Oct 2015 20:00:15 +0000 (22:00 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
don't leak handles
use correct function to close handles
Anatol Belski [Sun, 4 Oct 2015 20:19:51 +0000 (22:19 +0200)]
don't leak handles
Anatol Belski [Sun, 4 Oct 2015 20:14:47 +0000 (22:14 +0200)]
use correct function to close handles
Bob Weinand [Mon, 5 Oct 2015 19:54:10 +0000 (21:54 +0200)]
Merge branch 'PHP-7.0'
Bob Weinand [Mon, 5 Oct 2015 19:52:09 +0000 (21:52 +0200)]
Speed up self::$property access by 20%
Bob Weinand [Mon, 5 Oct 2015 19:17:50 +0000 (21:17 +0200)]
Merge branch 'PHP-7.0'
Bob Weinand [Mon, 5 Oct 2015 19:16:52 +0000 (21:16 +0200)]
Speed up self::method() calls (no ZEND_FETCH_CLASS)
Bob Weinand [Mon, 5 Oct 2015 15:54:14 +0000 (17:54 +0200)]
Merge branch 'PHP-7.0'
Bob Weinand [Mon, 5 Oct 2015 15:49:32 +0000 (17:49 +0200)]
Allow random $this on non-internal Closures again
As it turns out, there is actually no reason to prevent this, it even was a bigger BC break than expected...
Also fixes a memory leak (the Closure leaks) when calling internal functions via Closure by moving it out of leave helper onto caller side for TOP_CODE:
$z = new SplStack; $z->push(20);
$x = (new ReflectionMethod("SplStack", "pop"))->getClosure($z);
var_dump($x());
Bob Weinand [Mon, 5 Oct 2015 12:50:52 +0000 (14:50 +0200)]
Merge branch 'PHP-7.0'
Previous commit was a merge to the wrong branch... Cherry-Picked into PHP-7.0 and empty merge here
Bob Weinand [Mon, 5 Oct 2015 12:45:15 +0000 (14:45 +0200)]
Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src
Bob Weinand [Mon, 5 Oct 2015 12:45:15 +0000 (14:45 +0200)]
Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src
Antony Dovgal [Mon, 5 Oct 2015 09:52:22 +0000 (12:52 +0300)]
add new tests for array_keys() function
Antony Dovgal [Mon, 5 Oct 2015 09:37:04 +0000 (12:37 +0300)]
fix array keys being too strict to refs
and add tests
Bob Weinand [Sun, 4 Oct 2015 22:57:30 +0000 (00:57 +0200)]
Merge branch 'PHP-7.0'
Bob Weinand [Sun, 4 Oct 2015 22:52:10 +0000 (00:52 +0200)]
Improve
517b55362 (scope rebinding on method Closures)
Now it is completely impossible to rebind a scoped method Closure (only the kind you get from ReflectionMethod::getClosure()) to a foreign scope
Adding a lot of tests to ensure this...
Also, properly return NULL in case the Closure could not be created instead of some crippled unbound Closure
Anatol Belski [Sun, 4 Oct 2015 14:38:00 +0000 (16:38 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
improve error message
Anatol Belski [Sun, 4 Oct 2015 12:33:09 +0000 (14:33 +0200)]
improve error message
Anatol Belski [Sun, 4 Oct 2015 10:19:41 +0000 (12:19 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix incrementing on 32-bit
fix coverage report for datelib
Anatol Belski [Sun, 4 Oct 2015 10:16:54 +0000 (12:16 +0200)]
fix incrementing on 32-bit
Anatol Belski [Sun, 4 Oct 2015 10:17:50 +0000 (12:17 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix incrementing on 32-bit
Anatol Belski [Sun, 4 Oct 2015 10:16:54 +0000 (12:16 +0200)]
fix incrementing on 32-bit
Nuno Lopes [Sun, 4 Oct 2015 09:39:01 +0000 (05:39 -0400)]
fix coverage report for datelib
Nuno Lopes [Sun, 4 Oct 2015 09:36:47 +0000 (05:36 -0400)]
fix coverage report for datelib
Xinchen Hui [Sun, 4 Oct 2015 06:16:56 +0000 (23:16 -0700)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sun, 4 Oct 2015 06:16:38 +0000 (23:16 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Sun, 4 Oct 2015 03:33:24 +0000 (20:33 -0700)]
Fixed bug #70632 (Third one of segfault in gc_remove_from_buffer)
Xinchen Hui [Sun, 4 Oct 2015 03:14:55 +0000 (20:14 -0700)]
Fixed the third one of (segfault in gc_remove_from_buffer())
This one maybe only used in debug mode, so no bug report and no test
script provided
Xinchen Hui [Sun, 4 Oct 2015 03:08:21 +0000 (20:08 -0700)]
Fixed bug #70631 (Another Segfault in gc_remove_from_buffer())
Xinchen Hui [Sun, 4 Oct 2015 02:50:38 +0000 (19:50 -0700)]
Do not edit the zval cause it might be in shared memory
Xinchen Hui [Sun, 4 Oct 2015 02:38:56 +0000 (19:38 -0700)]
Fixed bug #70601 (Segfault in gc_remove_from_buffer())
Bob Weinand [Sat, 3 Oct 2015 23:44:05 +0000 (01:44 +0200)]
Merge branch 'PHP-7.0'
Bob Weinand [Sat, 3 Oct 2015 23:38:59 +0000 (01:38 +0200)]
Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())
This additionally removes support for binding to an unknown (not in parent hierarchy) scope.
Removing support for cross-scope is necessary for certain compile-time assumptions (like class constants) to prevent unexpected results
Anatol Belski [Sat, 3 Oct 2015 09:00:24 +0000 (11:00 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
remove useless checks
Anatol Belski [Sat, 3 Oct 2015 08:57:32 +0000 (10:57 +0200)]
remove useless checks
Other platforms than listed in the checks are not supported since
PHP 5.5. We also won't need these checks for a while, so can simplify.
Anatol Belski [Sat, 3 Oct 2015 08:46:32 +0000 (10:46 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix win10 support
Anatol Belski [Sat, 3 Oct 2015 08:46:10 +0000 (10:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix win10 support
Anatol Belski [Sat, 3 Oct 2015 08:44:43 +0000 (10:44 +0200)]
fix win10 support
dwMajorVersion == 10 there, and generally this check is obsolete
as we don't support dwMajorVersion < 6 since 5.5
Nikita Popov [Sat, 3 Oct 2015 08:14:17 +0000 (10:14 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Sat, 3 Oct 2015 08:13:06 +0000 (10:13 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 3 Oct 2015 08:12:11 +0000 (10:12 +0200)]
Fixed bug #70625
Ferenc Kovacs [Fri, 2 Oct 2015 19:51:56 +0000 (21:51 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Update NEWS file with LDAP fixes
Ferenc Kovacs [Fri, 2 Oct 2015 19:51:13 +0000 (21:51 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Update NEWS file with LDAP fixes
Ferenc Kovacs [Fri, 2 Oct 2015 19:48:33 +0000 (21:48 +0200)]
Merge branch 'pr-1544' into PHP-5.6
* pr-1544:
Update NEWS file with LDAP fixes
Derick Rethans [Fri, 2 Oct 2015 17:12:19 +0000 (18:12 +0100)]
Updated to version 2015.7 (2015g)
Derick Rethans [Fri, 2 Oct 2015 17:12:19 +0000 (18:12 +0100)]
Empty merge
Derick Rethans [Fri, 2 Oct 2015 17:12:18 +0000 (18:12 +0100)]
Updated to version 2015.7 (2015g)
Derick Rethans [Fri, 2 Oct 2015 17:12:18 +0000 (18:12 +0100)]
Empty merge
Derick Rethans [Fri, 2 Oct 2015 17:12:16 +0000 (18:12 +0100)]
Updated to version 2015.7 (2015g)
Xinchen Hui [Fri, 2 Oct 2015 14:26:17 +0000 (07:26 -0700)]
Merge branch 'PHP-7.0'
Xinchen Hui [Fri, 2 Oct 2015 14:26:04 +0000 (07:26 -0700)]
PHP7 is not affected
Xinchen Hui [Fri, 2 Oct 2015 14:21:52 +0000 (07:21 -0700)]
Merge branch 'PHP-7.0'
Xinchen Hui [Fri, 2 Oct 2015 14:20:23 +0000 (07:20 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/date/php_date.c
Xinchen Hui [Fri, 2 Oct 2015 14:19:21 +0000 (07:19 -0700)]
Fixed bug #70619 (DateTimeImmutable segfault)
Bob Weinand [Fri, 2 Oct 2015 10:51:45 +0000 (12:51 +0200)]
Merge branch 'PHP-7.0'
Bob Weinand [Fri, 2 Oct 2015 10:51:32 +0000 (12:51 +0200)]
Fix parse errors in -rr mode
Bob Weinand [Fri, 2 Oct 2015 10:38:00 +0000 (12:38 +0200)]
Merge branch 'PHP-7.0'
Bob Weinand [Fri, 2 Oct 2015 10:37:17 +0000 (12:37 +0200)]
Ensure proper set_exception_handler() handling with exit() inside it
Bob Weinand [Fri, 2 Oct 2015 10:18:26 +0000 (12:18 +0200)]
Fixed bug #70614 (incorrect exit code in -rr mode with Exceptions)
Bob Weinand [Fri, 2 Oct 2015 10:03:28 +0000 (12:03 +0200)]
Do not display memory leaks on fatal
Bob Weinand [Fri, 2 Oct 2015 09:43:52 +0000 (11:43 +0200)]
Do not include zend_verify_return_type in executable ops (phpdbg)
Nikita Popov [Fri, 2 Oct 2015 07:45:24 +0000 (09:45 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Fri, 2 Oct 2015 07:10:49 +0000 (09:10 +0200)]
Fix/improve zpp usage
The ext/interbase changes are done blindly, fingers crossed.
Some of these are bug fixes, some make zpp usage more idiomatic.
Nikita Popov [Fri, 2 Oct 2015 06:59:22 +0000 (08:59 +0200)]
More check_parameters improvements
* Switch default REPORT_LEVEL to 1 to cut down on the noise
* Make initialization of 'C' variable always required
* Don't require init of lLdb variable if ! is used
* Don't throw error about missing init of not detected parameters
(This was a regression in the last changeset)
* Support method_parameters and throw variations
Dmitry Stogov [Thu, 1 Oct 2015 20:21:21 +0000 (23:21 +0300)]
ws
Nikita Popov [Thu, 1 Oct 2015 18:47:29 +0000 (20:47 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Thu, 1 Oct 2015 18:22:55 +0000 (20:22 +0200)]
More check_parameters improvements
* Allow / on everything but lLdb (on which it will work, but makes
no sense).
* For ! on lLdb add additional zend_bool* parameter.
* For optional s and p only require one of the variables to be
initialized. The length is usually not initialized.
Sean DuBois [Tue, 15 Sep 2015 07:05:27 +0000 (02:05 -0500)]
Update scripts/dev/check_parameters.php for PHP 7
Also fix deprecation errors and move from preg_replace
-> preg_replace_callback.
Nikita Popov [Thu, 1 Oct 2015 14:40:58 +0000 (16:40 +0200)]
Merge branch 'PHP-7.0'