Anatol Belski
0b89c29288
Merge branch 'PHP-7.0'
...
* PHP-7.0:
update NEWS, patch for #70249 pulled into RC7
adjust test expectation
fix test filename and title
2015-11-11 12:21:51 +01:00
Anatol Belski
b89f451694
adjust test expectation
2015-11-11 09:47:29 +01:00
Anatol Belski
3cdc438e53
fix test filename and title
2015-11-11 09:47:24 +01:00
Dmitry Stogov
948b7f5421
Changed ZEND_FREE.op2.num and ZEND_FE_FREE.op2.num back to use live_range_offset (try_catch_offset does't work)
2015-11-11 11:12:44 +03:00
Xinchen Hui
cd6dda1679
Merge branch 'PHP-7.0'
2015-11-11 12:33:13 +08:00
Xinchen Hui
82f503f587
Re-Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev)
...
Let's fixed this in the root instead
2015-11-11 12:32:46 +08:00
Dmitry Stogov
baf97b1fcc
We don't nees zend_op_array->brk_cont_array at run-time anymore.
...
Move zend_op_array->brk_cont_array into CG(context).brk_cont_array.
Use more compact zend_op_array->live_range instead of zend_op_array->brk_cont_array.
Semantic is kept unchanged.
2015-11-10 21:48:03 +03:00
Dmitry Stogov
71092b7c2b
Make FE_FETCH and following assignments to be a part of a loop.
2015-11-10 20:11:05 +03:00
Dmitry Stogov
86a96f2cf1
Changed meaning of "op2" for ZEND_FREE, ZEND_FE_FREE, ZEND_FAST_CALL, ZEND_FAST_RET.
...
Previously it was an instruction number.
Now it's an index in op_array->try_cacth_array[].
2015-11-10 19:13:54 +03:00
Xinchen Hui
2d750a7233
Merge branch 'PHP-7.0'
2015-11-10 16:01:14 +08:00
Xinchen Hui
4803914ae6
Unused var
2015-11-10 15:54:32 +08:00
Dmitry Stogov
6fe457f323
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed incorrect order of free/finally on exception
2015-11-10 10:11:46 +03:00
Dmitry Stogov
d66d1b97aa
Fixed incorrect order of free/finally on exception
2015-11-10 10:10:39 +03:00
Andrea Faulds
7bc6361294
Merge branch 'PHP-7.0'
2015-11-09 23:42:12 +00:00
Anatol Belski
795af791b0
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
2015-11-10 00:41:40 +01:00
Anatol Belski
ba91c1f51c
Merge branch 'PHP-7.0'
...
* PHP-7.0:
additional catch to bug #70863
2015-11-10 00:40:49 +01:00
Andrea Faulds
37b64de20f
Merge branch 'use_ZEND_STRL_for_builtin_types' into PHP-7.0
2015-11-09 23:40:49 +00:00
Anatol Belski
a3f1154b3d
additional catch to bug #70863
2015-11-10 00:38:11 +01:00
Anatol Belski
119b2fbfbe
Merge branch 'PHP-7.0'
...
* PHP-7.0:
add test for eb32da13
2015-11-09 22:49:52 +01:00
Anatol Belski
2e38918ba4
add test for eb32da13
2015-11-09 22:45:22 +01:00
Dmitry Stogov
67990fc0a4
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Added tests
2015-11-09 23:54:58 +03:00
Dmitry Stogov
c9eacb181c
Added tests
2015-11-09 23:54:09 +03:00
Andrea Faulds
dae37661d9
Use ZEND_STRL macro for builtin_types
2015-11-09 11:15:58 +00:00
Xinchen Hui
b31d2f34fb
Merge branch 'PHP-7.0'
2015-11-09 17:15:05 +08:00
Xinchen Hui
d70aa14f2c
Fixed bug #70323 (Regression in zend_fetch_debug_backtrace() can cause segfaults)
2015-11-09 17:14:15 +08:00
Xinchen Hui
83de5364b7
manually apply the typo fix in master
2015-11-07 23:03:25 -08:00
Xinchen Hui
67e88df9d4
Merge branch 'patch-3' of https://github.com/staabm/php-src
2015-11-07 23:02:19 -08:00
Xinchen Hui
f76e57f1f3
Merge branch 'PHP-7.0'
2015-11-07 06:50:43 -08:00
Xinchen Hui
2d8d97cee2
Fixed bug #70873 (Regression on private static properties access)
2015-11-07 06:50:36 -08:00
Nikita Popov
603c172269
Merge branch 'PHP-7.0'
...
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
2015-11-07 12:09:20 +01:00
Nikita Popov
99d818f1e9
Don't propagate into ops that error on non-string
...
To properly support this make update_opN_const fallible -- they
are not always called through replace_with_const.
2015-11-07 12:04:51 +01:00
Nikita Popov
00b37e718d
Strip leading backslash in update_opN_const
2015-11-07 12:04:51 +01:00
Nikita Popov
632bee4abb
Fix update_opX_const lowercasing
...
It was lowering in-place.
2015-11-07 12:04:51 +01:00
Anatol Belski
655e266440
Merge branch 'PHP-7.0'
...
* PHP-7.0:
update NEWS
fix decrement_function regarding bug #70863
Fixed bug #70863 Incorect logic to increment_function for proxy objects
no more dev ZEND_VERSION
Add support for IPV6_V6ONLY on sockets
Conflicts:
Zend/zend.h
2015-11-06 23:10:40 +01:00
Anatol Belski
d59eb9fcc3
fix decrement_function regarding bug #70863
2015-11-06 23:07:21 +01:00
Anatol Belski
8155ecba61
Fixed bug #70863 Incorect logic to increment_function for proxy objects
2015-11-06 23:07:16 +01:00
Anatol Belski
6897c1116a
no more dev ZEND_VERSION
2015-11-06 23:07:10 +01:00
Xinchen Hui
27aef97f65
Fixed bug #70868 (PCRE JIT and pattern reuse segfault)
2015-11-06 11:37:17 +08:00
Márcio Almada
283b6275df
add failing test for bug #70868
2015-11-06 11:34:45 +08:00
Anatol Belski
d756da8e72
Merge branch 'PHP-7.0'
...
* PHP-7.0:
re-update NEWS
update the actual sql parser file for #70861
Fix bug #70861 Segmentation fault in pdo_parse_params() during Drupal 8 test suite
don't get invalid chmod mode through
zero cwd buffer before passing to chmod
2015-11-05 14:49:25 +01:00
Anatol Belski
9968129831
don't get invalid chmod mode through
2015-11-05 14:46:23 +01:00
Anatol Belski
dea14fc707
zero cwd buffer before passing to chmod
2015-11-05 14:46:18 +01:00
Xinchen Hui
a4a767e6da
Merge branch 'PHP-7.0'
...
Conflicts:
Zend/zend_vm_execute.h
2015-11-03 17:56:05 -08:00
Xinchen Hui
2f2653aa77
Fixed bug #70805 (Segmentation faults whilst running Drupal 8 test suite)
2015-11-03 17:53:56 -08:00
Markus Staab
8e83ea6e5d
fixed another comment typo
2015-10-28 09:03:16 +01:00
Markus Staab
08c97ea0a1
fixed typo
2015-10-27 17:29:28 +01:00
Markus Staab
b83782e682
fixed another comment typo
2015-10-27 17:27:57 +01:00
Markus Staab
058a7ab55c
fixed typo in comment
...
introduced in eb32da13cd
2015-10-27 17:26:36 +01:00
Anatol Belski
24bae1614f
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fix frequent reallocations with many small strings
correct snprintf usage
2015-10-27 17:08:51 +01:00
Dmitry Stogov
eb32da13cd
Fix frequent reallocations with many small strings
2015-10-27 17:07:58 +01:00
