]>
granicus.if.org Git - php/log
Sara Golemon [Thu, 15 Oct 2015 05:42:38 +0000 (22:42 -0700)]
Scan through a range of ports in case 31338 is busy
ext/standard/tests/network/ud4loop.phpt hardcodes port 31338.
If that fails to bind, try a few more (up to 31499) before giving up.
Xinchen Hui [Thu, 15 Oct 2015 02:19:43 +0000 (10:19 +0800)]
Fixed bug #70709 (SOAP Client generates Segfault)
Ferenc Kovacs [Wed, 14 Oct 2015 22:54:59 +0000 (00:54 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
prepare for 5.6.15RC1
Ferenc Kovacs [Wed, 14 Oct 2015 22:22:12 +0000 (00:22 +0200)]
prepare for 5.6.15RC1
Bob Weinand [Wed, 14 Oct 2015 10:07:04 +0000 (12:07 +0200)]
Do not create a fake Closure for real Closures
That is solved by just returning the Closure as is, which is safe due to Closures being immutable objects
Xinchen Hui [Wed, 14 Oct 2015 02:31:07 +0000 (10:31 +0800)]
Merge branch 'patch-1' of https://github.com/glensc/php-src into PHP-7.0
Xinchen Hui [Wed, 14 Oct 2015 02:26:02 +0000 (10:26 +0800)]
Move the tests to proper place
Xinchen Hui [Wed, 14 Oct 2015 02:19:57 +0000 (10:19 +0800)]
Fixed Conditional jump or move depends on uninitialised value
Bob Weinand [Tue, 13 Oct 2015 13:51:23 +0000 (15:51 +0200)]
Prevent memcmp() result truncation
This fixes reported issues with sapi/phpdbg/tests/watch_001.phpt
Bob Weinand [Tue, 13 Oct 2015 12:40:29 +0000 (14:40 +0200)]
phpdbg test info_001.phpt was dependent on auto_globals_jit
Dmitry Stogov [Tue, 13 Oct 2015 12:20:17 +0000 (15:20 +0300)]
Fixed incorrect "peak" memory consumption calculation.
Anatol Belski [Tue, 13 Oct 2015 09:45:34 +0000 (11:45 +0200)]
update UPGRADING
Xinchen Hui [Tue, 13 Oct 2015 09:40:58 +0000 (17:40 +0800)]
Fixed bug #70689 (Exception handler does not work as expected)
Bob Weinand [Tue, 13 Oct 2015 09:29:51 +0000 (11:29 +0200)]
Fix on/off values in phpdbg lexer
Anatol Belski [Tue, 13 Oct 2015 08:34:30 +0000 (10:34 +0200)]
prepare NEWS for next
Anatol Belski [Mon, 12 Oct 2015 18:42:19 +0000 (20:42 +0200)]
update libs_versions.txt
Nikita Popov [Fri, 9 Oct 2015 21:38:25 +0000 (23:38 +0200)]
Add more tests for closure binding
Dmitry Stogov [Fri, 9 Oct 2015 16:41:15 +0000 (18:41 +0200)]
Forbid "fake" closure rebinding
Anatol Belski [Mon, 12 Oct 2015 18:17:22 +0000 (20:17 +0200)]
increase API versions
Anatol Belski [Mon, 12 Oct 2015 09:20:51 +0000 (11:20 +0200)]
fork test for ICU 56.1
Anatol Belski [Mon, 12 Oct 2015 09:16:27 +0000 (11:16 +0200)]
fork test for ICU-56.1
Anatol Belski [Mon, 12 Oct 2015 09:10:04 +0000 (11:10 +0200)]
fix test for ICU-56.1
Matteo Beccati [Mon, 12 Oct 2015 07:47:02 +0000 (09:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix test
Anatol Belski [Wed, 30 Sep 2015 10:18:32 +0000 (12:18 +0200)]
fix test
Xinchen Hui [Mon, 12 Oct 2015 02:42:04 +0000 (10:42 +0800)]
Double declaration
Anatol Belski [Tue, 22 Sep 2015 19:12:05 +0000 (21:12 +0200)]
fix stack overflow
Bob Weinand [Sat, 10 Oct 2015 15:24:14 +0000 (17:24 +0200)]
Generally run all tests in sapi folder by default
Turned out that sapi/phpdbg actually wasn't explicitly included as sapi folders were individually selected
Nikita Popov [Sat, 10 Oct 2015 13:00:41 +0000 (15:00 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_closures.c
Nikita Popov [Sat, 10 Oct 2015 12:54:14 +0000 (14:54 +0200)]
Fixed bug #70685
Doing a less intrusive variant of the PHP 7.0 fix for 5.6.
Nikita Popov [Sat, 10 Oct 2015 11:39:26 +0000 (13:39 +0200)]
Normalize rebinding failures
Move all rebinding checks into one function to make sure they stay
in sync. Normalize return value to be NULL for all rebinding
failures, instead of returning an improperly bound closure in some
cases.
Anatol Belski [Fri, 9 Oct 2015 21:07:10 +0000 (23:07 +0200)]
Implemented file_cache_fallback mechanism
which is essential as an attempt to fix the "failed to reattach"
error on Windows. If file_cache is enabled, Opcache will
automaticaly switch to file_cache_only mode in the case a process
failed to map the shared segment at the required address. The
important small part of the SHM will still be mapped, which
allows information exchange between normal processes using SHM
and those using the fallback mechanism.
This is based on Dmitry's, Matt's and mine ideas. So many thanks for
support!
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: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: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:48:13 +0000 (11:48 +0300)]
Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())
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: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:22 +0000 (01:09 +0300)]
Fixed use after free
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)
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: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:30:43 +0000 (14:30 +0300)]
Fixed bug #70667 (strtr() causes invalid writes and a crashes)
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.
Márcio Almada [Tue, 6 Oct 2015 20:32:23 +0000 (17:32 -0300)]
Fix bug #70650
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: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: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:24:49 +0000 (20:24 +1100)]
Fix mem leak and improve test portability (Senthil)
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:43:28 +0000 (09:43 +0200)]
add comment to test
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:25:12 +0000 (03:25 +0300)]
Fixed test (system error messages may be different).
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: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: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: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 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:32:28 +0000 (22:32 +0200)]
More zpp cleanup in ext/intl
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 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
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 [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:52:09 +0000 (21:52 +0200)]
Speed up self::$property access by 20%
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: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:45:15 +0000 (14:45 +0200)]
Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src
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 12:33:09 +0000 (14:33 +0200)]
improve error message
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
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: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
Elan Ruusamäe [Sat, 3 Oct 2015 19:10:47 +0000 (22:10 +0300)]
Update UPGRADING.INTERNALS
typo fix
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: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: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: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: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