Commit Graph

92551 Commits

Author SHA1 Message Date
Sara Golemon
a2005cec5c 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.
2015-10-14 22:44:27 -07:00
Xinchen Hui
a2cfcdfbe9 Fixed bug #70709 (SOAP Client generates Segfault) 2015-10-15 10:19:43 +08:00
Ferenc Kovacs
b610d740fd Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  prepare for 5.6.15RC1
2015-10-15 00:54:59 +02:00
Ferenc Kovacs
22cbf68344 prepare for 5.6.15RC1 2015-10-15 00:22:12 +02:00
Bob Weinand
60b4355168 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
2015-10-14 12:07:33 +02:00
Xinchen Hui
5649b0ccba Merge branch 'patch-1' of https://github.com/glensc/php-src into PHP-7.0 2015-10-14 10:31:07 +08:00
Xinchen Hui
534856c98a Move the tests to proper place 2015-10-14 10:26:02 +08:00
Xinchen Hui
010509355d Fixed Conditional jump or move depends on uninitialised value 2015-10-14 10:19:57 +08:00
Bob Weinand
d398cc9d10 Prevent memcmp() result truncation
This fixes reported issues with sapi/phpdbg/tests/watch_001.phpt
2015-10-13 15:51:23 +02:00
Bob Weinand
6efbfc4caf phpdbg test info_001.phpt was dependent on auto_globals_jit 2015-10-13 14:40:42 +02:00
Dmitry Stogov
d949c3b6e5 Fixed incorrect "peak" memory consumption calculation. 2015-10-13 15:20:17 +03:00
Anatol Belski
d1b67af3ab update UPGRADING 2015-10-13 11:47:30 +02:00
Xinchen Hui
a8ae88162f Fixed bug #70689 (Exception handler does not work as expected) 2015-10-13 17:40:58 +08:00
Bob Weinand
e85a0aba9b Fix on/off values in phpdbg lexer 2015-10-13 11:29:51 +02:00
Anatol Belski
4d8e284cce prepare NEWS for next 2015-10-13 10:34:30 +02:00
Anatol Belski
afdbd8f95b update libs_versions.txt 2015-10-13 09:41:34 +02:00
Nikita Popov
7597a06562 Add more tests for closure binding 2015-10-12 20:37:14 +02:00
Dmitry Stogov
23b372d358 Forbid "fake" closure rebinding 2015-10-12 20:34:08 +02:00
Anatol Belski
dcbbf7c38d increase API versions 2015-10-12 20:17:22 +02:00
Anatol Belski
5492fe9f25 fork test for ICU 56.1 2015-10-12 11:20:51 +02:00
Anatol Belski
aea420c7cf fork test for ICU-56.1 2015-10-12 11:16:27 +02:00
Anatol Belski
3fb6f0014a fix test for ICU-56.1 2015-10-12 11:10:04 +02:00
Matteo Beccati
474a2e01eb Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix test
2015-10-12 09:47:02 +02:00
Anatol Belski
d160e98feb fix test 2015-10-12 09:46:52 +02:00
Xinchen Hui
8732ead953 Double declaration 2015-10-12 10:42:04 +08:00
Anatol Belski
4224907864 fix stack overflow 2015-10-10 18:37:16 +02:00
Bob Weinand
fe67696867 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
2015-10-10 17:24:14 +02:00
Nikita Popov
c85ad5d0be Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	Zend/zend_closures.c
2015-10-10 15:00:41 +02:00
Nikita Popov
d7d01fc9a3 Fixed bug #70685
Doing a less intrusive variant of the PHP 7.0 fix for 5.6.
2015-10-10 14:59:21 +02:00
Nikita Popov
4b821f0fc6 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.
2015-10-10 13:56:36 +02:00
Anatol Belski
ffb5d0aca3 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!
2015-10-09 23:47:59 +02:00
Nikita Popov
d677b25b1c Merge branch 'PHP-5.6' into PHP-7.0 2015-10-09 23:28:58 +02:00
Nikita Popov
e19423f3cb Improve previous fix
Don't forbid null binding on plain functions.
2015-10-09 23:28:24 +02:00
Nikita Popov
f6ae19f158 Merge branch 'PHP-5.6' into PHP-7.0 2015-10-09 23:06:32 +02:00
Nikita Popov
bbae7ddf29 Fixed bug #70681 2015-10-09 23:01:23 +02:00
Anatol Belski
be09d1c262 update NEWS 2015-10-09 12:36:40 +02:00
Anatol Belski
d468390353 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
  fix coverage report for datelib
2015-10-09 12:35:48 +02:00
Anatol Belski
505c9c3742 update NEWS 2015-10-09 12:35:06 +02:00
Dmitry Stogov
0847681b1a Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure()) 2015-10-09 11:48:13 +03:00
Dmitry Stogov
c6af0aa33f Fixed reference cuntmting for closures (previously we didn't increment reference counter for "internal" closures) 2015-10-09 02:39:07 +03:00
Dmitry Stogov
93748bf9dd Fixed infinity recurion if we create closure on top of other closure. 2015-10-09 02:37:51 +03:00
Dmitry Stogov
05bd331c6a Fixed use after free 2015-10-09 01:09:22 +03:00
Dmitry Stogov
91fb3a7b27 Fixed bug #70674 (ReflectionFunction::getClosure() leaks memory when used for internal functions) 2015-10-09 00:45:02 +03:00
Andrea Faulds
fa23bebe94 Correct intdiv() argument names and description 2015-10-08 15:45:22 +01:00
Dmitry Stogov
3815e97136 Fixed bug #70668 (array_keys() doesn't respect references when $strict is true) 2015-10-08 14:59:02 +03:00
Dmitry Stogov
9af07e7119 Fixed bug #70667 (strtr() causes invalid writes and a crashes) 2015-10-08 14:30:43 +03:00
Nikita Popov
cc3c425af8 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.
2015-10-08 11:03:39 +02:00
Márcio Almada
ddb6d7801e Fix bug #70650 2015-10-07 16:25:59 +02:00
Ferenc Kovacs
f9e3461c02 pear 1.10 was released and the go-pear and install pear phars are now php7 compatible 2015-10-07 13:56:47 +02:00
Dmitry Stogov
5d2813edce 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.
2015-10-07 14:09:37 +03:00