Commit Graph

92779 Commits

Author SHA1 Message Date
Xinchen Hui
caedb7c5dc Merge branch 'move-reflection-tests' of https://github.com/Sobak/php-src 2015-10-14 10:27:37 +08:00
Xinchen Hui
07d2d7fa53 Merge branch 'PHP-7.0' 2015-10-14 10:20:13 +08:00
Xinchen Hui
010509355d Fixed Conditional jump or move depends on uninitialised value 2015-10-14 10:19:57 +08:00
Bob Weinand
bcf6012cf4 Merge branch 'PHP-7.0' 2015-10-13 15:51:42 +02: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
2741090bfa Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed incorrect "peak" memory consumption calculation.
2015-10-13 15:21:26 +03:00
Dmitry Stogov
d949c3b6e5 Fixed incorrect "peak" memory consumption calculation. 2015-10-13 15:20:17 +03:00
Anatol Belski
dcced66739 Merge branch 'PHP-7.0'
* PHP-7.0:
  update UPGRADING
2015-10-13 11:49:13 +02:00
Anatol Belski
d1b67af3ab update UPGRADING 2015-10-13 11:47:30 +02:00
Xinchen Hui
a3c2c802ba Merge branch 'PHP-7.0' 2015-10-13 17:41:18 +08:00
Xinchen Hui
a8ae88162f Fixed bug #70689 (Exception handler does not work as expected) 2015-10-13 17:40:58 +08:00
Bob Weinand
c717d14a8e Merge branch 'PHP-7.0' 2015-10-13 11:30:14 +02:00
Bob Weinand
e85a0aba9b Fix on/off values in phpdbg lexer 2015-10-13 11:29:51 +02:00
Anatol Belski
d8f47bd177 Merge branch 'PHP-7.0'
* PHP-7.0:
  prepare NEWS for next
  update libs_versions.txt
2015-10-13 10:35:33 +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
2f06c0b2ea Merge branch 'PHP-7.0' 2015-10-12 20:37:55 +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
655e16ee95 Merge branch 'PHP-7.0'
* PHP-7.0:
  increase API versions
2015-10-12 20:26:34 +02:00
Anatol Belski
dcbbf7c38d increase API versions 2015-10-12 20:17:22 +02:00
Felipe Pena
ffebd5dbf6 - Fixed missing line-break 2015-10-12 09:54:03 -03:00
Felipe Pena
3831124ef0 Merge branch 'master' of git.php.net:php-src 2015-10-12 09:07:49 -03:00
Felipe Pena
cf092b1b16 - Revert change, no check is needed there 2015-10-12 09:07:28 -03:00
Anatol Belski
f031b3353a Merge branch 'PHP-7.0'
* PHP-7.0:
  fork test for ICU 56.1
  fork test for ICU-56.1
  fix test for ICU-56.1
2015-10-12 11:29:07 +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
46a747090f Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test
2015-10-12 09:47:09 +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
2dd32fe489 Merge branch 'PHP-7.0' 2015-10-12 10:44:45 +08:00
Xinchen Hui
8732ead953 Double declaration 2015-10-12 10:42:04 +08:00
Felipe Pena
8d12ff7513 - Fixed bug #70678 (PHP7 returns true when false is expected) 2015-10-11 12:08:34 -03:00
Felipe Pena
acbecd7b31 - Fixed regression when calling func_get_args() from global scope 2015-10-11 10:30:44 -03:00
Sobak
68750d04c7 Move ext/reflection tests into the proper directory 2015-10-11 08:41:21 +02:00
Anatol Belski
9f27624641 fix ftok() export 2015-10-10 19:15:02 +02:00
Anatol Belski
49fe59e6d0 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix stack overflow
2015-10-10 18:39:47 +02:00
Anatol Belski
4224907864 fix stack overflow 2015-10-10 18:37:16 +02:00
Anatol Belski
9d3f6f4319 update UPGRADING 2015-10-10 18:20:56 +02:00
Anatol Belski
be3794831d replace typedef by an appropriate include 2015-10-10 17:31:40 +02:00
Anatol Belski
c3dd6058df rename header 2015-10-10 17:31:33 +02:00
Anatol Belski
f588c29f9a fix macro name 2015-10-10 17:31:26 +02:00
Anatol Belski
2dc0ce2fcd enable ftok implementation 2015-10-10 17:31:19 +02:00
Anatol Belski
5def56e23f initial ftok() implementation for win32 2015-10-10 17:31:12 +02:00
Anatol Belski
5b58d85186 fix stack overflow 2015-10-10 17:31:05 +02:00
Bob Weinand
abeb29a274 Merge branch 'PHP-7.0' 2015-10-10 17:26:12 +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
91eb79d71a Merge branch 'PHP-7.0' 2015-10-10 15:00:58 +02:00