clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,934 Commits 491 Branches 1,363 Tags 846 MiB
1c16c89b96
Commit Graph

6923 Commits

Author SHA1 Message Date
Gustavo André dos Santos Lopes
298e9d2932 Merge branch '5.4' 2012-03-28 08:58:09 +01: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
13bd9c2c3d Merge branch 'PHP-5.4' 
* PHP-5.4:
  - 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:15:02 +02: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
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
aa7cdcd13d Merge branch 'PHP-5.4' of ../php-5.4 2012-03-24 19:28:43 +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
690afaffc8 Merge branch 'PHP-5.4' of ../php-5.4 2012-03-24 15:16:51 +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
caa40dd323 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Improve set_exception_handler
 2012-03-24 11:50:07 +08:00
Xinchen Hui
a2bca4e46f Improve set_exception_handler 
Remove useless alloc/free and return_value copy while doing reset
exception handler
 2012-03-24 11:46:29 +08:00
Xinchen Hui
3813f987d5 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Remove empty lines
 2012-03-24 11:35:29 +08:00
Xinchen Hui
114d662d12 Remove empty lines 2012-03-24 11:35:13 +08:00
David Soria Parra
6e7284fb5b Merge branch 'PHP-5.4' 
* PHP-5.4:
  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:59:33 +01:00
David Soria Parra
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
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
Xinchen Hui
943a4fed4e reduce memory usage 2012-03-12 14:52:02 +00:00
Xinchen Hui
438a30f1e7 reduce memory usage 2012-03-12 14:52:02 +00:00
Xinchen Hui
d845cfb12e reduce memory usage 2012-03-12 14:52:02 +00:00
Ilia Alshanetsky
2cc64c28f0 Fixed bug #60569 (Nullbyte truncates Exception $message). 2012-03-11 18:15:13 +00:00
Ilia Alshanetsky
d4f05fbffc Fixed bug #60569 (Nullbyte truncates Exception $message). 2012-03-11 18:15:13 +00:00
Ilia Alshanetsky
3d9824a798 Fixed bug #60569 (Nullbyte truncates Exception $message). 2012-03-11 18:15:13 +00:00
Xinchen Hui
eac33b454c Typo when merging from trunk 2012-03-11 15:31:19 +00:00
Xinchen Hui
a38ffd5705 Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes) 2012-03-11 15:28:31 +00:00
Xinchen Hui
b7ae5e0d86 Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes) 2012-03-11 15:28:31 +00:00
Xinchen Hui
7536bf963d Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes) 2012-03-11 15:28:31 +00:00
Xinchen Hui
24603280d4 fix test 2012-03-11 14:44:07 +00:00
Derick Rethans
c9436c200e Fixed version numbers. 2012-03-06 18:34:10 +00:00
Derick Rethans
7afd050922 Fixed version numbers. 2012-03-06 18:34:10 +00:00
Derick Rethans
38e5089e85 Fixed version numbers. 2012-03-06 18:34:10 +00:00
Derick Rethans
ecf8986a9a Add the ZEND_DONT_UNLOAD_MODULES environment variable for debugging to 5.3 as 
well.
 2012-03-06 18:25:55 +00:00
Dmitry Stogov
e182aeec10 Fixed module numbering 2012-03-05 12:47:25 +00:00
Dmitry Stogov
56a3f7eca8 Fixed module numbering 2012-03-05 12:47:25 +00:00
Dmitry Stogov
ecdf201214 Fixed module numbering 2012-03-05 12:47:25 +00:00
Stefan Marr
520d07d86a Fixed Bug #61052 (Missing error check in trait 'insteadof' clause) 2012-03-04 19:34:19 +00:00
Stefan Marr
ffded0020b Fixed Bug #61052 (Missing error check in trait 'insteadof' clause) 2012-03-04 19:34:19 +00:00
Stefan Marr
34fe62619d Fixed Bug #60911 (Confusing error message when extending traits) 2012-03-04 18:33:33 +00:00
Stefan Marr
0ed3b00406 Fixed Bug #60911 (Confusing error message when extending traits) 2012-03-04 18:33:33 +00:00
Stefan Marr
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
Stefan Marr
0bb85e4b91 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
Xinchen Hui
bacd820218 MFH: Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode) 2012-03-02 03:52:06 +00:00
Xinchen Hui
046e3e3889 MFH: Fixed bug #60573 (type hinting with "self" keyword causes weird errors) 2012-03-02 03:32:12 +00:00