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

2183 Commits

Author SHA1 Message Date
Anatoliy Belsky
19df3c1b1c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
 2012-04-26 13:28:49 +02:00
Anatoliy Belsky
4e9db5ba9f Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails 2012-04-26 13:27:01 +02:00
Anatoliy Belsky
459e758f03 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Partial fix for bug 61743 to get correct icacls path
 2012-04-25 18:46:22 +02:00
Anatoliy Belsky
433290e199 Partial fix for bug 61743 to get correct icacls path 2012-04-25 18:38:27 +02:00
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