Stanislav Malyshev
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07: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
David Soria Parra
3411fbbc51
Fix implicit uint* to int* conversion warning
2013-04-26 10:57:55 +02: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
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
Xinchen Hui
62059c16ee
Fixed bug #63980 (object members get trimmed by zero bytes)
2013-01-14 16:23:22 +08:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
831fbcf385
Happy New Year
2013-01-01 16:23:31 +08:00
Nikita Popov
5c7dd7811e
Simplify set_error_handler/set_exception_handler code
2012-09-22 21:46:29 +02:00
Nikita Popov
f28c128b20
Return previous error handler when resetting the error handler
...
set_error_handler(null) and set_exception_handler(null) now return the
previous error/exception handler instead of just returning bool(true).
This is consistent with the behavior of these functions with non-null
values.
2012-09-22 21:46:18 +02:00
Nikita Popov
c815dd74bc
Allow resetting the error handler
...
This allows the error handler to be reset using set_error_handler(null).
As the code suggests this behavior was already previously intended, but
the callback check was done too strictly.
2012-09-22 21:46:02 +02:00
Nikita Popov
4954aba2ed
Revert error/exception handler changes
...
This reverts the following two commits:
* 6ba2e662e4d8f8e98d8e
2012-09-22 21:41:51 +02:00
Xinchen Hui
6ba2e662e4
Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)
...
The previous commit was reverted as Stas ask, so only commit this
to Truk now.
2012-03-24 19:41:11 +08:00
Xinchen Hui
d8f8e98d8e
Improve set_exception_handler while doing reset
2012-03-24 19:38:40 +08:00
Xinchen Hui
872fdd153e
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
2012-03-24 19:26:27 +08:00
Xinchen Hui
9c99a89e8e
Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
...
This reverts commit fcae164ea6
2012-03-24 19:26:02 +08:00
Xinchen Hui
2d21149743
Revert "Merge from PHP-5.4"
...
This reverts commit 9a87fe1c52
2012-03-24 19:25:21 +08:00
Xinchen Hui
7ffc442927
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
2012-03-24 15:15:27 +08:00
Xinchen Hui
fcae164ea6
Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)
2012-03-24 15:13:10 +08:00
Xinchen Hui
9a87fe1c52
Merge from PHP-5.4
...
Improve set_exception_handler
2012-03-24 14:33:00 +08:00
Xinchen Hui
4130f5a43c
Improve set_exception_handler
...
Remove useless alloc/free and return_value copy while doing reset
exception handler
2012-03-24 11:54:50 +08:00
Xinchen Hui
213145a6da
MFH: Fixed bug #61072 (Memory leak when restoring an exception handler).
2012-03-02 02:56:08 +00:00
Xinchen Hui
8f7381a6ea
Fixed bug #61072 (Memory leak when restoring an exception handler)
2012-02-14 05:35:34 +00:00
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
Stanislav Malyshev
0f0ffd38c9
fix is_a reflection
2011-11-20 22:20:03 +00:00
Stanislav Malyshev
66877fbd15
fix typo
2011-11-18 09:15:15 +00:00
Stanislav Malyshev
77d0643b68
fixes for bug #55748
2011-11-18 07:11:19 +00:00
Stanislav Malyshev
3598185a74
fix bug #55475 - implement is_a BC solution
2011-11-09 05:27:45 +00:00
Stanislav Malyshev
f50f54a6ea
update proto
2011-09-26 03:57:22 +00:00
Rasmus Lerdorf
92f68921cf
Re-committing Alan's is_a revert/fix for bug #55475
...
Dmitry had done so earlier, but reverted pending discussion.
It is completely clear that this should never have been changed in the
5.3 branch in the first place giving the number of things that broke
because of it.
2011-09-23 09:52:09 +00:00
Dmitry Stogov
59ad27b0aa
Reverted the fix for #55475 (is_a() triggers autoloader) before the common decision
2011-09-15 10:59:39 +00:00
Dmitry Stogov
e98759eecf
Fixed bug #55475 (is_a() triggers autoloader). (alan at akbkhome dot com)
2011-09-15 09:58:33 +00:00
Dmitry Stogov
4a25a7740d
Fixed ZE specific compile warnings (Bug #55629 )
2011-09-13 13:29:35 +00:00
Etienne Kneuss
baf2e822cc
Fix typo
2011-08-08 14:54:50 +00:00
Etienne Kneuss
6b5d5b8d12
Fix typo
2011-08-08 14:54:50 +00:00
Pierrick Charron
cbd4f7602e
Use snprintf to make the static analyzers happy
2011-08-08 11:19:49 +00:00
Pierrick Charron
d0a4c01099
Use snprintf to make the static analyzers happy
2011-08-08 11:19:49 +00:00
Pierrick Charron
bfd10cfee9
function_name cannot be false
2011-08-07 06:19:43 +00:00
Pierrick Charron
b90059120d
function_name cannot be false
2011-08-07 06:19:43 +00:00
Felipe Pena
68e5e29850
- Fix compiler warning
2011-07-25 11:51:43 +00:00
