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,835 Commits 494 Branches 1,367 Tags 807 MiB
298e9d2932
Commit Graph

69835 Commits

This Branch
This Branch
All Branches
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
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
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
Christopher Jones
7894525d40 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Update README

Conflicts:
	ext/oci8/README
 2012-03-27 11:57:55 -07: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
7de75bc51e Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt
 2012-03-27 19:18:54 +02: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
1eefd05eb5 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61519	test fails, should pass - ext/zlib/tests/bug60761.phpt
 2012-03-27 18:22:37 +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
fe8494d781 Merge branch '5.4' 
* 5.4:
  Fix bug #61405 ext\openssl\tests\022.phpt fails
  Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
  Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
 2012-03-27 16:32:14 +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
dda95b794c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Added failing test for ArrayObject::offsetExists().
 2012-03-27 19:02:01 +05: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
Anatoliy Belsky
686effc677 Merge branch '5.4' 
* 5.4:
  Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
 2012-03-27 15:34:57 +02:00
Anatoliy Belsky
5f3ba55a3c Merge branch '5.3' into 5.4 
* 5.3:
  Fix bug #61412 ext\openssl\tests\bug28382.phpt fails
 2012-03-27 15:27:20 +02:00
Anatoliy Belsky
5f6bed180e Fix bug #61412 ext\openssl\tests\bug28382.phpt fails 2012-03-27 15:23:01 +02:00
Pierre Joye
63e58b6f3f Merge branch 'PHP-5.4' 
* PHP-5.4:
  - fix test for 5.11
  Fix bug #61504, potential vuln. in fileinfo. update to 5.11
 2012-03-27 14:02:35 +02: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
Yasuo Ohgaki
cfb2df5fb7 Adjust mbstring php.ini settings 2012-03-27 00:34:21 +09:00
Yasuo Ohgaki
2ceaa9da85 Merge branch 'pull-request/22' 
* pull-request/22:
  mbstring use UTF-8
 2012-03-27 00:30:31 +09:00
slumbers99
833dcf3cf7 mbstring use UTF-8 2012-03-26 18:56:51 +09:00
Stanislav Malyshev
b4d078f18c Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix test
 2012-03-25 13:54:27 -07:00
Stanislav Malyshev
50bdc48685 fix test 2012-03-25 13:53:49 -07:00
Stanislav Malyshev
d780b4e4b3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix tests
 2012-03-25 13:50:33 -07:00
Stanislav Malyshev
d51c1e0a4c fix tests 2012-03-25 13:49:19 -07:00
Stanislav Malyshev
53c2f47a8f Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix bug #61487 - bad bounds check in grapheme_strpos
 2012-03-25 01:03:43 -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
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
Stanislav Malyshev
cd9cd36d7e fix bug #61487 - bad bounds check in grapheme_strpos 2012-03-25 00:56:38 -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