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
75,009 Commits 494 Branches 1,367 Tags 783 MiB
c743d0c9dc
Commit Graph

325 Commits

Author SHA1 Message Date
Nikita Popov
dcf0b71c98 Fix tests after addition of ^ (xor) operator to ini 2013-03-28 18:35:46 +01:00
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
8a930c93dd Merge branch 'PHP-5.4' 2012-09-24 19:47:47 +08:00
Xinchen Hui
8cdd6bc1e7 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-24 19:47:28 +08:00
Xinchen Hui
2cbc4053ae Correct the test summary 2012-09-24 19:46:40 +08:00
Xinchen Hui
518fa8c4cf Merge branch 'PHP-5.4' 2012-09-24 11:01:24 +08:00
Xinchen Hui
d9ad532050 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/standard/tests/general_functions/bug60723.phpt
 2012-09-24 11:00:58 +08:00
Xinchen Hui
923511d364 Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo) 
Cherry pick to 5.3
 2012-09-24 10:59:06 +08:00
Xinchen Hui
8fcb4f1107 Merge branch 'PHP-5.4' 2012-09-23 23:00:15 +08:00
Xinchen Hui
395d77c540 Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo) 2012-09-23 22:59:31 +08:00
Stanislav Malyshev
13763c76db Merge branch 'PHP-5.4' 
* PHP-5.4:
  var_export outputs an E_WARNING when recursion is detected
 2012-08-05 20:58:46 -07:00
Lonny Kapelushnik
45f3322905 var_export outputs an E_WARNING when recursion is detected 2012-08-05 20:56:06 -07:00
Xinchen Hui
ead076bac6 Fix test failed 2012-07-21 23:27:09 +08:00
Xinchen Hui
2ed4026518 Merge branch 'PHP-5.4' 
* PHP-5.4:
  skip for ZTS
 2012-07-18 19:48:27 +08:00
Xinchen Hui
11d0558928 skip for ZTS 2012-07-18 19:47:54 +08:00
Xinchen Hui
44462955f8 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix test (dos2unix, typo)
 2012-07-18 19:25:56 +08:00
Xinchen Hui
282a6659aa fix test (dos2unix, typo) 2012-07-18 19:25:22 +08:00
Gustavo André dos Santos Lopes
08302e3d03 Merge branch '5.4' 
* 5.4:
  NEWS for b47d6b32
  Fix test fails: ext/standard/tests/general_functions/bug27678.phpt
 2012-07-17 23:13:43 +02:00
Reeze Xia
b47d6b32ba Fix test fails: ext/standard/tests/general_functions/bug27678.phpt 
After commit 3e62aae1, number_format() returns string with length,
but _php_math_number_format_ex_len() didn't set string length
on nan and inf. This cause segfault when destruct the return value.
 2012-07-17 23:08:11 +02:00
Jille Timmermans
74b4ef5036 Implement boolval() with a test 2012-06-06 22:34:51 +02:00
Anatoliy Belsky
b43d6c8522 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
 2012-05-10 17:32:21 +02:00
Anatoliy Belsky
266578f584 Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails 
Exception text differ on windows
 2012-05-10 17:07:38 +02: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
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
ca58cd01fc Cherry-pick 4cc74767 
Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227.

Conflicts:

	ext/standard/tests/general_functions/bug60227.phpt
	ext/standard/tests/general_functions/bug60227_1.phpt
	ext/standard/tests/general_functions/bug60227_2.phpt
	main/SAPI.c
 2012-04-04 09:59:51 +01:00
Anatoliy Belsky
2a8866ba5e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
 2012-04-03 13:24:31 +02:00
Anatoliy Belsky
14e74aeb57 Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails 2012-04-03 13:23:06 +02: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
Stanislav Malyshev
4cc747677c MFH: Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227. 2012-03-07 07:49:56 +00:00
Gustavo André dos Santos Lopes
8e82bda330 - Merging r323033 into 5.3 (see bug #60227). 2012-02-03 08:48:34 +00:00
Rui Hirokawa
61088ce729 MFH: fixed bug #60227: header() cannot detect the multi-line header with CR. 2012-01-14 07:41:01 +00:00
Nuno Lopes
bf7df5aff5 do kill 9 to fix a race condition in this test. (should fix the debian 32-bit buildbot) 2012-01-08 18:03:56 +00:00
Nuno Lopes
4cc04be260 do kill 9 to fix a race condition in this test. (should fix the debian 32-bit buildbot) 2012-01-08 18:03:56 +00:00
Felipe Pena
4fffb5f5e0 - Fixed invalid free in call_user_method() function 2011-11-22 12:47:08 +00:00
Felipe Pena
375949781f - Fixed invalid free in call_user_method() function 2011-11-22 12:47:08 +00:00
David Soria Parra
fa4f7411a3 Forgot the bug specific test. 2011-11-15 13:36:45 +00:00
David Soria Parra
13ba2da5f6 Fixed bug #55371 (get_magic_quotes_gpc() throws deprecation warning.) 
Patch by David Zuelke <david dot zuelke at bitextender dot com>
 2011-11-15 13:22:52 +00:00
Rui Hirokawa
40a951ccad revert changes to fix bug #60116. 2011-11-11 14:52:56 +00:00
Rui Hirokawa
cc74264764 MFH: fixed bug #60227 (header() cannot detect the multi-line header with CR(0x0D).) 2011-11-10 14:24:31 +00:00
Rui Hirokawa
db5d9c0b66 MFH: fixed bug #60116 (escapeshellcmd() cannot escape the characters which cause shell command injection). 2011-11-10 14:19:06 +00:00
Ferenc Kovacs
b38d56616b adding SKIP_SLOW_TESTS checks for the slow tests, and additionaly sync the domains used in the ext/standard/tests/network/getmxrr.phpt with the other branches 2011-10-23 10:09:29 +00:00
Ferenc Kovacs
8066746c73 adding SKIP_SLOW_TESTS checks for the slow tests, and additionaly sync the domains used in the ext/standard/tests/network/getmxrr.phpt with the other branches 2011-10-23 10:09:29 +00:00
Stanislav Malyshev
d81ea16ef1 Changed silent conversion of array to string to produce a notice. (Patrick) 2011-10-21 06:08:47 +00:00
Xinchen Hui
29bba1fd42 Fix test, Make warning message bison independed 2011-09-14 08:49:29 +00:00
Xinchen Hui
7bd4924bf7 Fix test, Make warning message bison independed 2011-09-14 08:49:29 +00:00
Xinchen Hui
e29ee12223 MFH, fix test 2011-09-13 13:02:57 +00:00