c918ca57a7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Replace $Revision$ with $Id$ in keyword expansion enable files
Enable $Id$ expansion for files with the $Revision$ keyword
Conflicts:
ext/mysqlnd/mysqlnd.h
2012-03-20 17:58:58 +01:00
f7b10abae9
Replace $Revision$ with $Id$ in keyword expansion enable files
2012-03-20 17:53:47 +01:00
943a4fed4e
reduce memory usage
2012-03-12 14:52:02 +00:00
d845cfb12e
reduce memory usage
2012-03-12 14:52:02 +00:00
2cc64c28f0
Fixed bug #60569 (Nullbyte truncates Exception $message).
2012-03-11 18:15:13 +00:00
3d9824a798
Fixed bug #60569 (Nullbyte truncates Exception $message).
2012-03-11 18:15:13 +00:00
eac33b454c
Typo when merging from trunk
2012-03-11 15:31:19 +00:00
b7ae5e0d86
Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes)
2012-03-11 15:28:31 +00:00
7536bf963d
Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes)
2012-03-11 15:28:31 +00:00
c9436c200e
Fixed version numbers.
2012-03-06 18:34:10 +00:00
38e5089e85
Fixed version numbers.
2012-03-06 18:34:10 +00:00
ecf8986a9a
Add the ZEND_DONT_UNLOAD_MODULES environment variable for debugging to 5.3 as
...
well.
2012-03-06 18:25:55 +00:00
e182aeec10
Fixed module numbering
2012-03-05 12:47:25 +00:00
56a3f7eca8
Fixed module numbering
2012-03-05 12:47:25 +00:00
ffded0020b
Fixed Bug #61052 (Missing error check in trait 'insteadof' clause)
2012-03-04 19:34:19 +00:00
34fe62619d
Fixed Bug #60911 (Confusing error message when extending traits)
2012-03-04 18:33:33 +00:00
60dfd64bf2
Fixed Bug #60717 (Order of traits in use statement can cause a fatal error)
...
# Compatibility is now correctly checked in both directions.
# Introduced helper method for the test.
2012-03-04 18:26:11 +00:00
bacd820218
MFH: Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode)
2012-03-02 03:52:06 +00:00
046e3e3889
MFH: Fixed bug #60573 (type hinting with "self" keyword causes weird errors)
2012-03-02 03:32:12 +00:00
5f99d789b5
MFH: Fixed bug #60978 (exit code incorrect)
2012-03-02 03:25:41 +00:00
0876d7bb89
MFH: Fixed bug #61011 (Crash when an exception is thrown by __autoload accessing a static property)
2012-03-02 03:12:15 +00:00
213145a6da
MFH: Fixed bug #61072 (Memory leak when restoring an exception handler).
2012-03-02 02:56:08 +00:00
0e4d46a3a7
MFH: Fix bug #61165 (Segfault - strip_tags())
2012-03-02 02:51:57 +00:00
f7cd0588a9
Fixed bug #61225 (Lexing 0b0*+<NUM> incorectly)
2012-03-02 02:36:31 +00:00
5f4ae28459
Improve fix for #61165 , the previous one cause #43450 test failed
2012-02-26 14:56:26 +00:00
c870ebe138
Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode)
2012-02-25 14:15:11 +00:00
e613889d50
more verbose skip reason in test files with not so obvious extension requirements
2012-02-25 12:10:41 +00:00
ce535f1819
more verbose skip reason in test files with not so obvious extension requirements
2012-02-25 12:10:41 +00:00
7334a4b14f
merge test to 5.3, and remove xfail since the bug was fixed
2012-02-25 05:18:40 +00:00
1ee93c83ff
Fixed bug #61165 (Segfault - strip_tags())
2012-02-25 04:36:08 +00:00
c51f737994
Fix #61095 (Lexing 0x0*+<NUM> incorrectly)
2012-02-20 18:28:57 +00:00
86fcb9659e
Fix #61095 (Lexing 0x0*+<NUM> incorrectly)
2012-02-20 18:28:57 +00:00
fa9540e1f1
make ZEND_SIGNALS configurable, off by default
...
also make ZEND_SIGNALS enabled and disabled binary-compatible
2012-02-16 01:51:45 +00:00
49ce9b9bff
Added ability to reset user opcode handlers (Yoram)
2012-02-14 09:27:08 +00:00
8f7381a6ea
Fixed bug #61072 (Memory leak when restoring an exception handler)
2012-02-14 05:35:34 +00:00
27df8b6ff0
Revert -r319102 and -r322922 in 5.4 branch since they introduce #60978
...
Fixed #60978 in trunk without reverting previous fix
#see http://news.php.net/php.internals/57789
2012-02-08 03:03:05 +00:00
fe802ac2ad
This test needs gc enabled
2012-02-05 06:09:22 +00:00
6452b81b14
This test needs gc enabled
2012-02-05 06:09:22 +00:00
3fe072f8a9
Fixed (disabled) inline-caching for ZEND_OVERLOADED_FUNCTION methods
2012-01-30 10:51:02 +00:00
33863b2cf8
- Reinstated correct return values after David's fix for #60218 .
2012-01-29 15:25:40 +00:00
bbd6ab2054
WS, merged from trunk cause this issue, sorry
2012-01-26 01:28:37 +00:00
1207451239
Fixed bug #60825 (Segfault when running symfony 2 tests)
2012-01-26 01:21:35 +00:00
6b1d3b3d10
Re-fixed bug #60825 (Segfault when running symfony 2 tests)
2012-01-24 14:39:45 +00:00
3299a2673c
Fixed Bug #60809 (TRAITS - PHPDoc Comment Style Bug)
...
Fixed some other traits related bugs (uninitialized variable, return => continue)
Removed some trait related redundant code and variables
2012-01-20 12:30:57 +00:00
902bbce03b
- add test for bug #60771
2012-01-18 20:22:47 +00:00
1cc5588248
- add test for bug #60771
2012-01-18 20:22:47 +00:00
a1525977a0
Regenerated scanners
2012-01-17 08:11:32 +00:00
b515bfbdfb
Improved traits implementation. Now to support __CLASS__ constant in traits php doesn't have to copy the complete compiled method, but can reuse the same code. The resolution of __CLASS__ constants in methods defined in traits are delayed till run-time. This approach also made possible to use __CLASS__ constant as default value for traits properties and method arguments.
2012-01-17 08:09:13 +00:00
7ba37f7921
fixed failed tests (backport from PHP_5_4/trunk).
2012-01-14 09:07:10 +00:00
1c4f227553
Fixed bug #60627 (httpd.worker segfault on startup with php_value)
2012-01-04 08:25:06 +00:00
David Soria Parra