bbcea230e1
Use emalloc instead of malloc
2012-05-21 18:58:19 +08:00
2ae8d2fbfb
Fixed bug #61998 (Using traits with method aliases appears to result in crash during execution)
2012-05-21 13:57:41 +04:00
c8f47a8e7c
Fixed bug #61998 (Using traits with method aliases appears to result in crash during execution)
2012-05-21 13:46:07 +04:00
a0dff6fdca
fix bug #61782 - __clone/__destruct do not match other methods when checking access controls
2012-05-13 14:40:44 -07:00
9344bf193c
fix bug #54547
2012-05-13 14:40:44 -07:00
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
3332943c9d
Fixed Bug #62005 (unexpected behavior when incrementally assigning to a member of a null object)
2012-05-12 13:13:44 +08:00
0cb4849e53
Cleanup useless function declaration for traits
2012-05-11 16:52:12 +08:00
72f19e9a8b
Fixed bug #61922 (ZTS build doesn't accept zend.script_encoding config)
2012-05-03 22:39:53 +08:00
d74d88fbb9
Fixed test bug #61892
2012-05-03 19:56:49 +08:00
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
bbf8a50281
Fix typo
...
picked form pull request of reeze.xia@gmail.com
2012-05-03 18:39:03 +08:00
4deb0f1a0a
- Regenerated files
2012-04-30 15:57:00 -03:00
79961dccab
- Fixed Windows build
2012-04-30 15:55:57 -03:00
1622843162
- Regenerated files
2012-04-30 10:35:28 -03:00
3120387617
- Changed last commit to use VK_ESCAPE on Windows
2012-04-30 10:31:49 -03:00
cc5b995c78
- Fixed bug #61827 (incorrect \e processing on Windows) patch by: ab@php.net
2012-04-29 19:35:52 -03:00
da6465a268
Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash)
2012-04-18 18:13:27 +08:00
82c05eeda9
Copy default properties of internal classes for different threads
2012-04-11 19:21:41 -07:00
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
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
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
74ee335e3a
- fix bug #61504 , fix build errors on windows and possibly other
2012-03-28 01:59:41 +02:00
872fdd153e
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
2012-03-24 19:26:27 +08:00
9c99a89e8e
Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
...
This reverts commit fcae164ea6
2012-03-24 19:26:02 +08:00
2d21149743
Revert "Merge from PHP-5.4"
...
This reverts commit 9a87fe1c52
2012-03-24 19:25:21 +08:00
7ffc442927
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
2012-03-24 15:15:27 +08:00
fcae164ea6
Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)
2012-03-24 15:13:10 +08:00
9a87fe1c52
Merge from PHP-5.4
...
Improve set_exception_handler
2012-03-24 14:33:00 +08:00
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
114d662d12
Remove empty lines
2012-03-24 11:35:13 +08:00
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
Xinchen Hui