clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,267 Commits 494 Branches 1,367 Tags 809 MiB
f2e81779a7
Commit Graph

70267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Jones
f2e81779a7 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix masking in bug61115-1.phpt

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
 2012-05-01 14:47:18 -07:00
Christopher Jones
cac09f3333 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix masking in bug61115-1.phpt
 2012-05-01 14:34:54 -07:00
Christopher Jones
02e25df8b5 Merge branch 'fix-bug61115-1.phpt-for-no-debug' into PHP-5.3 
* fix-bug61115-1.phpt-for-no-debug:
  Fix masking in bug61115-1.phpt
 2012-05-01 14:33:57 -07:00
Christopher Jones
c864b1ca2f Fix masking in bug61115-1.phpt 
The test bug61115-1.phpt was diffing for non-debug builds
 2012-05-01 14:32:09 -07:00
Felipe Pena
1c2c620a58 - Regenerated files 2012-04-30 15:57:09 -03:00
Felipe Pena
4deb0f1a0a - Regenerated files 2012-04-30 15:57:00 -03:00
Felipe Pena
45ef3c759e Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed Windows build
 2012-04-30 15:56:15 -03:00
Felipe Pena
79961dccab - Fixed Windows build 2012-04-30 15:55:57 -03:00
Anatoliy Belsky
3e7af0f25a Merge branch 'master' of git.php.net:php-src 2012-04-30 17:35:32 +02:00
Anatoliy Belsky
8382da0492 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
  - Regenerated files

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
 2012-04-30 17:31:31 +02:00
andrey
2ab5b57cd4 Merge branch 'master' of git.php.net:php-src 2012-04-30 17:31:06 +02:00
Anatoliy Belsky
819a7ae6a1 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2012-04-30 17:25:25 +02:00
Anatoliy Belsky
47c8b6039a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails
 2012-04-30 17:25:11 +02:00
Anatoliy Belsky
d26e006d7f Fix bug 61868 ext\dom\tests\DOMDocument_validate_on_parse_variation.phpt fails 2012-04-30 17:23:49 +02:00
andrey
174bf906f8 refactor MYSQLND_NET, split it two parts for easy resharing 2012-04-30 17:01:56 +02:00
Felipe Pena
1622843162 - Regenerated files 2012-04-30 10:35:28 -03:00
Felipe Pena
ea23192910 - Regenerated files 2012-04-30 10:35:11 -03:00
Felipe Pena
73b6150992 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Changed last commit to use VK_ESCAPE on Windows
 2012-04-30 10:31:59 -03:00
Felipe Pena
3120387617 - Changed last commit to use VK_ESCAPE on Windows 2012-04-30 10:31:49 -03:00
Anatoliy Belsky
7fa7d9a8c6 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Additional fixs for bug 61746 - prepare/clean acls
 2012-04-30 14:37:08 +02:00
Anatoliy Belsky
fc24e74260 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Additional fixs for bug 61746 - prepare/clean acls
 2012-04-30 14:36:42 +02:00
Anatoliy Belsky
ec5421d044 Additional fixs for bug 61746 - prepare/clean acls 2012-04-30 14:33:48 +02:00
Anatoliy Belsky
e509088c94 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61870 ext\session\tests\bug42596.phpt fails
 2012-04-30 12:11:00 +02:00
Anatoliy Belsky
36836f147c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61870 ext\session\tests\bug42596.phpt fails
 2012-04-30 12:10:43 +02:00
Anatoliy Belsky
680685127f Fix bug 61870 ext\session\tests\bug42596.phpt fails 2012-04-30 12:06:28 +02:00
Anatoliy Belsky
8a0981b2ef Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug ext\filter\tests\bug52209.phpt fails
 2012-04-30 10:41:13 +02:00
Anatoliy Belsky
455040c4ab Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug ext\filter\tests\bug52209.phpt fails
 2012-04-30 10:28:00 +02:00
Anatoliy Belsky
8249581a2d Fix bug ext\filter\tests\bug52209.phpt fails 2012-04-30 10:25:54 +02:00
Xinchen Hui
1ad91b2341 Merge remote-tracking branch 'origin/PHP-5.4' 2012-04-30 12:36:06 +08:00
Xinchen Hui
72ccce4b8b Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 2012-04-30 12:35:44 +08:00
Xinchen Hui
a601605f14 merge test from PHP-5.4 2012-04-30 12:33:55 +08:00
Xinchen Hui
d80a3d9668 Revert "Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3" 
After pushed, I found the test script in 5.4 is already fixed this, so
revert this change, and be consistent with 5.4's test

This reverts commit 24d85e4bd8, reversing
changes made to bae56a87f8.
 2012-04-30 12:31:33 +08:00
Xinchen Hui
24d85e4bd8 Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3 2012-04-30 12:29:15 +08:00
Xinchen Hui
2de316ae8b Merge remote-tracking branch 'origin/PHP-5.4' 
* origin/PHP-5.4:
  Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
  - BFN
  - BFN
 2012-04-30 12:16:50 +08:00
Xinchen Hui
fd518ffc7e Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4 
* origin/PHP-5.3:
  Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi).
  - BFN

Conflicts:
	sapi/cli/php_cli.c
 2012-04-30 12:15:43 +08:00
Xinchen Hui
bae56a87f8 Fixed bug #61546 (functions related to current script failed when chdir() in cli sapi). 2012-04-30 12:09:22 +08:00
Felipe Pena
b336af29e1 - BFN 2012-04-29 19:48:00 -03:00
Felipe Pena
9aff3a1156 - BFN 2012-04-29 19:44:27 -03:00
Felipe Pena
bbe9eec9a2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #61827 (incorrect \e processing on Windows) patch by: ab@php.net
 2012-04-29 19:36:10 -03:00
Felipe Pena
cc5b995c78 - Fixed bug #61827 (incorrect \e processing on Windows) patch by: ab@php.net 2012-04-29 19:35:52 -03:00
Felipe Pena
7fa45a9399 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Added missing bound check in iptcparse() (path by chris at chiappa.net)
 2012-04-29 19:14:20 -03:00
Felipe Pena
6008f9af8f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Added missing bound check in iptcparse() (path by chris at chiappa.net)
 2012-04-29 19:14:03 -03:00
Felipe Pena
d44a383986 - Added missing bound check in iptcparse() (path by chris at chiappa.net) 2012-04-29 19:12:12 -03:00
reeze
e52be10b30 Fix test for proc_nice: bsd ps command didn't support option -o "%p %n" 2012-04-30 00:59:54 +08:00
Gustavo André dos Santos Lopes
ffec614412 Fix build on MS Windows 2012-04-28 16:32:44 +01:00
Anatoliy Belsky
a1f7423087 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()
 2012-04-28 11:45:24 +02:00
Anatoliy Belsky
6f8fae606b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()
 2012-04-28 11:44:54 +02:00
Matt Ficken
dc6d283b1c Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime() 2012-04-28 11:42:42 +02:00
Anatoliy Belsky
3dac5b1105 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61786 Failing tests in ext\session\tests\*
 2012-04-26 15:41:06 +02:00
Anatoliy Belsky
3dbe48762f Fix bug 61786 Failing tests in ext\session\tests\* 2012-04-26 15:39:45 +02:00