Stanislav Malyshev
8697c27000
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix spelling and correct typo.
2013-06-10 01:41:26 -07:00
Stanislav Malyshev
de1688d16e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix spelling and correct typo.
2013-06-10 01:41:16 -07:00
Carson McDonald
b8cf17635e
Fix spelling and correct typo.
2013-06-10 01:40:41 -07: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
029c1da846
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed incorrect argument number
2013-05-29 11:15:27 +04:00
Dmitry Stogov
7e00d0994f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed incorrect argument number
2013-05-29 11:14:15 +04:00
Dmitry Stogov
8b515fa00a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed incorrect argument number
Conflicts:
Zend/zend_compile.c
2013-05-29 11:12:43 +04:00
Dmitry Stogov
13e5c97ffd
Fixed incorrect argument number
2013-05-29 11:09:55 +04:00
Sara Golemon
ee366ea516
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Don't double-quote name of namespaced function.
2013-05-19 13:35:09 -07: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
Sara Golemon
4f46a40b9d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Don't double-quote name of namespaced function.
2013-05-19 13:35:03 -07:00
Sara Golemon
2d7415a4af
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Don't double-quote name of namespaced function.
2013-05-19 13:34:57 -07:00
Sara Golemon
2d5695cbc5
Don't double-quote name of namespaced function.
...
ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info)
was resulting in a function declaration of:
ns\"zend_name"()
including the errant quotes.
This diff corrects that. There are currently no uses of ZEND_NS_NAMED_FE
in core and reason to believe that there are no uses in the wild either.
2013-05-19 13:32:17 -07:00
Dmitry Stogov
273ad58295
Improved IS_VAR operands fetching
2013-05-17 13:15:09 +04: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
Ard Biesheuvel
5b121eb04d
Fix #64780 (PHP 5.5 builds are broken with GCC 3)
...
A recent change (by me) introduced a call to __builtin_offsetof()
into zend_operators.h which is not defined by GCC prior to
version 4.
Changed the code to use offsetof() instead: this is defined in
<stddef.h>, so #include this header conditionally (#ifdef GNUC)
2013-05-07 20:37:04 +02:00
Ard Biesheuvel
046594caad
Merge branch 'PHP-5.5'
2013-05-07 22:08:24 +02:00
Xinchen Hui
d6de58d7e4
Merge branch 'PHP-5.5'
2013-05-04 20:45:07 +08:00
Xinchen Hui
9155d17fef
Fix #64749 (warning: cast from pointer to integer of different size)
2013-05-04 20:43:42 +08:00
Gustavo Lopes
734cb61f81
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64729 : compilation failure on x32
2013-04-30 19:38:00 +02:00
Gustavo Lopes
865cc3a800
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64729 : compilation failure on x32
Conflicts:
Zend/zend_alloc.c
2013-04-30 19:36:08 +02:00
Gustavo Lopes
514afd67b6
Fix bug #64729 : compilation failure on x32
2013-04-30 19:28:24 +02:00
David Soria Parra
e0e18a2b1d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix implicit declaration warning for cdf_timestamp_to_timespec
Fix #64711 ("value computed but not used" in parse_date.c)
Fix implicit uint* to int* conversion warning
Fix conversion from unsigned char to char
Fix #64712 (Obsolete declarations in php_date.c)
2013-04-26 12:41:08 +02:00
David Soria Parra
3411fbbc51
Fix implicit uint* to int* conversion warning
2013-04-26 10:57:55 +02:00
Anatol Belski
df236828b5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed float precision change under Windows x64
2013-04-25 23:01:13 +02:00
Anatol Belski
30802dbc55
Fixed float precision change under Windows x64
...
otherwise we'll have asserts in debug builds and void runs of the
error handlers in non debug builds.
2013-04-25 22:44:29 +02:00
Dmitry Stogov
302de03a5a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
2013-04-24 00:04:00 +04:00
Dmitry Stogov
758b666c0a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-04-23 23:59:00 +04:00
Dmitry Stogov
43ab915b41
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-04-23 23:55:47 +04:00
Dmitry Stogov
4cf0647399
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
2013-04-23 23:43:23 +04:00
Dmitry Stogov
9ca60e2444
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed linkage with C++
Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly raised by the method DOMNode::insertBefore(newNode, [refNode]).
2013-04-22 15:40:46 +04:00
Dmitry Stogov
13b039ff9a
Fixed linkage with C++
2013-04-22 15:39:50 +04: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