clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 07:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,228 Commits 494 Branches 1,367 Tags 810 MiB
0a580ac76f
Commit Graph

68228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatoliy Belsky
c447704f98 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt
 2012-03-27 18:53:50 +02:00
Anatoliy Belsky
da85d5b4a0 Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt 2012-03-27 18:49:59 +02:00
Anatoliy Belsky
b7596eaa1b Merge branch '5.3' into 5.4 
* 5.3:
  Fix bug #61519	test fails, should pass - ext/zlib/tests/bug60761.phpt

Conflicts:
	ext/zlib/tests/bug60761.phpt
 2012-03-27 18:16:02 +02:00
Anatoliy Belsky
bcfcfb2fc5 Fix bug #61519 test fails, should pass - ext/zlib/tests/bug60761.phpt 2012-03-27 18:02:31 +02:00
Anatoliy Belsky
8d7a489b97 Merge branch '5.3' into 5.4 
* 5.3:
  Fix bug #61405 ext\openssl\tests\022.phpt fails
  Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
 2012-03-27 16:15:15 +02:00
Anatoliy Belsky
b638d3020c Fix bug #61405 ext\openssl\tests\022.phpt fails 2012-03-27 16:07:59 +02:00
Anatoliy Belsky
e55718b091 Fix bug #61412 ext\openssl\tests\bug28382.phpt fails 2012-03-27 16:07:59 +02:00
Anatoliy Belsky
7fdd35d697 Fix bug #61412 ext\openssl\tests\bug28382.phpt fails 2012-03-27 16:07:25 +02:00
Shein Alexey
1b179545c2 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Added failing test for ArrayObject::offsetExists().
 2012-03-27 19:00:28 +05:00
Shein Alexey
8c44c85b06 Merge branch 'failed-arrayaccess-test' into PHP-5.3 
* failed-arrayaccess-test:
  Added failing test for ArrayObject::offsetExists().
 2012-03-27 19:00:05 +05:00
Shein Alexey
ddac4688e8 Added failing test for ArrayObject::offsetExists(). 2012-03-27 18:59:04 +05:00
Pierre Joye
a8174653e3 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - fix test for 5.11
  Fix bug #61504, potential vuln. in fileinfo. update to 5.11
 2012-03-27 14:02:07 +02:00
Pierre Joye
d0e3289d12 - fix test for 5.11 2012-03-27 14:01:38 +02:00
Pierre Joye
12cf930a40 Fix bug #61504, potential vuln. in fileinfo. update to 5.11 2012-03-27 13:34:46 +02:00
Stanislav Malyshev
50bdc48685 fix test 2012-03-25 13:53:49 -07:00
Stanislav Malyshev
d51c1e0a4c fix tests 2012-03-25 13:49:19 -07:00
Stanislav Malyshev
6f6cc844e9 update NEWS 2012-03-25 12:53:44 -07:00
Stanislav Malyshev
2a74cb4008 Merge branch 'sec53' into sec54 
* sec53:
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
 2012-03-25 12:51:46 -07:00
Stanislav Malyshev
167e2fd782 fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN 2012-03-25 12:50:25 -07:00
Stanislav Malyshev
2bd5fa0eda Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix bug #61487 - bad bounds check in grapheme_strpos
 2012-03-25 01:03:25 -07:00
Stanislav Malyshev
bc313f5e80 Merge branch 'grapheme_fix' into PHP-5.3 
* grapheme_fix:
  fix bug #61487 - bad bounds check in grapheme_strpos
 2012-03-25 01:03:02 -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
Stanislav Malyshev
cd9cd36d7e fix bug #61487 - bad bounds check in grapheme_strpos 2012-03-25 00:56:38 -07:00
Rasmus Lerdorf
b08b7fe787 Merge branch 'PHP-5.3' into PHP-5.4 2012-03-25 05:45:55 +05:30
Rasmus Lerdorf
900778731c open_basedir check for linkinfo 2012-03-25 05:32:21 +05:30
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
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
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
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
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
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
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
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
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
e3dc1d8101 Typo 2012-03-24 12:23:41 +08:00
Xinchen Hui
f84d55b062 Fix test 2012-03-24 12:15:04 +08:00