php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 07:28:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
68,096 Commits 549 Branches 1,485 Tags
92bca7436fe00f3eb3230f8d42dd2f2b3016574b
Commit Graph

68096 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatoliy Belsky 92bca7436f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61459 popen_close_basic-win32 can't run sort.exe
 2012-03-28 19:32:24 +02:00
Anatoliy Belsky eeab3be303 Fix bug #61459 popen_close_basic-win32 can't run sort.exe 2012-03-28 19:25:29 +02:00
Anatoliy Belsky fa0d507923 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61401 ext\openssl\tests\004.phpt fails
  Fix bug #61404 ext\openssl\tests\021.phpt fails
  Fix bug #61448 intl tests fail with icu >= 4.8
 2012-03-28 17:13:16 +02:00
Anatoliy Belsky bff8152565 Fix bug #61401 ext\openssl\tests\004.phpt fails 2012-03-28 17:11:58 +02:00
Anatoliy Belsky 4c5b427124 Fix bug #61404 ext\openssl\tests\021.phpt fails 2012-03-28 16:15:36 +02:00
Anatoliy Belsky bd7bb973b1 Fix bug #61404 ext\openssl\tests\021.phpt fails 2012-03-28 16:04:56 +02:00
Anatoliy Belsky bd928f0592 Fix bug #61448 intl tests fail with icu >= 4.8 2012-03-28 15:07:01 +02:00
Anatoliy Belsky fa7f215d19 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:php-src:
  Fixed problem introduced in a763929 (fixing bug #61347).
 2012-03-28 14:51:16 +02:00
Gustavo André dos Santos Lopes a9121819d0 Merge remote branch 'origin/PHP-5.4' into 5.4 2012-03-28 13:13:52 +01:00
Gustavo André dos Santos Lopes 4fa0c2a963 Merge remote branch 'origin/PHP-5.3' into 5.3 2012-03-28 13:12:12 +01:00
Gustavo André dos Santos Lopes 593578c8c1 Merge branch '5.3' into 5.4 2012-03-28 13:06:05 +01:00
Gustavo André dos Santos Lopes f07dd29fdc Fixed problem introduced in a763929 (fixing bug #61347). 
The test added in 8c44c85 should now pass.
 2012-03-28 13:04:41 +01:00
Anatoliy Belsky 105a9a9d45 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61448 intl tests fail with icu >= 4.8
 2012-03-28 14:01:14 +02:00
Anatoliy Belsky 103995ba22 Fix bug #61448 intl tests fail with icu >= 4.8 2012-03-28 13:59:51 +02:00
Anatoliy Belsky d406f2b034 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails
 2012-03-28 12:56:17 +02:00
Anatoliy Belsky 0b20329aaf Fix bug #61468 ext/phar/tests/phar_oo_005.phpt fails 2012-03-28 12:54:19 +02:00
Anatoliy Belsky 4f23ee8f5e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Bug 61504 updated libmagic.patch
  Bug #61504 TSRML_FETCH() must be last
 2012-03-28 12:10:25 +02:00
Anatoliy Belsky 11f04c3524 Bug 61504 updated libmagic.patch 2012-03-28 12:06:09 +02:00
Anatoliy Belsky e7fa402c7c Bug #61504 TSRML_FETCH() must be last 2012-03-28 12:05:20 +02: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 067603106e Restored the good part of 74ee335 that was just reverted. 2012-03-28 08:43:41 +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 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
Christopher Jones 00b4862167 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Update README
 2012-03-27 11:54:05 -07:00
Christopher Jones c8ced8c0a3 Merge branch 'readme1' into PHP-5.3 
* readme1:
  Update README
 2012-03-27 11:52:23 -07:00
Christopher Jones 968a330220 Update README 
More updates to OCI8 README as an excuse to try the PHP multi-dir git
workflow instructions.
 2012-03-27 11:19:33 -07:00
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 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
Pierrick Charron 7f05a39fce Merge branch 'PHP-5.3' into PHP-5.4 2012-03-24 17:59:46 -04:00