clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,791 Commits 494 Branches 1,367 Tags 807 MiB
dff73f343f
Commit Graph

69791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
dff73f343f Merge branch 'PHP-5.4' 
* PHP-5.4:
  NEWS for bug #61487
  NEWS for bug #61487
 2012-03-25 01:00:37 -07:00
Stanislav Malyshev
cdfef0aee4 NEWS for bug #61487 2012-03-25 01:00:06 -07:00
Stanislav Malyshev
a635b0d2fc Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  NEWS for bug #61487
 2012-03-25 00:58:43 -07:00
Stanislav Malyshev
4c478f9ca6 NEWS for bug #61487 2012-03-25 00:57:08 -07:00
Pierrick Charron
919085b822 Merge branch 'PHP-5.4' 2012-03-24 18:00:04 -04:00
Pierrick Charron
7f05a39fce Merge branch 'PHP-5.3' into PHP-5.4 2012-03-24 17:59:46 -04:00
Pierrick Charron
da2da13f93 Remove unused variable 2012-03-24 17:49:58 -04:00
Hannes Magnusson
6519665f9c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix test on FreeBSD and other systems that have /etc/services
 2012-03-24 18:00:04 +01:00
Hannes Magnusson
10809686f0 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix test on FreeBSD and other systems that have /etc/services
 2012-03-24 17:59:52 +01:00
Hannes Magnusson
948d326b29 Fix test on FreeBSD and other systems that have /etc/services 2012-03-24 17:58:40 +01:00
Hannes Magnusson
54d82a962c Merge branch 'PHP-5.4' 
* PHP-5.4:
  This is a git checkout
  Revert incorrect fix
 2012-03-24 17:20:36 +01:00
Hannes Magnusson
7a1c765385 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  This is a git checkout
  Revert incorrect fix
 2012-03-24 17:20:14 +01:00
Hannes Magnusson
4fc4dd8760 This is a git checkout 2012-03-24 17:16:50 +01:00
Ilia Alshanetsky
8d0760f38a Revert incorrect fix 2012-03-24 12:27:55 -04:00
David Soria Parra
1772a5a2e3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
 2012-03-24 14:40:09 +01:00
David Soria Parra
69b647c43b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
 2012-03-24 14:39:03 +01:00
David Soria Parra
cb54532b7f Merge commit '521ebec3e9bcd4fa75772d2bfa57a733dfe1d5fa' into PHP-5.3 
This merge combines a accidentaly separated head, leading to two duplicated
commits in history (again).

* commit '521ebec3e9bcd4fa75772d2bfa57a733dfe1d5fa':
  Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
 2012-03-24 14:38:03 +01: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
521ebec3e9 Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)" 
This reverts commit fcae164ea6.
 2012-03-24 19:29:56 +08:00
Xinchen Hui
aa7cdcd13d Merge branch 'PHP-5.4' of ../php-5.4 2012-03-24 19:28:43 +08:00
Xinchen Hui
5a0b3cc90a Revert "Update NEWS" 
This reverts commit 88a8085aa3.
 2012-03-24 19:27:00 +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
88a8085aa3 Update NEWS 2012-03-24 15:15:58 +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
b1ea7cd1b0 Merge branch 'PHP-5.4' of ../php-5.4 2012-03-24 14:34:13 +08:00
Xinchen Hui
45a9b12c7c Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4 2012-03-24 14:34:01 +08:00
Xinchen Hui
9a87fe1c52 Merge from PHP-5.4 
Improve set_exception_handler
 2012-03-24 14:33:00 +08:00
Xinchen Hui
cbb9d32418 Merge branch 'PHP-5.4' of ../php-5.4 2012-03-24 14:23:22 +08:00
Xinchen Hui
503e9d955c Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4 2012-03-24 14:22:53 +08:00
Xinchen Hui
56dac369ab Fix ZTS build 2012-03-24 14:22:04 +08:00
Xinchen Hui
8efdf61e80 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Typo
 2012-03-24 12:23:52 +08:00
Xinchen Hui
e3dc1d8101 Typo 2012-03-24 12:23:41 +08:00
Xinchen Hui
ee45f06856 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix test
 2012-03-24 12:15:17 +08:00
Xinchen Hui
f84d55b062 Fix test 2012-03-24 12:15:04 +08:00
Xinchen Hui
0998ae34d3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Improve set_exception_handler

Conflicts:
	NEWS
 2012-03-24 11:56:27 +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
Gustavo André dos Santos Lopes
30642380de Merge branch '5.4' 2012-03-23 22:14:56 +00:00
Gustavo André dos Santos Lopes
e018e2ae86 Merge branch '5.3' into 5.4 2012-03-23 22:14:36 +00:00
Gustavo André dos Santos Lopes
f514856fbb Merge branch 'dom_debug_handler' into 5.3 2012-03-23 22:14:24 +00:00
Gustavo André dos Santos Lopes
15d7d460bd Updated NEWS (DOM object debug info handler). 2012-03-23 22:13:26 +00:00
Gustavo André dos Santos Lopes
372801d94c Fixed tests that var_dump/print_r DOM objects. 2012-03-23 22:08:33 +00:00