Nikita Popov
86434be946
Fix bug #65051 : count() off by one inside unset()
...
nNumOfElements was incremented after the pDestructor code, so any
code in the dtor would get a wrong number of elements.
Right now the bucket deletion code is replicated in four places,
it should probably be moved off into one function (or rather,
zend_hash_apply_deleter should be used everywhere). The codes are
subtly different though in that the HANDLE_UNBLOCK_INTERRUPTIONS()
happens in different places. In particular it seems odd that in
some cases interruptions stay blocked during the destructor call.
2013-06-17 23:44:13 +02:00
Stanislav Malyshev
4427d1dcfd
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Xinchen Hui
a9d005c04e
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_compile.c
2013-06-10 21:31:25 +08:00
Xinchen Hui
d8792d87cf
Fixed bug #64988 (Class loading order affects E_STRICT warning)
2013-06-10 21:26:11 +08:00
Dmitry Stogov
ef20fdb338
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test script
2013-06-10 12:55:51 +04:00
Dmitry Stogov
f68b8a5e74
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed test script
2013-06-10 12:54:54 +04:00
Dmitry Stogov
f5f6404260
Fixed test script
2013-06-10 12:53:19 +04:00
Xinchen Hui
f372e00332
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_def.h
2013-06-09 13:49:26 +08:00
Xinchen Hui
ab22fda7e5
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-09 13:35:45 +08:00
Xinchen Hui
e8f004d542
Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
2013-06-09 13:20:40 +08:00
Xinchen Hui
e89537f2a3
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-05 17:30:09 +08:00
Xinchen Hui
f597f5561e
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-05 17:26:10 +08:00
Xinchen Hui
3c87945c95
Fixed bug #64960 (Segfault in gc_zval_possible_root)
2013-06-05 17:25:00 +08:00
Dmitry Stogov
a2d6d27458
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64720 (SegFault on zend_deactivate)
Conflicts:
NEWS
2013-05-21 10:15:37 +04:00
Dmitry Stogov
77fffff157
Fixed bug #64720 (SegFault on zend_deactivate)
2013-05-21 09:58:11 +04:00
Stanislav Malyshev
ac0aa5737e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #64660 - yyparse can return 2, not only 1
Conflicts:
Zend/zend_language_scanner.c
2013-05-20 00:57:34 -07:00
Stanislav Malyshev
fb58e69a84
fix bug #64660 - yyparse can return 2, not only 1
2013-05-20 00:52:38 -07:00
Anatol Belski
2d8ce75f39
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64821 Custom Exceptions crash when internal properties overridden
2013-05-12 14:09:16 +02:00
Anatol Belski
dd188e9538
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64821 Custom Exceptions crash when internal properties overridden
2013-05-12 14:06:59 +02:00
Anatol Belski
d6505acbf5
Fixed bug #64821 Custom Exceptions crash when internal properties overridden
...
If user inherits Exception and overrides the properties to arbitrary data types,
or simply doesn't run parent::__construct(), here we go. Just convert everything
to the appropriate data type, like Exception::__toString() does.
2013-05-12 14:00:32 +02:00
Xinchen Hui
6ed16753c1
Fixed bug #64677 (execution operator `` stealing surrounding arguments)
2013-04-20 15:23:49 +08:00
Michael Moravec
70668fd88a
Fixed typo - inconsistent notice for undefined property (introduced by fix for #49348 )
2013-04-10 13:36:47 +08:00
Xinchen Hui
aac43c9ee8
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-04 14:56:00 +08:00
Xinchen Hui
4f2acd8cde
Update test script to make sure the error occurred
2013-04-04 14:55:17 +08:00
Xinchen Hui
65e368debd
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-04 14:48:53 +08:00
Xinchen Hui
82ac3106e0
Use 5.4 specifical warnnig & Update NEWs
2013-04-04 14:47:49 +08:00
Xinchen Hui
f4f8b5a94b
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-04 14:44:28 +08:00
Xinchen Hui
c96a5bc6be
Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: segfault)
2013-04-04 14:34:11 +08:00
Nikita Popov
1f34ccbe34
Fix bug #64555 : foreach no longer copies keys if they are interned
2013-04-03 20:29:19 +02:00
Xinchen Hui
42f94aa978
Fix test due to opcache
2013-04-03 19:52:09 +08:00
Xinchen Hui
bbb4a44f98
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-03 18:51:19 +08:00
ptarjan
e8d80b770b
Fix #64572 : Clean up after the test
...
Lets not leave stuff lying around.
2013-04-03 18:50:18 +08:00
Nikita Popov
8345abcabb
Remove support for cloning generators
2013-03-29 11:42:10 +01:00
Xinchen Hui
ed31582301
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
2013-03-26 12:02:48 +08:00
Xinchen Hui
1182a3356c
Update test script
2013-03-26 11:50:47 +08:00
Xinchen Hui
5e9377ebd5
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
2013-03-26 11:44:57 +08:00
Xinchen Hui
79925094c4
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-21 21:10:32 +08:00
Xinchen Hui
7dce0194c8
Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11)
2013-03-21 21:09:30 +08:00
Dmitry Stogov
4837bdb910
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63976 (Parent class incorrectly using child constant in class property)
Conflicts:
NEWS
2013-03-19 17:04:35 +04:00
Dmitry Stogov
7b0993bfb4
Fixed bug #63976 (Parent class incorrectly using child constant in class property)
2013-03-19 16:59:01 +04:00
Dmitry Stogov
960d5be528
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Partial fix for bug #64239
2013-03-19 15:47:43 +04:00
Dmitry Stogov
984561cfa8
Partial fix for bug #64239
2013-03-19 15:45:48 +04:00
Dmitry Stogov
74e11fb14c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #62343 (Show class_alias In get_declared_classes())
Conflicts:
NEWS
2013-03-19 15:00:24 +04:00
Dmitry Stogov
84630a1109
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62343 (Show class_alias In get_declared_classes())
2013-03-19 14:59:08 +04:00
Dmitry Stogov
4a6291508d
Fixed bug #62343 (Show class_alias In get_declared_classes())
2013-03-19 14:56:53 +04:00
Dmitry Stogov
ef8c8eaa95
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
Conflicts:
NEWS
Zend/zend_compile.c
2013-03-19 13:07:32 +04:00
Dmitry Stogov
e62bb03257
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
2013-03-19 12:48:23 +04:00
Dmitry Stogov
e9641141aa
Made test compatible with O+
2013-03-16 16:11:00 +04:00
Nikita Popov
fcc6611de9
Add support for non-scalar Iterator keys in foreach
...
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-03-12 17:27:31 +01:00