Bob Weinand
3c0adf2dcd
Merge branch 'PHP-5.6'
2014-07-30 18:07:01 +02:00
Bob Weinand
d5ddd2dbb2
Disable restrictions regarding arrays in constants at run-time.
...
For the discussion around it, see the thread on the mailing list:
http://www.mail-archive.com/internals@lists.php.net/msg68245.html
2014-07-30 17:57:07 +02:00
Dmitry Stogov
8fb7c4dc08
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Removed second zval_copy_ctor()
2014-07-24 01:16:28 +04:00
Dmitry Stogov
ea1d5dcacb
Removed second zval_copy_ctor()
2014-07-24 01:16:00 +04:00
Dmitry Stogov
39740a33e5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed crash on self-referencing constant expression (part of a constant AST)
2014-07-24 00:59:42 +04:00
Dmitry Stogov
d909b6330e
Fixed crash on self-referencing constant expression (part of a constant AST)
2014-07-24 00:37:15 +04:00
Dmitry Stogov
4c37e69957
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed support for constant arrays in context of "const" statement (Zend/tests/constant_expressions_arrays.phpt failed when opcache.protect_memort was set)
2014-07-23 22:49:46 +04:00
Dmitry Stogov
c49a06168e
Fixed support for constant arrays in context of "const" statement (Zend/tests/constant_expressions_arrays.phpt failed when opcache.protect_memort was set)
2014-07-23 22:47:58 +04:00
Xinchen Hui
1c0e22f50c
Merge branch 'PHP-5.6'
2014-07-19 17:19:57 +08:00
Xinchen Hui
1d2f232bd2
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-19 17:19:39 +08:00
Xinchen Hui
8ff00e6e85
Improve fix for #66608
2014-07-19 17:19:01 +08:00
Xinchen Hui
9ce1a36af2
Fixed segfault with empty break
2014-07-19 15:30:50 +08:00
Xinchen Hui
a3e8a10918
Merge branch 'PHP-5.6'
2014-07-19 13:12:56 +08:00
Xinchen Hui
9bef96d96e
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-19 13:12:36 +08:00
Xinchen Hui
f604b61e39
New added opcodes don't need to be resloved
2014-07-19 12:53:34 +08:00
Xinchen Hui
f6f621ef69
Merge branch 'PHP-5.6'
2014-07-18 15:51:24 +08:00
Xinchen Hui
550b3e4306
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2014-07-18 15:48:56 +08:00
Xinchen Hui
de433d4c47
Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)
2014-07-18 15:45:31 +08:00
Stanislav Malyshev
c291033469
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Make sure the generator script also creates a newline at the end of file
Add newline at end of file to prevent compilation warning
2014-07-06 22:15:35 -07:00
Lior Kaplan
716d2a3937
Make sure the generator script also creates a newline at the end of file
...
Similar to commit d6713f39
2014-07-06 22:15:09 -07:00
Lior Kaplan
c5fec9e09d
Add newline at end of file to prevent compilation warning
...
The newline was removed at commit 50d50c2f
2014-07-06 22:15:00 -07:00
Nikita Popov
ac552cccc1
Merge branch 'PHP-5.6'
2014-07-02 17:37:25 +02:00
Nikita Popov
1ea4b17af2
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-02 17:36:27 +02:00
Nikita Popov
d9ebd0f3d6
Fix bug #67497 : eval with parse error causes segfault in generator
2014-07-02 17:33:31 +02:00
Bob Weinand
6b0beb9df1
Merge branch 'PHP-5.6'
2014-07-02 17:26:44 +02:00
Bob Weinand
1163a7ce24
Mark test as XFAIL until fixed
2014-07-02 17:25:47 +02:00
Bob Weinand
c01dcd325d
Merge branch 'PHP-5.6'
2014-07-02 12:44:30 +02:00
Bob Weinand
33699a4dab
Messed up syntax of tests
2014-07-02 12:43:27 +02:00
Bob Weinand
0870cc8a7c
Merge branch 'PHP-5.6'
2014-07-02 12:35:06 +02:00
Bob Weinand
09d1a8aaab
Add tests for constant expression arrays
...
Adding one failing (!) test for now about circular constant references embedded in a constant AST, must be fixed before PHP 5.6 release.
2014-07-02 12:33:46 +02:00
Dmitry Stogov
8c9b3e664c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed possible crash because of race conditions on modifying constants in shared memory
2014-07-01 00:17:55 +04:00
Dmitry Stogov
2330be5641
Fixed possible crash because of race conditions on modifying constants in shared memory
2014-07-01 00:13:34 +04:00
Xinchen Hui
18bde665f5
Merge branch 'PHP-5.6'
2014-06-24 13:53:43 +08:00
Xinchen Hui
9d49492fd6
Fixed bug #67368 (Memory leak with immediately dereferenced array in class constant)
2014-06-24 13:53:05 +08:00
Ferenc Kovacs
f5defa1cf2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql)
mention 67468 fix in NEWS
Fix Bug #67468 Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded
2014-06-23 10:14:08 +02:00
Ferenc Kovacs
53158f2c32
testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql)
2014-06-23 10:10:17 +02:00
Andreas Ferber
c5e6c2a5f5
Fix Bug #67468 Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded
...
str_efree() must be used in zend_highlight() and zend_indent() to free
string data assigned to a zval to account for interned strings.
2014-06-23 09:51:44 +02:00
Bob Weinand
b4d61c335b
Merge branch 'PHP-5.6'
2014-06-16 11:20:05 +02:00
Bob Weinand
3c2b42ac41
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
Zend/zend_compile.c
2014-06-16 11:18:45 +02:00
Bob Weinand
e93f8e74d4
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-16 11:16:33 +02:00
Bob Weinand
0a3979e08b
Fix patch for bug #67436
2014-06-16 11:10:50 +02:00
Bob Weinand
8668f205ca
Merge branch 'PHP-5.6'
2014-06-16 00:43:31 +02:00
Bob Weinand
7cef3a57ad
Merge branch 'PHP-5.5' into PHP-5.6
2014-06-16 00:42:50 +02:00
Bob Weinand
03ee0ddc5f
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-16 00:41:46 +02:00
Levi Morrison
6c9c44905e
Added tests for bug 67436
2014-06-15 16:31:39 -06:00
Bob Weinand
143cc3f0da
Merge branch 'PHP-5.6'
2014-06-15 23:16:21 +02:00
Bob Weinand
f92143f740
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
NEWS
Zend/zend_compile.c
2014-06-15 23:06:15 +02:00
Bob Weinand
f5f1c702cd
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-15 22:24:44 +02:00
Bob Weinand
ca29063da5
Fix bug #67436
2014-06-15 22:18:25 +02:00
Xinchen Hui
d461afc3a2
Merge branch 'PHP-5.6'
2014-06-10 21:58:31 +08:00
