Johannes Schlüter
93fd9c704b
Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias)
2013-01-29 19:47:45 +01:00
Gustavo Lopes
b8b3bb08b2
Merge branch 'bug64023' into PHP-5.4
...
* bug64023:
Fix bug #64023 (__toString() & SplFileInfo)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-01-22 12:24:33 +01:00
Gustavo Lopes
aa0adce47d
Fix bug #64023 (__toString() & SplFileInfo)
...
Defining a __toString() method was having no effect when concatenating
the object. This was because the cast_object() handler would ignore
__toString().
Using echo() directly would actually use __toString(), but this was a
bug: the ECHO handler would try zend_std_cast_object_tostring() before
cast_object(), but cast_object() should have priority as
zend_std_cast_object_tostring() assumes an object with a
zend_class_entry.
2013-01-22 11:33:29 +01:00
Stanislav Malyshev
9e7c2e5906
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix bug #63462 (Magic methods called twice for unset protected properties)
2013-01-18 13:35:09 -08:00
Stanislav Malyshev
33b104c778
fix bug #63462 (Magic methods called twice for unset protected properties)
2013-01-18 13:29:43 -08:00
Stanislav Malyshev
1a96fe0b32
fix bug #63982 : isset() inconsistently produces a fatal error on protected property
2013-01-13 17:08:52 -08:00
Stanislav Malyshev
c6203da6c2
different OSes have different messages, and that's not what the test is about anyway
2013-01-13 16:58:27 -08:00
Dmitry Stogov
625000ab44
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed compilator bug that might cause jump depended on unitialized value
2013-01-09 17:36:44 +04:00
Dmitry Stogov
d4650c5d69
Fixed compilator bug that might cause jump depended on unitialized value
2013-01-09 17:16:47 +04:00
Dmitry Stogov
f9e8678dd3
Fixed bug #63882 (zend_std_compare_objects crash on recursion)
2013-01-09 11:30:50 +04:00
Xinchen Hui
aff5d084a5
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-04 11:03:52 +08:00
Xinchen Hui
c3e6de2227
Fixed bug #63899 (Use after scope error in zend_compile)
2013-01-04 11:02:21 +08:00
Stanislav Malyshev
36e19c9cab
Bug #43177 : If an eval() has a parse error, the overall exit status and return code should not be affected.
...
Without this fix, a webpage using eval() may return code 500. That might display
fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
2013-01-01 21:18:59 -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
Pierrick Charron
663434cd76
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-26 10:17:37 -05:00
Pierrick Charron
b35ffdeae1
Revert "Remove a useless memory write in zend_llist_del_element"
...
This reverts commit fad960a404
as
required by Stas and Christopher
2012-12-26 10:13:56 -05:00
Pierrick Charron
c12ab5c306
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Remove a useless memory write in zend_llist_del_element
2012-12-25 20:57:21 -05:00
Pierrick Charron
fad960a404
Remove a useless memory write in zend_llist_del_element
...
The zend_llist_element *next pointer is not necessary and removing
it will also remove a write on memory
2012-12-25 20:45:24 -05:00
Dmitry Stogov
7e2629635b
spelling
2012-12-25 16:21:25 +04:00
Dmitry Stogov
f0b459b7c4
Fixed ZTS build
2012-12-25 13:38:14 +04:00
Dmitry Stogov
3f8c729e69
Traits refactoring
2012-12-25 10:23:08 +04:00
Johannes Schlüter
ef37055c34
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 22:40:23 +01:00
Johannes Schlüter
a11606b18f
Fix Bug #63762 Sigsegv when Exception::$trace is changed by user
2012-12-13 22:39:35 +01:00
Xinchen Hui
3d86e6d881
Fixed bug #63726 (Memleak with static properties and internal/user classes)
...
No test scripts provided (will try to find one)
2012-12-10 20:29:51 +08:00
Xinchen Hui
ad553a7af2
Fixed bug #63726 (Memleak with static properties and internal/user classes)
2012-12-10 20:28:27 +08:00
Dmitry Stogov
f877d7fee6
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63635 (Segfault in gc_collect_cycles)
Conflicts:
NEWS
2012-11-29 12:38:34 +04:00
Dmitry Stogov
92e2f29381
Fixed bug #63635 (Segfault in gc_collect_cycles)
2012-11-29 12:25:20 +04:00
Dmitry Stogov
111aa9fd2e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63468 (wrong called method as callback with inheritance)
Conflicts:
NEWS
2012-11-20 12:54:40 +04:00
Dmitry Stogov
396c1e990a
Fixed bug #63468 (wrong called method as callback with inheritance)
2012-11-20 12:51:55 +04:00
Pierrick Charron
99edb55e41
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Regenerate Zend ini scanner
Conflicts:
Zend/zend_ini_scanner.c
Zend/zend_ini_scanner_defs.h
2012-11-16 18:24:42 -05:00
Pierrick Charron
c886691100
Regenerate Zend ini scanner
...
Regenerate both zend_ini_scanner.c and zend_ini_scanner_defs.h
2012-11-16 18:16:21 -05:00
Pierrick Charron
15ab75be8a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
2012-11-16 18:07:02 -05:00
Pierrick Charron
6dff07aa8c
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
...
Restore the old behavior but keep bug 51094 fixed
2012-11-16 18:04:14 -05:00
Dmitry Stogov
f99befadbd
Fixed compiler reenterability
2012-11-14 17:47:27 +04:00
Dmitry Stogov
65585b3aa2
Fixed compiler reenterability
2012-11-14 17:45:10 +04:00
Xinchen Hui
22d4205783
Update test script
2012-10-23 17:28:52 +08:00
Xinchen Hui
0b8b264107
Test for #63336 , xfail now
2012-10-23 16:35:56 +08:00
Xinchen Hui
74228c5151
Fixed bug #63305 (zend_mm_heap corrupted with traits)
2012-10-23 11:34:25 +08:00
Xinchen Hui
bb51549915
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-19 11:24:15 +08:00
Xinchen Hui
90bd54c46e
preg indenpent test script for #63055
2012-10-19 11:22:56 +08:00
Derick Rethans
b58d45b67f
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
Zend/acinclude.m4
2012-10-18 17:53:55 +01:00
Derick Rethans
7aed21c557
SUpport newer bisons.
2012-10-18 17:53:21 +01:00
Xinchen Hui
1f8fd609b0
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-18 20:11:32 +08:00
Xinchen Hui
e88cdaa014
better fix for #63055
2012-10-18 20:10:35 +08:00
Xinchen Hui
54cef2bb6d
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-18 17:33:52 +08:00
Xinchen Hui
4d509708a4
I forgot that inconsistent is only avaliable in debug mode
2012-10-18 16:33:07 +08:00
Xinchen Hui
08b9702f8a
Add comments
2012-10-18 16:06:20 +08:00
Xinchen Hui
ccc519b7a9
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
...
This should also fixed various segfaults which the bt looks like cored in zval_mark_grey
2012-10-18 15:49:37 +08:00
Xinchen Hui
69a4301f6c
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:45:07 +08:00
Xinchen Hui
1b9e0de2cc
Remove executable permission on inc
2012-10-10 10:44:34 +08:00
Xinchen Hui
45e938ec34
Remove executable permission on phpt
2012-10-10 10:31:53 +08:00
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Xinchen Hui
e4a8fa6a15
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e
Fixed bug #63236 (Executable permission on various source files)
2012-10-09 13:28:31 +08:00
Xinchen Hui
67611c67fa
Fixed bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion)
2012-10-08 22:59:52 +08:00
Nikita Popov
592b232e83
Fix bug #63173 : Crash when invoking invalid array callback
...
The code did not check whether the zend_hash_index_find calls succeded,
so PHP crashed when an array callback was called that contains two elements
which don't have the indices 0 and 1.
2012-09-27 18:40:00 +02:00
Dmitry Stogov
ed3a2eec9c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63111 (is_callable() lies for abstract static method)
Conflicts:
NEWS
2012-09-21 14:18:37 +04:00
Dmitry Stogov
4db74b7f19
Fixed bug #63111 (is_callable() lies for abstract static method)
2012-09-21 13:07:14 +04:00
Xinchen Hui
fd0b3ea663
Fixed bug #61442 (exception threw in __autoload can not be catched)
2012-09-19 19:40:59 +08:00
Stuart Langley
2e24d9a2b3
Support building PHP with the native client toolchain.
...
The native client compiler defines the C macro __x86_64__, but the size
of an unsigned int is only 4 bytes. This causes the compile to fail
because the inline asm code compiled is for an 8 byte unsigned int. Add
the correct defines to fix this.
As detailed in:
http://code.google.com/p/nativeclient/issues/detail?id=2255
2012-09-17 15:52:55 -07:00
Xinchen Hui
ee620e9673
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-15 11:51:25 +08:00
Xinchen Hui
4c6678d605
Fixed bug #63093 (Segfault while load extension failed in zts-build).
2012-09-15 11:50:16 +08:00
Dmitry Stogov
6ba376f552
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
Conflicts:
NEWS
Zend/zend_object_handlers.c
2012-09-06 12:14:29 +04:00
Dmitry Stogov
b29dc146b9
- Fixed bug #61767 (Shutdown functions not called in certain error situation)
...
- Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
2012-09-06 11:26:40 +04:00
Pierre Joye
954e7a3b3c
- fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
2012-09-05 13:00:04 +02:00
Dmitry Stogov
6c0508f8d5
Fixed bug #62907 (Double free when use traits)
2012-09-05 09:58:22 +04:00
Xinchen Hui
069c448623
folder
2012-09-02 16:52:53 +08:00
Xinchen Hui
66fad45724
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-31 11:24:10 +08:00
Xinchen Hui
5dc2cef370
Fixed bug #62976 (Notice: could not be converted to int when comparing some builtin classes)
2012-08-31 11:22:43 +08:00
Lars Strojny
f82dd2c774
Bug #62956 : fixing private method signature validation
...
In inheritance, if both methods are private, don not enforce the same
signature.
2012-08-28 14:06:18 +02:00
Xinchen Hui
e24194d157
Add test for #62907
2012-08-26 18:28:15 +08:00
Xinchen Hui
383eafe482
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-25 21:50:08 +08:00
Xinchen Hui
d92a89fe52
Fixed bug (segfault while build with zts and GOTO vm-kind)
2012-08-25 21:47:53 +08:00
Xinchen Hui
87785c7d5a
tabs
2012-08-23 16:13:34 +08:00
Xinchen Hui
d39aa984ad
Refix #62358 , previous has side-affect
2012-08-23 16:06:17 +08:00
Xinchen Hui
6d1bebfcb0
Fixed bug #62358 (Segfault when using traits a lot)
2012-08-23 15:41:49 +08:00
Felipe Pena
7a56ac00a0
- Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private)
2012-08-22 10:50:50 -03:00
Anatoliy Belsky
22f55d5665
Fixed bug #62313 Zend\tests\errmsg_021.phpt fails
2012-08-22 11:43:12 +02:00
Felipe Pena
7a72405171
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 12:44:49 -03:00
Felipe Pena
001966c754
- Value stored to var is never used
2012-08-19 12:44:44 -03:00
Xinchen Hui
dda0565b53
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-12 20:58:45 +08:00
Xinchen Hui
4970926e45
Fixed bug #62763 (register_shutdown_function and extending class)
2012-08-12 20:58:09 +08:00
Xinchen Hui
7b307fb930
Fixed bug #62328 (implementing __toString and a cast to string fails)
...
__toString should has a high priority
2012-08-12 11:50:28 +08:00
Ryusuke SEKIYAMA
81c6a060a2
Added Bison 2.5.1 to bison_version_list
2012-08-05 20:48:42 -07:00
Xinchen Hui
d289efb457
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
Zend/zend_API.h
2012-08-04 11:14:03 +08:00
Xinchen Hui
f4a315fce2
This becomes useless, since we have set that in the INIT macro
2012-08-04 11:03:21 +08:00
Xinchen Hui
03a1fcabf3
Fixed bug #62744 (dangling pointers made by zend_disable_class)
...
the test will be added while commit the fix for #62737
2012-08-04 10:41:26 +08:00
Nuno Lopes
aa8eabddd6
make default_exception_ce and error_exception_ce static
2012-08-02 06:53:09 -04:00
Xinchen Hui
242658c053
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-02 12:32:44 +08:00
Xinchen Hui
433089ccb4
Fixed bug #62716 (munmap() is called with the incorrect length)
2012-08-02 12:30:07 +08:00
Xinchen Hui
572d6437bc
expect pass for 5.4
2012-07-31 10:51:18 +08:00
Xinchen Hui
c730329bb0
Merge branch 'PHP-5.3' into PHP-5.4
2012-07-31 10:51:04 +08:00
Xinchen Hui
645f84e41b
Test for bug #62680
2012-07-31 10:49:13 +08:00
Xinchen Hui
11e84180ef
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Skip test while zend_mm is disabled
2012-07-29 12:19:28 +08:00
Xinchen Hui
015ee3b2c8
Skip test while zend_mm is disabled
2012-07-29 12:17:43 +08:00
Xinchen Hui
b477a84026
Fixed bug #60194 for eavl
...
same reason here
2012-07-28 17:00:05 +08:00
Xinchen Hui
ef7286a42f
Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK with run-test.php)
...
It's not a big deal, just because lexer will read the char after cursor before leaving
2012-07-28 00:50:45 +08:00
Gustavo André dos Santos Lopes
ccffec74d0
Fix bug #62651 : source level BC break
...
Break for C++ extensions that don't wrap the includes of PHP libraries
in extern "C" {.
2012-07-26 23:37:02 +02:00
Xinchen Hui
302ad0d648
Fix test, committed in wrong folder
2012-07-26 13:57:04 +08:00
Xinchen Hui
eae0610042
Fixed bug #62653 : (unset($array[$float]) causes a crash)
...
the reason why jpauli and I can not reproduce is (it's silly):
I typo "USE_ZEND_ALLOC *&&* valgrind" at the first time, then I always ctrl+r
and jpauli copied my command from the pastbin :)
thanks
2012-07-26 13:53:06 +08:00
Xinchen Hui
b4b3a65f55
Fixed bug #62661 (Interactive php-cli crashes if include() is used in auto_prepend_file)
2012-07-26 12:40:47 +08:00
Nuno Lopes
b2b018d5f7
appease MSVC (doesnt like unary minus of unsigned ints)
2012-07-08 15:28:29 -04:00
Nuno Lopes
5910d8d4f4
appease MSVC (doesnt like unary minus of unsigned ints)
2012-07-08 15:21:18 -04:00
Nuno Lopes
91ce8041a3
fix (signed) integer overflow (part of bug #52550
2012-07-02 01:36:35 -04:00
Nuno Lopes
d80ff39189
fix (signed) integer overflow (part of bug #52550
2012-07-02 01:35:28 -04:00
Marc Easen
896ac689c9
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 16:54:03 -07:00
Xinchen Hui
a44a1dc194
Fixed bug #62357 (compile failure: (S) Arguments missing for built-in function __memcmp).
...
Any C library function may be a macro, We should avoid using ZEND_STRS(L) as their arguments
2012-06-26 18:42:33 +08:00
Johannes Schlüter
2418791731
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Remove unneeded and outdated ChangeLog file
2012-06-22 20:01:06 +02:00
Johannes Schlüter
84b1c568f4
Remove unneeded and outdated ChangeLog file
2012-06-22 20:00:20 +02:00
Stanislav Malyshev
ba8333cdb0
typo
2012-06-08 12:23:51 -07:00
Stanislav Malyshev
17c0ff1194
typo
2012-06-08 01:24:49 -07:00
Pierrick Charron
c975320eb9
Regenerated files
2012-06-07 18:04:15 +02:00
Pierrick Charron
4e6f27f4db
Regenerated files
2012-06-07 18:02:27 +02:00
Pierrick Charron
494c170e6f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
2012-06-07 17:45:43 +02:00
Pierrick Charron
fed5923dbc
Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
...
Modify the scanner to check if the first char of the raw data is an opening " in which case we
need to find the closing one. Otherwise just search for the next end of value char [\r\n;\000]
2012-06-07 17:44:20 +02:00
Felipe Pena
60c5f9910f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Optimize comparison between same HashTable pointer
- Fixed bug #62205 (php-fpm segfaults (null passed to strstr))
- fix missing include for unix sockets
- Comment unused function to avoid warnings
2012-06-03 18:20:26 -03:00
Felipe Pena
d57b278ad1
- Optimize comparison between same HashTable pointer
2012-06-03 18:16:57 -03:00
Stanislav Malyshev
abe6362716
fix test
2012-05-29 23:52:47 -07:00
Gustavo André dos Santos Lopes
acd711685a
Fixed bug #62097
...
This fixes the fix for bug #54547 in 32-bit machines by accepting
float comparisons in 32-bit machines as long as the integer is
not larger than the mantissa.
2012-05-23 18:55:36 -05:00
Xinchen Hui
4c9a11c857
Use free instead of efree
2012-05-21 19:02:45 +08:00
Xinchen Hui
bbcea230e1
Use emalloc instead of malloc
2012-05-21 18:58:19 +08:00
Dmitry Stogov
2ae8d2fbfb
Fixed bug #61998 (Using traits with method aliases appears to result in crash during execution)
2012-05-21 13:57:41 +04:00
Dmitry Stogov
c8f47a8e7c
Fixed bug #61998 (Using traits with method aliases appears to result in crash during execution)
2012-05-21 13:46:07 +04:00
Stanislav Malyshev
a0dff6fdca
fix bug #61782 - __clone/__destruct do not match other methods when checking access controls
2012-05-13 14:40:44 -07:00
Stanislav Malyshev
9344bf193c
fix bug #54547
2012-05-13 14:40:44 -07:00
Xinchen Hui
6a5095582a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object)
fix stack overflow in php_intlog10abs()
Conflicts:
Zend/zend_execute.c
2012-05-12 13:19:55 +08:00
Xinchen Hui
3332943c9d
Fixed Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object)
2012-05-12 13:13:44 +08:00
Reeze Xia
0cb4849e53
Cleanup useless function declaration for traits
2012-05-11 16:52:12 +08:00
Xinchen Hui
72f19e9a8b
Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config)
2012-05-03 22:39:53 +08:00
Xinchen Hui
d74d88fbb9
Fixed test bug #61892
2012-05-03 19:56:49 +08:00
Xinchen Hui
75d23f5714
Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4
...
* origin/PHP-5.3:
Fix typo
2012-05-03 18:40:57 +08:00
Xinchen Hui
bbf8a50281
Fix typo
...
picked form pull request of reeze.xia@gmail.com
2012-05-03 18:39:03 +08:00
Felipe Pena
4deb0f1a0a
- Regenerated files
2012-04-30 15:57:00 -03:00
Felipe Pena
79961dccab
- Fixed Windows build
2012-04-30 15:55:57 -03:00
Felipe Pena
1622843162
- Regenerated files
2012-04-30 10:35:28 -03:00
Felipe Pena
3120387617
- Changed last commit to use VK_ESCAPE on Windows
2012-04-30 10:31:49 -03:00
Felipe Pena
cc5b995c78
- Fixed bug #61827 (incorrect \e processing on Windows) patch by: ab@php.net
2012-04-29 19:35:52 -03:00
Xinchen Hui
da6465a268
Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash)
2012-04-18 18:13:27 +08:00
Johannes Schlüter
82c05eeda9
Copy default properties of internal classes for different threads
2012-04-11 19:21:41 -07:00
Gustavo André dos Santos Lopes
68990224be
Merge branch '5.3' into 5.4
...
Zend/zend_language_scanner.c and Zend/zend_language_scanner_defs.h had to be changed manually.
2012-03-28 08:57:19 +01:00
Gustavo André dos Santos Lopes
c6e15455a3
Revert "- fix bug #61504 , fix build errors on windows and possibly other"
...
This reverts commit 74ee335e3a
.
2012-03-28 08:41:18 +01:00
Pierre Joye
c195596280
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- fix bug #61504 , fix build errors on windows and possibly other
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
2012-03-28 02:11:06 +02:00
Pierre Joye
74ee335e3a
- fix bug #61504 , fix build errors on windows and possibly other
2012-03-28 01:59:41 +02: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