]>
granicus.if.org Git - php/log
Nikita Popov [Fri, 9 Oct 2015 21:30:34 +0000 (23:30 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Fri, 9 Oct 2015 21:28:58 +0000 (23:28 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Fri, 9 Oct 2015 21:28:24 +0000 (23:28 +0200)]
Improve previous fix
Don't forbid null binding on plain functions.
Nikita Popov [Fri, 9 Oct 2015 21:07:10 +0000 (23:07 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Fri, 9 Oct 2015 21:05:49 +0000 (23:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Fri, 9 Oct 2015 21:01:23 +0000 (23:01 +0200)]
Fixed bug #70681
Anatol Belski [Fri, 9 Oct 2015 10:37:00 +0000 (12:37 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
update NEWS
fix coverage report for datelib
Anatol Belski [Fri, 9 Oct 2015 10:36:40 +0000 (12:36 +0200)]
update NEWS
Anatol Belski [Fri, 9 Oct 2015 10:35:48 +0000 (12:35 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
fix coverage report for datelib
Anatol Belski [Fri, 9 Oct 2015 10:35:06 +0000 (12:35 +0200)]
update NEWS
Dmitry Stogov [Fri, 9 Oct 2015 08:49:00 +0000 (11:49 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())
Dmitry Stogov [Fri, 9 Oct 2015 08:48:13 +0000 (11:48 +0300)]
Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())
Dmitry Stogov [Thu, 8 Oct 2015 23:40:11 +0000 (02:40 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed reference cuntmting for closures (previously we didn't increment reference counter for "internal" closures)
Dmitry Stogov [Thu, 8 Oct 2015 23:39:07 +0000 (02:39 +0300)]
Fixed reference cuntmting for closures (previously we didn't increment reference counter for "internal" closures)
Dmitry Stogov [Thu, 8 Oct 2015 23:38:47 +0000 (02:38 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed infinity recurion if we create closure on top of other closure.
Dmitry Stogov [Thu, 8 Oct 2015 23:37:51 +0000 (02:37 +0300)]
Fixed infinity recurion if we create closure on top of other closure.
Dmitry Stogov [Thu, 8 Oct 2015 22:09:36 +0000 (01:09 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed use after free
Dmitry Stogov [Thu, 8 Oct 2015 22:09:22 +0000 (01:09 +0300)]
Fixed use after free
Dmitry Stogov [Thu, 8 Oct 2015 21:45:45 +0000 (00:45 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #70674 (ReflectionFunction::getClosure() leaks memory when used for internal functions)
Dmitry Stogov [Thu, 8 Oct 2015 21:45:02 +0000 (00:45 +0300)]
Fixed bug #70674 (ReflectionFunction::getClosure() leaks memory when used for internal functions)
Dmitry Stogov [Thu, 8 Oct 2015 21:42:26 +0000 (00:42 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Correct intdiv() argument names and description
Andrea Faulds [Tue, 6 Oct 2015 15:12:48 +0000 (16:12 +0100)]
Correct intdiv() argument names and description
Dmitry Stogov [Thu, 8 Oct 2015 11:59:55 +0000 (14:59 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #70668 (array_keys() doesn't respect references when $strict is true)
Dmitry Stogov [Thu, 8 Oct 2015 11:59:02 +0000 (14:59 +0300)]
Fixed bug #70668 (array_keys() doesn't respect references when $strict is true)
Dmitry Stogov [Thu, 8 Oct 2015 11:33:03 +0000 (14:33 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #70667 (strtr() causes invalid writes and a crashes)
Dmitry Stogov [Thu, 8 Oct 2015 11:30:43 +0000 (14:30 +0300)]
Fixed bug #70667 (strtr() causes invalid writes and a crashes)
Nikita Popov [Thu, 8 Oct 2015 09:04:45 +0000 (11:04 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Wed, 7 Oct 2015 20:47:09 +0000 (22:47 +0200)]
Fix bug #70662
This replaces add_new with update for the RW case. This should not
be problematic for performance, as this branch throws a notice.
Alternatively add_new could also be replaced with add. I went with
update, because it makes $a[0] += 1 behavior the same as
$a[0] = $a[0] + 1.
Ferenc Kovacs [Thu, 8 Oct 2015 08:38:46 +0000 (10:38 +0200)]
update NEWS/UPGRADING
Ferenc Kovacs [Thu, 8 Oct 2015 08:23:24 +0000 (10:23 +0200)]
Merge branch 'pr-1204'
* pr-1204:
no need for default value
allow passing null as the third param
Implemented FR #55716 - Add an option to pass a custom stream context
Nikita Popov [Wed, 7 Oct 2015 14:26:58 +0000 (16:26 +0200)]
Merge branch 'PHP-7.0'
Márcio Almada [Tue, 6 Oct 2015 20:32:23 +0000 (17:32 -0300)]
Fix bug #70650
Ferenc Kovacs [Wed, 7 Oct 2015 14:15:59 +0000 (16:15 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
pear 1.10 was released and the go-pear and install pear phars are now php7 compatible
Ferenc Kovacs [Wed, 7 Oct 2015 11:56:47 +0000 (13:56 +0200)]
pear 1.10 was released and the go-pear and install pear phars are now php7 compatible
Dmitry Stogov [Wed, 7 Oct 2015 11:12:43 +0000 (14:12 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed test. MySQL and MariaDB of different versions have different assumptions about TIMESTAMP attributes. Probably we need to add yet another condition to also check MariaDB version.
Dmitry Stogov [Wed, 7 Oct 2015 11:09:37 +0000 (14:09 +0300)]
Fixed test.
MySQL and MariaDB of different versions have different assumptions about TIMESTAMP attributes.
Probably we need to add yet another condition to also check MariaDB version.
Christopher Jones [Wed, 7 Oct 2015 09:31:02 +0000 (20:31 +1100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Christopher Jones [Wed, 7 Oct 2015 09:27:40 +0000 (20:27 +1100)]
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Fixed test running on MarinaDB.
Christopher Jones [Wed, 7 Oct 2015 09:27:38 +0000 (20:27 +1100)]
Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0
* 'PHP-7.0' of https://git.php.net/repository/php-src:
Fixed test running on MarinaDB.
Christopher Jones [Wed, 7 Oct 2015 09:25:35 +0000 (20:25 +1100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix mem leak and improve test portability (Senthil)
Christopher Jones [Wed, 7 Oct 2015 09:24:49 +0000 (20:24 +1100)]
Fix mem leak and improve test portability (Senthil)
Dmitry Stogov [Wed, 7 Oct 2015 09:22:17 +0000 (12:22 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed test running on MarinaDB.
Dmitry Stogov [Wed, 7 Oct 2015 09:21:43 +0000 (12:21 +0300)]
Fixed test running on MarinaDB.
Anatol Belski [Wed, 7 Oct 2015 07:44:15 +0000 (09:44 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
add comment to test
Anatol Belski [Wed, 7 Oct 2015 07:43:28 +0000 (09:43 +0200)]
add comment to test
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:45:05 +0000 (05:45 -0400)]
fix coverage report for datelib
Nuno Lopes [Sun, 4 Oct 2015 09:39:01 +0000 (05:39 -0400)]
fix coverage report for datelib