Xinchen Hui
25eb44fcc1
Merge branch 'PHP-5.5'
2013-07-21 16:20:00 +08:00
Xinchen Hui
629965abe2
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-21 16:19:13 +08:00
Arpad Ray
b963249456
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
...
Also fix and test for get_defined_constants(true)
2013-07-20 11:05:13 +01:00
Arpad Ray
a015fa83a7
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
2013-07-19 19:19:48 +01:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Xinchen Hui
75808151e3
Merge branch 'PHP-5.5'
...
Conflicts:
Zend/zend_vm_execute.h
2013-07-14 12:01:50 +08:00
Xinchen Hui
2c4f823437
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-07-14 11:53:56 +08:00
Xinchen Hui
ebad5178c4
Fixed bug #65254 (Exception not catchable when exception thrown in autoload with a namespace).
2013-07-14 11:47:06 +08:00
Nikita Popov
4d606cf01e
Merge branch 'PHP-5.5'
2013-06-29 21:57:36 +02:00
Nikita Popov
0f36224beb
Don't try to clean up generator stack on unclean shutdown
...
This fixes bugs #65035 and #65161 . In one of the bugs the issue is
that function_state.arguments is NULL, but the arg count is pushed
to the stack and the code tries to free it. In the other bug the
stack of the generator is freed twice, once in generator_close and
later during shutdown.
It's rather hard (if at all possible) to do a proper stack cleanup
on an unclean shutdown, so I'm just disabling it in this case.
2013-06-29 21:51:54 +02:00
Xinchen Hui
83673eaf1d
Merge branch 'PHP-5.5'
2013-06-24 23:53:54 +08:00
Xinchen Hui
a6a3aa5d49
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_API.c
2013-06-24 23:49:30 +08:00
Xinchen Hui
9cf3e65391
Fixed bug (is_callable() triggers Fatal Error)
...
This bug is also exists in 5.4, and previous fix by dsp is not complete
for __callStatic stituation, see test script
2013-06-24 23:45:08 +08:00
Nikita Popov
42729c1baf
Merge branch 'PHP-5.5'
2013-06-17 23:49:08 +02:00
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
8ac131503d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
2013-06-10 14:31:57 -07: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
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Xinchen Hui
1689a7fe98
Merge branch 'PHP-5.5'
2013-06-10 21:33:47 +08: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
56c9a2f4f6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed test script
2013-06-10 12:56:33 +04: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
4600578830
Merge branch 'PHP-5.5'
2013-06-09 13:50:06 +08: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
ecfc3599a7
Merge branch 'PHP-5.5'
2013-06-05 17:32:09 +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
bf146ad5b5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64720 (SegFault on zend_deactivate)
Conflicts:
NEWS
2013-05-21 10:33:57 +04: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
3ce366b7cd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #64660 - yyparse can return 2, not only 1
2013-05-20 00:58:12 -07: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
1477471f6c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #64821 Custom Exceptions crash when internal properties overridden
2013-05-12 14:10:24 +02: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
2bcbe8fab9
Merge branch 'PHP-5.5'
2013-04-20 15:24:48 +08:00
Xinchen Hui
6ed16753c1
Fixed bug #64677 (execution operator `` stealing surrounding arguments)
2013-04-20 15:23:49 +08:00
Dmitry Stogov
5cdc71ae07
Optimizer may hide some repeating error messages
2013-04-18 11:54:27 +04:00
Dmitry Stogov
26c761915b
Optimizer may hide some repeating error messages
2013-04-18 11:53:44 +04:00