clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-27 21:07:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,320 Commits 494 Branches 1,367 Tags 783 MiB
19df3c1b1c
Commit Graph

68320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gustavo André dos Santos Lopes
f4873c68a6 Merge branch '5.3' into 5.4 
Conflicts:
	main/output.c
 2012-03-29 08:47:58 +01:00
Gustavo André dos Santos Lopes
67bf07f3e7 Merge rebased pull request #24 onto 5.3 into 5.3 2012-03-29 08:46:37 +01:00
Jille Timmermans
710335b2a3 ext/pcntl/pcntl.c: Fix typo in comment 
Signed-off-by: Jille Timmermans <jille@quis.cx>
 2012-03-29 08:46:04 +01:00
Gustavo André dos Santos Lopes
616d802974 Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow) 
This reverts commit 4aeabaf8e9.
 2012-03-29 08:45:00 +01:00
Gustavo André dos Santos Lopes
117cdf384f Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow) 
This reverts commit 55b1e61242.
 2012-03-29 08:44:19 +01:00
Stanislav Malyshev
fe79276371 Merge branch 'sec54' into PHP-5.4 
* sec54:
  update NEWS
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history
 2012-03-28 21:16:04 -07:00
Jille Timmermans
4aeabaf8e9 ext/pcntl/pcntl.c: Fix typo in comment 
Signed-off-by: Jille Timmermans <jille@quis.cx>
 2012-03-29 09:07:19 +09:00
Jille Timmermans
55b1e61242 ext/pcntl/pcntl.c: Fix typo in comment 
Signed-off-by: Jille Timmermans <jille@quis.cx>
 2012-03-29 09:07:07 +09:00
Yasuo Ohgaki
f38ee78344 Merge branch 'pull-request/25' into 5.3 
* pull-request/25:
  - fix bug #61541, Segfault when using ob_* in output_callback
 2012-03-29 08:51:29 +09:00
Christopher Jones
4b72d505ae Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Refactoring junit logger. Added generation of nested testsuites in junit.xml.
 2012-03-28 16:16:20 -07:00
reeze
abd2b2ee43 - fix bug #61541, Segfault when using ob_* in output_callback 2012-03-29 06:23:05 +09:00
Gustavo André dos Santos Lopes
08089ebe16 Merge branch '5.3' into 5.4 2012-03-28 21:42:48 +01:00
Gustavo André dos Santos Lopes
5ddfdb8fd4 Merge commit rebase pull request 16 into 5.3 2012-03-28 21:41:59 +01:00
Shein Alexey
1e88d0033f Refactoring junit logger. Added generation of nested testsuites in junit.xml. 2012-03-28 21:39:24 +01:00
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
reeze
9bc91a21db - fix bug #61541, Segfault when using ob_* in output_callback 2012-03-29 00:18:02 +08: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