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,808 Commits 494 Branches 1,367 Tags 783 MiB
41a9c681a0
Commit Graph

2229 Commits

Author SHA1 Message Date
Gustavo André dos Santos Lopes
485638a09c Merge branch '5.3' into 5.4 2012-04-23 22:10:23 +01:00
Gustavo André dos Santos Lopes
8d748e5de5 Fixed bug #61764: 'I' unpacks n as signed if n > 2^31-1 on LP64 
Also fixed possible invalid read on big endian LP64.
 2012-04-23 22:09:38 +01:00
Xinchen Hui
9a22bc2662 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix test
  - BFN
 2012-04-21 16:03:18 +08:00
Xinchen Hui
2e9eb5e32f Fix test 
Reported by cjones
 2012-04-21 16:02:25 +08:00
Anatoliy Belsky
d55afe4df6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
 2012-04-16 17:07:33 +02:00
Anatoliy Belsky
f3d86b314f Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/* 2012-04-16 17:06:30 +02:00
Anatoliy Belsky
948f3619f6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail
 2012-04-16 13:33:03 +02:00
Anatoliy Belsky
9a4cb732ed Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail 2012-04-16 13:30:58 +02:00
Xinchen Hui
8ceae39d4d Merge branch 'PHP-5.3' into PHP-5.4 2012-04-13 00:11:04 +08:00
Xinchen Hui
8c4294bcb4 Fixed test faild 
the sun_path will not be that much long:
 http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/un.h.html
 2012-04-13 00:07:07 +08:00
Anatoliy Belsky
ed0ddd20c5 Fixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt fails 2012-04-10 15:16:48 +02:00
Anatoliy Belsky
a9eace9f6e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails

Conflicts:
	ext/standard/tests/file/rename_variation13-win32.phpt
 2012-04-10 15:12:42 +02:00
Anatoliy Belsky
b0cb29db87 Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails 2012-04-10 15:09:21 +02:00
Anatoliy Belsky
b9cbb9e744 Fix bug #61667 ext\standard\tests\file\glob_variation-win32.phpt fails 2012-04-10 15:00:03 +02:00
Anatoliy Belsky
fde96342e8 Fixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.phpt fails 2012-04-10 14:13:15 +02:00
Anatoliy Belsky
d80e2e069c Fixed bug 61621 Test fail in ext/standard/tests/dir 2012-04-10 12:47:01 +02:00
Nikita Popov
7ae93a2c4c Fix bug #61660: bin2hex(hex2bin($data)) != $data 
If the input data has an odd length a warning is thrown and false is returned.
 2012-04-08 22:38:21 +02:00
Gustavo André dos Santos Lopes
f7d4076785 Merge branch '5.3' into 5.4 2012-04-07 16:34:17 +01:00
Gustavo André dos Santos Lopes
0f180a63eb Fixed bug in new stream_get_line() when using NUL as a delimiter. 
This is the issue Derick spotted a few days ago..
 2012-04-07 16:32:19 +01: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
Xinchen Hui
7b04638c8c Fix test 
cherry-pick from php-5.4
 2012-04-04 15:20:28 +08:00
Anatoliy Belsky
827c446b62 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61460 popen_close_error-win32 expected output is wrong

Conflicts:
	ext/standard/tests/file/popen_pclose_error-win32.phpt
 2012-04-03 14:22:59 +02:00
Matt Ficken
438536e45e Fix bug #61460 popen_close_error-win32 expected output is wrong 2012-04-03 14:19:43 +02: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
Anatoliy Belsky
9c81654378 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt
 2012-04-03 11:08:02 +02:00
Anatoliy Belsky
469cd3abf1 Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt 2012-04-03 11:04:52 +02:00
Shein Alexey
c02aa086c6 Resolved conflict. 2012-03-29 17:03:43 +05:00
Shein Alexey
e1352b0416 Fixed bug61115-1.phpt for debug build version. 2012-03-29 16:51:45 +05: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
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
Stanislav Malyshev
50bdc48685 fix test 2012-03-25 13:53:49 -07: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
Xinchen Hui
f84d55b062 Fix test 2012-03-24 12:15:04 +08:00
Gustavo André dos Santos Lopes
9a460497da MFH: 45a6f8d for 5.4. 
- Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected
  together with the last read).
- Fixed bug #60817 (stream_get_line() reads from stream even when there is
  already sufficient data buffered). stream_get_line() now behaves more like
  fgets(), as is documented.
 2012-03-19 16:34:31 +00:00
Gustavo André dos Santos Lopes
d974e44248 - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak 
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
  fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition
  for deleting the context was too broad) and so prevents segfaults in new
  circumstances (where the inhibition was not broad enough).
 2012-03-17 19:37:30 +00:00
Gustavo André dos Santos Lopes
ef19fba2d5 - Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak 
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
  fixing bug #61115. This better fix for #61115 fixes the leak (the inhibition
  for deleting the context was too broad) and so prevents segfaults in new
  circumstances (where the inhibition was not broad enough).
 2012-03-17 19:37:30 +00:00
Gustavo André dos Santos Lopes
ed98579924 - Fixed bug #61374: html_entity_decode tries to decode code points that don't 
exist in ISO-8859-1.
 2012-03-13 18:08:30 +00:00
Ilia Alshanetsky
9c886ea553 Fixed bug #60222 (time_nanosleep() does validate input params). 2012-03-12 16:53:07 +00:00
Ilia Alshanetsky
4cccba09e0 Fixed bug #60222 (time_nanosleep() does validate input params). 2012-03-12 16:53:07 +00: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
Ilia Alshanetsky
0fe734b7c8 Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths) 2012-03-03 20:36:14 +00:00
Ilia Alshanetsky
5525d80982 Fixed bug #60106 (stream_socket_server silently truncates long unix socket paths) 2012-03-03 20:36:14 +00:00
Nikita Popov
37d7df72a6 Fix bug #52719: array_walk_recursive crashes if third param of the function is by reference 2012-03-02 18:05:38 +00:00
Nikita Popov
e7810c1f1e Fix bug #52719: array_walk_recursive crashes if third param of the function is by reference 2012-03-02 18:05:38 +00:00
Rasmus Lerdorf
f564921c15 Fix tests that break if filter.default isn't set to unsafe_raw 2012-03-02 05:04:40 +00:00
Xinchen Hui
fda8d2fe68 MFH: Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX) 2012-03-02 03:40:40 +00:00
Adam Harvey
03f3d03ce0 MFH: Fix bug #60801 (strpbrk() mishandles NUL byte). (Trunk commit: r322934). 2012-03-02 03:39:04 +00:00
Adam Harvey
4fc6861030 MFH: Fix bug #60801 (strpbrk() mishandles NUL byte). (Trunk commit: r322934). 2012-03-02 03:39:04 +00:00
Olivier DOUCET
f94237edf3 fix phpt : fopen(data://) requires allow_url_fopen=1 2012-02-25 12:44:46 +00:00
Olivier DOUCET
e613889d50 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
ce535f1819 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
6546beecec fix test file for bug #47997 : fopen(data://) requires allow_url_fopen=1 2012-02-25 10:58:30 +00:00
Gustavo André dos Santos Lopes
eb1ada852d - Fixed bug #61115 (stream related segfault on fatal error in 
php_stream_context_link).
#run-tests.php is not currently detecting the segfault in the test
#Missing 5.4 merge
 2012-02-22 11:45:26 +00:00
Rasmus Lerdorf
4ed1640b35 This one depends on max_input_vars as well 2012-02-14 09:50:46 +00:00
Rasmus Lerdorf
f60145a1a2 This one depends on max_input_vars as well 2012-02-14 09:50:46 +00:00
Rasmus Lerdorf
fdd1977ea7 Unbreak these tests - please be careful with your Windows-based editors that 
seem to mess up ^M's here.
 2012-02-12 08:01:25 +00:00
Xinchen Hui
33125e2312 Improved fix for #61058, and add test script 2012-02-12 05:32:24 +00:00
Christopher Jones
e2ab222c13 Force allow_url_fopen to fix qa.php.net/reports diffs 2012-02-06 23:52:42 +00:00
Christopher Jones
74a79f706f Force allow_url_fopen to fix qa.php.net/reports diffs 2012-02-06 23:52:42 +00:00
Christopher Jones
2759e78afc Mask different curl message. Now passes on Oracle Linux 5 2012-02-06 23:31:51 +00:00
Christopher Jones
3f0dfb0ee5 Mask different curl message. Now passes on Oracle Linux 5 2012-02-06 23:31:51 +00:00
Ferenc Kovacs
de2355935e merging the patch from bug #52078, fixes the test on disk with huge inode size(fileinode() can overflow and return negative values there). 2012-02-06 22:47:21 +00:00
Gustavo André dos Santos Lopes
d4cf399cc4 - Merge r323056 (see bug #60965). 2012-02-05 09:59:33 +00:00
Gustavo André dos Santos Lopes
8e82bda330 - Merging r323033 into 5.3 (see bug #60227). 2012-02-03 08:48:34 +00:00
Adam Harvey
98f5e51a7e Fix bug #60933 on PHP_5_4 (approved by Stas). 2012-02-03 04:17:11 +00:00
Adam Harvey
479c22523c Fix bug #60933 (Testing asort with SORT_LOCALE_STRING fails on Mac OS X 10.6) on PHP_5_3 and trunk. 2012-02-03 01:21:24 +00:00
Gustavo André dos Santos Lopes
45a6f8d9a5 - Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected 
together with the last read).
- Fixed bug #60817 (stream_get_line() reads from stream even when there is
  already sufficient data buffered). stream_get_line() now behaves more like
  fgets(), as is documented.
#withheld commit to 5.4
 2012-01-22 20:30:37 +00:00
Ferenc Kovacs
8619b22ef3 merging the patch from #52078, fixes the test on disk with huge inode size(fileinode() can overflow and return negative values there). will merge this to PHP_5_4 after the commit freeze. 2012-01-19 00:20:04 +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
Pierre Joye
9425379852 - make it windows version independent, error msg differs, bad but well 2012-01-10 08:30:00 +00:00
Pierre Joye
c97197b377 - make it windows version independent, error msg differs, bad but well 2012-01-10 08:30:00 +00:00
Pierre Joye
dd3eb33d76 - error is windows version dependent and not what we test here 2012-01-09 15:31:33 +00:00
Pierre Joye
5d85b02bca - error is windows version dependent and not what we test here 2012-01-09 15:31:33 +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
Daniel Convissor
5df401af21 Remove test for bug 60675, the change in behavior between 5.3 and 5.4 is intentional. 2012-01-07 23:09:49 +00:00
Daniel Convissor
edf86e5282 Test for bug 60675. 2012-01-06 22:09:15 +00:00
Stanislav Malyshev
cbcddcb02e fix bug #55871 - Interruption in substr_replace() 2012-01-02 00:47:57 +00:00
Stanislav Malyshev
d42917b605 test fixes 2011-12-26 03:22:07 +00:00
Gustavo André dos Santos Lopes
ae054ae502 - Fixed bug #60570 (http wrapper leaks context resource if request fails/is 
redirected).
 2011-12-21 15:44:58 +00:00
Gustavo André dos Santos Lopes
f24f2b4df6 - Fixed bug #60570 (http wrapper leaks context resource if request fails/is 
redirected).
 2011-12-21 15:44:58 +00:00
Pierre Joye
848d71da29 - tmp dir is system depedent 2011-12-13 23:18:12 +00:00
Pierre Joye
f94cc91dda - tmp dir is system depedent 2011-12-13 23:18:12 +00:00
Pierre Joye
8e54a63133 - skip on win 2011-12-13 23:04:01 +00:00
Pierre Joye
3b8e237128 - skip on win 2011-12-13 23:04:01 +00:00
Pierre Joye
603bfaaff4 - ignore notices here, not what we test (array to string conversion) 2011-12-13 13:46:27 +00:00
Pierre Joye
609ade1bed - ignore notices here, not what we test (array to string conversion) 2011-12-13 13:46:27 +00:00
Pierre Joye
3a68270fcf - use the test itself, making the test passes when ran outside the src tree 2011-12-12 19:09:01 +00:00
Pierre Joye
df3cd84f80 - use the test itself, making the test passes when ran outside the src tree 2011-12-12 19:09:01 +00:00
Pierre Joye
52e77c9bc8 - skip on win 2011-12-12 14:03:24 +00:00
Pierre Joye
b54e8fa231 - skip on win 2011-12-12 14:03:24 +00:00
Pierre Joye
7eee6fa759 - skip on win 2011-12-12 14:02:06 +00:00
Pierre Joye
a275c409c6 - skip on win 2011-12-12 14:02:06 +00:00
Pierre Joye
aa37291e20 - skip on win 2011-12-12 13:56:42 +00:00
Pierre Joye
02e898c9e0 - skip on win 2011-12-12 13:56:42 +00:00
Pierre Joye
ec9b8149e1 - skip on win 2011-12-12 13:53:38 +00:00