8617f2fa8d
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-03 21:27:07 +02:00
93288d0095
Fix bug #68188
2014-10-03 21:26:39 +02:00
308c0a727e
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-20 21:47:59 +02:00
5e977e69e1
Fixed bug #67633
2014-09-20 21:46:25 +02:00
7e9daf60c1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed #67985 - Incorrect last used array index copied to new array after unset
2014-09-09 18:03:10 +08:00
aca474fa14
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed #67985 - Incorrect last used array index copied to new array after unset
2014-09-09 18:00:49 +08:00
99f0760bfb
Fixed #67985 - Incorrect last used array index copied to new array after unset
...
In master zend_array_dup() is used to do this properly; this is a workaround.
2014-09-09 17:58:45 +08:00
57f82819e9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Only destruct if EG(active) in zend_shutdown(). (bug #65463 , #66036 )
Fix typo from commit 32314f6b6#65463 , #66036 )
2014-09-01 12:20:34 -07:00
4b9fcc01d4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
update NEWS
Only destruct if EG(active) in zend_shutdown(). (bug #65463 , #66036 )
Fix typo from commit 32314f6b6#65463 , #66036 )
2014-09-01 12:15:54 -07:00
197095c29e
Merge branch 'pull-request/770' into PHP-5.4
...
* pull-request/770:
Only destruct if EG(active) in zend_shutdown(). (bug #65463 , #66036 )
Fix typo from commit 32314f6b6#65463 , #66036 )
2014-09-01 12:11:42 -07:00
5270ee1aef
Making ini parser typed
...
- Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file()
- Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE
- Added zend_ini_copy_typed_value() function for zval initialisation
- Updated RETURN_TOKEN() to observe scanner_mode
2014-09-01 22:04:06 +08:00
d7368c2531
Fix bug #67938 : Segfault when extending interface method with variadic
...
We only want to check extra optional args if the proto function is
variadic, not when we're adding extra variadic args.
2014-08-30 20:43:34 +02:00
86b2d7b523
remove the -dev suffix from the Zend version
2014-08-27 03:52:46 +02:00
437612f656
Only destruct if EG(active) in zend_shutdown(). (bug #65463 , #66036 )
2014-08-23 14:17:37 +00:00
5e338836ff
Fix typo from commit 32314f6b6
2014-08-14 01:14:11 +00:00
32314f6b67
Fix destruction order in zend_shutdown (bug #65463 , #66036 )
...
If Apache or a similar SAPI receives a signal during PHP processing
it calls zend_shutdown() without calling shutdown_executor().
#65463 : If a module like Gearman or Memcached is loaded,
in the unfixed version it is unloaded by zend_destroy_modules() before the
CG(CLASS_TABLE) is destructed. When CG(CLASS_TABLE) is destructed,
any pointers to methods (specifically around destruction) in the unloaded
module's .so are now dangling and the process segfaults.
#66036 : Any subclasses of an internal class like ArrayObject need
to be destructed in order: subclass first and then the internal class. In the
unfixed version zend_shutdown() clears the CG(CLASS_TABLE) from the head
of the list onwards, so internal classes are destructed first and user-defined
classes last. Internal classes are alloc/deallocated with malloc/free while
user-defined classes with emalloc/efree. If there's shared data between them
then efree() could be called instead of free() leading to a seg-fault.
2014-08-14 00:55:14 +00:00
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
ea1d5dcacb
Removed second zval_copy_ctor()
2014-07-24 01:16:00 +04:00
d909b6330e
Fixed crash on self-referencing constant expression (part of a constant AST)
2014-07-24 00:37:15 +04:00
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
1d2f232bd2
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-19 17:19:39 +08:00
8ff00e6e85
Improve fix for #66608
2014-07-19 17:19:01 +08:00
9ce1a36af2
Fixed segfault with empty break
2014-07-19 15:30:50 +08:00
9bef96d96e
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-19 13:12:36 +08:00
f604b61e39
New added opcodes don't need to be resloved
2014-07-19 12:53:34 +08:00
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
de433d4c47
Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)
2014-07-18 15:45:31 +08:00
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
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
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
1ea4b17af2
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-02 17:36:27 +02:00
d9ebd0f3d6
Fix bug #67497 : eval with parse error causes segfault in generator
2014-07-02 17:33:31 +02:00
1163a7ce24
Mark test as XFAIL until fixed
2014-07-02 17:25:47 +02:00
33699a4dab
Messed up syntax of tests
2014-07-02 12:43:27 +02:00
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
2330be5641
Fixed possible crash because of race conditions on modifying constants in shared memory
2014-07-01 00:13:34 +04:00
9d49492fd6
Fixed bug #67368 (Memory leak with immediately dereferenced array in class constant)
2014-06-24 13:53:05 +08:00
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
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
3c2b42ac41
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
Zend/zend_compile.c
2014-06-16 11:18:45 +02:00
e93f8e74d4
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-16 11:16:33 +02:00
0a3979e08b
Fix patch for bug #67436
2014-06-16 11:10:50 +02:00
7cef3a57ad
Merge branch 'PHP-5.5' into PHP-5.6
2014-06-16 00:42:50 +02:00
03ee0ddc5f
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-16 00:41:46 +02:00
6c9c44905e
Added tests for bug 67436
2014-06-15 16:31:39 -06:00
f92143f740
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
NEWS
Zend/zend_compile.c
2014-06-15 23:06:15 +02:00
f5f1c702cd
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-15 22:24:44 +02:00
ca29063da5
Fix bug #67436
2014-06-15 22:18:25 +02:00
ebe6854dbc
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
Zend/zend_execute_API.c
2014-06-10 21:58:16 +08:00
e8699d75da
Remove unused included file
2014-06-10 21:56:30 +08:00
Nikita Popov