clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 07:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,525 Commits 494 Branches 1,367 Tags 810 MiB
8fa8591cfa
Commit Graph

7912 Commits

Author SHA1 Message Date
Johannes Schlüter
21cbe30be3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Remove extra ;
 2012-06-22 17:33:38 +02:00
Johannes Schlüter
5e23a047ac Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Remove extra ;
 2012-06-22 17:33:22 +02:00
Johannes Schlüter
a62d4e2c43 Remove extra ; 2012-06-22 17:32:46 +02:00
Stanislav Malyshev
784b4cddc6 simplify boolval() 2012-06-13 12:03:36 -07:00
Pierrick Charron
5b10a65617 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
 2012-06-07 17:51:56 +02:00
Pierrick Charron
494c170e6f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
 2012-06-07 17:45:43 +02:00
Pierrick Charron
fed5923dbc Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon) 
Modify the scanner to check if the first char of the raw data is an opening " in which case we
need to find the closing one. Otherwise just search for the next end of value char [\r\n;\000]
 2012-06-07 17:44:20 +02:00
Jille Timmermans
74b4ef5036 Implement boolval() with a test 2012-06-06 22:34:51 +02:00
Xinchen Hui
4770fe2c97 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Typofix in comment in proc_open.c
 2012-05-30 14:44:35 +08:00
Xinchen Hui
7511f972fd Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Typofix in comment in proc_open.c
 2012-05-30 14:43:55 +08:00
Jille Timmermans
a331f43f8c Typofix in comment in proc_open.c 2012-05-30 14:42:39 +08:00
Stanislav Malyshev
f428578138 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix CVE-2012-2143
 2012-05-29 23:14:09 -07:00
Stanislav Malyshev
692b3bcd88 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix CVE-2012-2143
 2012-05-29 23:08:04 -07:00
Stanislav Malyshev
aab49e934d fix CVE-2012-2143 2012-05-29 23:07:04 -07:00
Nuno Lopes
af2d6a63bf remove remaining traces of unicode.* ini settings 2012-05-27 19:57:34 -04:00
Anatoliy Belsky
c8d8d2442e Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
  Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
 2012-05-25 10:53:09 +02:00
Anatoliy Belsky
16a592b13a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
  Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
 2012-05-25 10:52:38 +02:00
Matt Ficken
4aac4da673 Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build 2012-05-25 10:34:33 +02:00
Anatoliy Belsky
e2daa69b62 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62147 test bug - popen_pclose_basic-win32
 2012-05-25 10:05:23 +02:00
Anatoliy Belsky
6fb0e4a401 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62147 test bug - popen_pclose_basic-win32
 2012-05-25 09:55:53 +02:00
Matt Ficken
d4d36fba28 Fixed bug #62147 test bug - popen_pclose_basic-win32 2012-05-25 09:53:51 +02:00
Anatoliy Belsky
1d30fb4c04 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62140 ext\standard\tests\file\tempnam_variation7-win32.phpt fails
 2012-05-24 13:59:57 +02:00
Anatoliy Belsky
72c7cfe6f2 Fixed bug #62140 ext\standard\tests\file\tempnam_variation7-win32.phpt fails 2012-05-24 13:58:42 +02:00
Anatoliy Belsky
674a04dfc7 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #62139 ext\standard\tests\file\rename_variation13-win32.phpt fails
 2012-05-24 13:27:24 +02:00
Anatoliy Belsky
0e12a778df Fix bug #62139 ext\standard\tests\file\rename_variation13-win32.phpt fails 2012-05-24 13:26:32 +02:00
Anatoliy Belsky
0dc9b0e708 Fixed bug #62138 ext\standard\tests\dir\dir_variation8-win32.phpt fails 2012-05-24 12:39:00 +02:00
Gustavo André dos Santos Lopes
adf2fba307 Merge branch '5.4' 2012-05-23 11:37:45 +02:00
Gustavo André dos Santos Lopes
3e62aae1b4 Fix bug #62112: number_format() is not binary safe 
The bug report actually urges PHP 5.3's behavior to be
reinstated -- that is, make "\0", when used as a separator,
be the same as no separator at all. I believe that is not a
proper course of action and that "\0" being interpreted as
no seperator was a bug in PHP 5.3.

Using "" for no separator, in both 5.3 and 5.4, before and
after this change, causes no separator to be used, so
there is no functionality loss.
 2012-05-23 11:37:27 +02:00
Stanislav Malyshev
6e51989501 fd fix 2012-05-16 16:35:16 +02:00
Stanislav Malyshev
6a0212ea88 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fd fix
  fix bug #61065

Conflicts:
	UPGRADING
 2012-05-15 22:39:17 -07:00
Stanislav Malyshev
df2a38e7f8 fd fix 2012-05-15 22:35:43 -07:00
Nikita Popov
9b101ac8b3 Add T_YIELD "yield" keyword 2012-05-15 18:30:48 +02:00
zoe slattery
129c830562 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Changes to remaining two tests, #62022
 2012-05-15 14:40:49 +01:00
zoe slattery
63401268db Changes to remaining two tests, #62022 2012-05-15 14:39:51 +01:00
zoe slattery
3556efc8e2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Small fixes to tests, see #62022
 2012-05-15 11:48:21 +01:00
zoe slattery
d99203d44b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Small fixes to tests, see #62022
 2012-05-15 11:43:28 +01:00
zoe slattery
e35f09d774 Small fixes to tests, see #62022 2012-05-15 11:42:14 +01:00
Rasmus Lerdorf
8da61c62d9 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix grammo
 2012-05-13 11:48:25 -07:00
Rasmus Lerdorf
cd16174f14 Fix grammo 2012-05-13 11:45:41 -07:00
Nuno Lopes
8b4b70df56 fix stack overflow in php_intlog10abs() 
bug uncovered by LLVM/clang's new -fbounds-checking switch
this patch fixes a crash in ext/standard/tests/math/round_large_exp.phpt
 2012-05-11 13:07:21 -04:00
Nuno Lopes
950d5ee590 fix stack overflow in php_intlog10abs() 
bug uncovered by LLVM/clang's new -fbounds-checking switch
this patch fixes a crash in ext/standard/tests/math/round_large_exp.phpt
 2012-05-11 13:07:00 -04:00
Nuno Lopes
5c87ca2d27 fix stack overflow in php_intlog10abs() 
bug uncovered by LLVM/clang's new -fbounds-checking switch
this patch fixes a crash in ext/standard/tests/math/round_large_exp.phpt
 2012-05-11 12:50:29 -04:00
Anatoliy Belsky
d0d7340d50 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
 2012-05-10 17:35:09 +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
Anatoliy Belsky
f6558a295d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails
 2012-05-10 15:40:17 +02:00
Anatoliy Belsky
10d5f2301a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails
 2012-05-10 15:36:47 +02:00
Anatoliy Belsky
f7d8b274c7 Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails 
What happens here is trivial long overflow. Despite the bug attracted
attention on windows, the same story is on linux. Just wait for a big
anough bucket->key . The linux test had %i to check the key value
which should be %d all the way.
 2012-05-10 15:27:44 +02:00
Anatoliy Belsky
5fce7fe885 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
 2012-05-08 19:36:15 +02:00
Anatoliy Belsky
87fa84abde 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-05-08 19:35:13 +02:00
Matt Ficken
c12fdbde5f Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/* 
Fixed that again for systems having their %SYSTEMROOT% not in
c:\windows
 2012-05-08 19:31:41 +02:00
Anatoliy Belsky
d776a933eb Fix bug 61713 check also that mbstring's found any internal_encoding 2012-05-08 18:31:11 +02:00
Anatoliy Belsky
3a4a25358f Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails 
There is a logic error in charset detection part for htmlentities.
When mbstring is compiled shared and mbstring.internal_encoding
is set to pass, it prevents default_charset from being checked
resulting iso-8859-1 being choosed.
 2012-05-08 17:42:01 +02:00
Xinchen Hui
5ad35d6c77 Merge branch 'PHP-5.4' 2012-05-06 20:32:33 +08:00
Xinchen Hui
376635cde8 Merge branch 'PHP-5.3' into PHP-5.4 2012-05-06 20:32:15 +08:00
Xinchen Hui
99076bc24f Change the test folder 2012-05-06 20:31:40 +08:00
Xinchen Hui
556666cc4b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
 2012-05-06 20:29:26 +08:00
Xinchen Hui
4cceeb25b7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
 2012-05-06 20:28:18 +08:00
Xinchen Hui
7ccd594392 Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference) 2012-05-06 20:01:10 +08:00
Nikita Popov
9e1b690e0c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
 2012-05-06 13:40:06 +02:00
Nikita Popov
bef6111609 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
 2012-05-06 13:33:47 +02:00
Reeze Xia
3e9923dd8d Fixed Bug #61961 (file_get_content leaks when access empty file with max length) 2012-05-06 18:27:26 +08:00
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
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
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
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
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
e857110116 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
 2012-04-26 13:30:25 +02:00
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
71f620d436 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Partial fix for bug 61743 to get correct icacls path
  sync version

Conflicts:
	configure.in
 2012-04-25 18:53:56 +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
d77cde46e1 Merge branch '5.4' 2012-04-23 22:10:50 +01: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
5ffe5d471f Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix test
  - BFN
 2012-04-21 16:03:53 +08: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
Gustavo André dos Santos Lopes
dbc5b42435 pack() with new "Z" more in line with Perl. 
Made pack() with "Z" force NUL termination, even if it mean truncating input
to less than the number of characters specified and if the number of
characters is "*", the output will be one byte larger than the input.

Improved tests.
 2012-04-17 22:21:32 +01:00
theanomaly.is@gmail.com
4968fa644b Fixed bug #61038; "Z" and better behavior for unpack() 
Added new "Z" argument to pack/unpack, now allowing "a" to return
data without stripping, and "A" strips all trailing white space,
while "Z" will strip everything after the first null.
 2012-04-17 21:09:04 +01:00
Anatoliy Belsky
739eda38cd Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
 2012-04-16 17:07:52 +02: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
6a48dc2076 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail
 2012-04-16 13:35:15 +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
ee8dfb8882 Merge branch 'PHP-5.4' 2012-04-13 00:12:40 +08: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
5e157bc568 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails
 2012-04-10 15:13:12 +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
Rui Hirokawa
882dca647a MFH: fixed a mistake on reverting my previous patch. 2012-04-09 23:49:18 +09:00
Rui Hirokawa
b28231165a fixed a mistake on reverting my previous patch: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=50b2e02c045b61f99e8c72d54e6bec055aee98e4
 2012-04-09 23:32:41 +09:00
Nikita Popov
8ac56c15c9 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61660: bin2hex(hex2bin($data)) != $data
 2012-04-08 22:41:04 +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
bd5f52fd94 Merge branch '5.4' 2012-04-07 16:34:37 +01: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
31cdcd3517 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61460 popen_close_error-win32 expected output is wrong
  Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
  Fix bug #61481 Test Bug - ext/com_dotnet/tests/bug49192
  Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt
 2012-04-03 14:27:43 +02: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
84be455e22 Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails 2012-04-03 13:28:38 +02:00
Anatoliy Belsky
36449bface Fix bug #61517 random test failure - ext/standard/tests/misc/time_sleep_until_basic.phpt 2012-04-03 13:28:37 +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
babe3ee0d2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug61115-1.phpt for debug build version.
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
 2012-03-29 17:25:49 +05:00
Shein Alexey
c02aa086c6 Resolved conflict. 2012-03-29 17:03:43 +05:00
Shein Alexey
c0f806a69c Merge branch 'fix-debug-build-bug61115-1.phpt' into PHP-5.3 
* fix-debug-build-bug61115-1.phpt:
  Fixed bug61115-1.phpt for debug build version.
 2012-03-29 17:01:40 +05:00
Shein Alexey
e1352b0416 Fixed bug61115-1.phpt for debug build version. 2012-03-29 16:51:45 +05:00
Johannes Schlüter
21fa9634c1 Merge remote branch 'security/PHP-5.3' into PHP-5.3 
* security/PHP-5.3:
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history
 2012-03-29 10:54:08 +02:00
Gustavo André dos Santos Lopes
fc4482fd5e Merge branch '5.4' 2012-03-29 08:48:13 +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
Anatoliy Belsky
a83d84279b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61459 popen_close_basic-win32 can't run sort.exe
 2012-03-28 19:43:45 +02: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
7de75bc51e Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61518 skip on windows, fix on linux - ext/standard/tests/streams/bug60106.phpt
 2012-03-27 19:18:54 +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
b4d078f18c Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix test
 2012-03-25 13:54:27 -07:00
Stanislav Malyshev
50bdc48685 fix test 2012-03-25 13:53:49 -07:00
Rasmus Lerdorf
b08b7fe787 Merge branch 'PHP-5.3' into PHP-5.4 2012-03-25 05:45:55 +05:30
Rasmus Lerdorf
900778731c open_basedir check for linkinfo 2012-03-25 05:32:21 +05:30
Hannes Magnusson
6519665f9c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix test on FreeBSD and other systems that have /etc/services
 2012-03-24 18:00:04 +01: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
ee45f06856 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix test
 2012-03-24 12:15:17 +08:00
Xinchen Hui
f84d55b062 Fix test 2012-03-24 12:15:04 +08:00
Gustavo André dos Santos Lopes
cfdd6c5788 MFH: 7dcada1 for 5.4 
- Fixed possible unsigned int wrap around in html.c. Note that 5.3 has the same
  (potential) problem; even though the code is substantially different, the
  variable name and the fashion it was incremented was kept.
 2012-03-19 16:36:21 +00: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
e132db7a57 - 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
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
Adam Harvey
6655f79401 Fix bug #61409 (Bad formatting on phpinfo()). Patch by Jakub Vrana. 2012-03-16 02:07:46 +00:00
Adam Harvey
9aec9ccd7c Fix bug #61409 (Bad formatting on phpinfo()). Patch by Jakub Vrana. 2012-03-16 02:07:46 +00:00
Gustavo André dos Santos Lopes
efc94f3115 - 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
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
7337a901b7 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
Gustavo André dos Santos Lopes
0169020e49 - Fixed bug #61253: Wrappers opened with errors concurrency problem 
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
 2012-03-08 12:30:59 +00:00
Gustavo André dos Santos Lopes
7166298d63 - Fixed bug #61253: Wrappers opened with errors concurrency problem 
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
 2012-03-08 12:30:59 +00:00
Gustavo André dos Santos Lopes
f413b3726c - Fixed bug #61253: Wrappers opened with errors concurrency problem 
#NOTE: There is a very small possibility that this will further break
#extensions that access wrapper->{err_stack, err_count}. On PECL SVN, rar is the
#only one and it may leak memory after this. I say "further break" because
#extensions that do that are already broken (will segfault) under ZTS, which is
#why this patch is necessary.
#There was what I deem as tacit acceptance from 5.3/5.4 RMs on this.
 2012-03-08 12:30:59 +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
Ilia Alshanetsky
67db5de6b2 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
Nikita Popov
695b9c6720 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
bc8e8b3467 Fix tests that break if filter.default isn't set to unsafe_raw 2012-03-02 05:04:40 +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
Pierrick Charron
d102030b00 Fixed memory leak in substr_replace 2012-03-01 15:10:29 +00:00
Pierre Joye
f44bf55558 - fix bug #60879, unserialize does not invoke __wakeup 2012-02-28 18:36:10 +00:00
Pierre Joye
ee772f60b1 - fix bug #60879, unserialize does not invoke __wakeup 2012-02-28 18:36:10 +00:00
Stanislav Malyshev
f2c791c42b update credits 2012-02-26 06:23:14 +00:00
Olivier DOUCET
8a8dd922a0 fix phpt : fopen(data://) requires allow_url_fopen=1 2012-02-25 12:44:46 +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
bdbcc1789d 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
bcefc31e68 - Better fix for #61115. 
- Fixed resource leak in stream_socket_client().
 2012-02-24 22:56:21 +00:00
Gustavo André dos Santos Lopes
911330e62c - Better fix for #61115. 
- Fixed resource leak in stream_socket_client().
 2012-02-24 22:56:21 +00:00
Gustavo André dos Santos Lopes
cde7662226 - 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
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
ec9fe66069 This one depends on max_input_vars as well 2012-02-14 09:50:46 +00:00
David Soria Parra
dd14c92499 Add credit line for the PHP Output Handler 2012-02-13 19:54:51 +00:00
David Soria Parra
e78aa1b3b4 Add credit line for the PHP Output Handler 2012-02-13 19:54:51 +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
af92365239 Improved fix for #61058, and add test script 2012-02-12 05:32:24 +00:00
Xinchen Hui
33125e2312 Improved fix for #61058, and add test script 2012-02-12 05:32:24 +00:00
Xinchen Hui
3d898cfa3f Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX) 2012-02-12 04:59:08 +00:00
Xinchen Hui
c578917e30 Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX) 2012-02-12 04:59:08 +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
0b702cb5be 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
Christopher Jones
c4100c81cc 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
7dcada1c8c - Fixed possible unsigned int wrap around in html.c. Note that 5.3 has the same 
(potential) problem; even though the code is substantially different, the
  variable name and the fashion it was incremented was kept.
 2012-02-05 14:57:57 +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
122e11ef6e - Fixed bug #60965 (Buffer overflow on htmlspecialchars/entities with 
$double=false).
- Removed unused variable.
- Given maxlen the usual meaning of *len variables (terminator not included).
- Changed some comments.
 2012-02-04 18:12:18 +00:00
Gustavo André dos Santos Lopes
024e1307c6 - Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and 
forbid \0. See bug #60227.
 2012-02-03 13:56:37 +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
325ca60fa7 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
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
f906a015bb - Hopefully correct fix for bug #60227. 
#No commit for 5.4 for now
 2012-02-02 18:24:53 +00:00
Adam Harvey
4dc8b1ad11 Fix bug #60801 (strpbrk() mishandles NUL byte) on trunk only for now. 2012-01-30 13:29:15 +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
Gustavo André dos Santos Lopes
f5a4573182 - 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
Pierrick Charron
1bad879f4c Remove memory leak in substr_replace (to commit in 5.4 after code freeze) 2012-01-20 13:20:14 +00:00
Ferenc Kovacs
59fd8d21c9 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
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
Dmitry Stogov
fc2d10a4d3 Fixed incorrect type cast 2012-01-11 15:04:14 +00:00
Dmitry Stogov
ca77173afb Fixed incorrect type cast 2012-01-11 15:04:14 +00:00
Pierre Joye
71edeb61bd - make it windows version independent, error msg differs, bad but well 2012-01-10 08:30:00 +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
5d6446513e - error is windows version dependent and not what we test here 2012-01-09 15:31:33 +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
34bcd34b8c 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
bbf403f4ce 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
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
b21b982672 Test for bug 60675. 2012-01-06 22:10:04 +00:00
Daniel Convissor
edf86e5282 Test for bug 60675. 2012-01-06 22:09:15 +00:00
Stanislav Malyshev
e2a2ed348f fix bug #55871 - Interruption in substr_replace() 2012-01-02 00:47:57 +00:00
Stanislav Malyshev
cbcddcb02e fix bug #55871 - Interruption in substr_replace() 2012-01-02 00:47:57 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Stanislav Malyshev
3dac688483 test fixes 2011-12-26 03:22:07 +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
d1be77edfb - 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
Xinchen Hui
5da241ca99 fix tests 2011-12-17 04:21:14 +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
b52ed277e3 - 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
49986dbf87 - 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
ccbfe64528 - 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
65ea281189 - 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
f776d2621c - 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
4982528a94 - 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
5df197a5c6 - 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
Pierre Joye
b02c751074 - skip on win 2011-12-12 13:53:38 +00:00
Pierre Joye
4a5ce0c0aa - skip on win 2011-12-12 13:53:38 +00:00
Pierre Joye
c0ba404054 - skip on win 2011-12-12 13:49:21 +00:00
Pierre Joye
df3c9a79fe - skip on win 2011-12-12 13:49:21 +00:00
Pierre Joye
275dc66774 - skip on win 2011-12-12 13:49:21 +00:00
Pierre Joye
1a7f05705f - skip on win 2011-12-12 13:34:21 +00:00
Pierre Joye
582363d9c8 - skip on win 2011-12-12 13:34:21 +00:00
Pierre Joye
c0aca2f440 - skip on win 2011-12-12 13:34:21 +00:00
Pierre Joye
a4ecf57a30 - skip on win 2011-12-12 13:31:43 +00:00
Pierre Joye
d15e57d5db - skip on win 2011-12-12 13:31:43 +00:00
Pierre Joye
e1d45c6db8 - skip on win 2011-12-12 13:31:43 +00:00
Gustavo André dos Santos Lopes
74d2b2f0bd - Fixed bug #60455: stream_get_line misbehaves if EOF is not detected together 
with the last read.
 2011-12-11 21:08:15 +00:00
Gustavo André dos Santos Lopes
faec3c5111 - Fixed bug #60455: stream_get_line misbehaves if EOF is not detected together 
with the last read.
 2011-12-11 21:08:15 +00:00
Gustavo André dos Santos Lopes
52c36e60c4 - Fixed bug #60455: stream_get_line misbehaves if EOF is not detected together 
with the last read.
 2011-12-11 21:08:15 +00:00
Patrick Allaert
ea25a9be03 Added tests contributions on spl_autoload and stream_context_set_option() 
Thank you Jean-Marc Fontaine and Alter Way
 2011-12-09 11:45:39 +00:00
Patrick Allaert
183493d624 Added tests contributions on spl_autoload and stream_context_set_option() 
Thank you Jean-Marc Fontaine and Alter Way
 2011-12-09 11:23:19 +00:00
Patrick Allaert
2b392c9c10 Added tests contributions on spl_autoload and stream_context_set_option() 
Thank you Jean-Marc Fontaine and Alter Way
 2011-12-09 11:15:12 +00:00
Hannes Magnusson
1e6a82a1cf Fix test.. the errormessage is irrelevant, we are testing if we segfault and corrupt return value 2011-12-04 12:34:19 +00:00
Hannes Magnusson
c884d3782c Fix test.. the errormessage is irrelevant, we are testing if we segfault and corrupt return value 2011-12-04 12:34:19 +00:00
Felipe Pena
032fb4ca9c - Fixed tests 2011-12-01 15:38:17 +00:00
Felipe Pena
bffd89487d - Fixed tests 2011-12-01 15:38:17 +00:00
Felipe Pena
60f338ef2c - Fixed tests 2011-12-01 14:15:22 +00:00
Felipe Pena
b69251c9f6 - Fixed tests 2011-12-01 14:14:30 +00:00
Dmitry Stogov
9d343d7694 Added implicit type casting to allow reusage of macros in C++ extensions (Yoram) 2011-11-28 13:01:28 +00:00
Dmitry Stogov
878ada77a0 Added implicit type casting to allow reusage of macros in C++ extensions (Yoram) 2011-11-28 13:01:28 +00:00
Xinchen Hui
aa5ce0b58d warning: suggest parentheses around && within || 2011-11-25 07:50:18 +00:00
Dmitry Stogov
020cfc3d62 Fixed bug #48216 (PHP Fatal error: SOAP-ERROR: Parsing WSDL: Extra content at the end of the doc, when server uses chunked transfer encoding with spaces after chunk size) 2011-11-23 10:49:42 +00:00
Dmitry Stogov
b3522ffdcb Fixed bug #48216 (PHP Fatal error: SOAP-ERROR: Parsing WSDL: Extra content at the end of the doc, when server uses chunked transfer encoding with spaces after chunk size) 2011-11-23 10:49:42 +00:00
Dmitry Stogov
48a5ab0eca Fixed bug #48216 (PHP Fatal error: SOAP-ERROR: Parsing WSDL: Extra content at the end of the doc, when server uses chunked transfer encoding with spaces after chunk size) 2011-11-23 10:49:42 +00:00
Felipe Pena
4fffb5f5e0 - Fixed invalid free in call_user_method() function 2011-11-22 12:47:08 +00:00
Felipe Pena
97d7f9e112 - 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
Stanislav Malyshev
9a69efb9fc fixes for bug #55748 2011-11-18 07:11:19 +00:00
Stanislav Malyshev
77d0643b68 fixes for bug #55748 2011-11-18 07:11:19 +00:00
Felipe Pena
3d19038838 - Fixed bug #55874 (GCC does not provide __sync_fetch_and_add on some archs) 
patch by: klightspeed at netspace dot net dot au
 2011-11-15 20:33:26 +00:00
Felipe Pena
42776c0259 - Fixed bug #55874 (GCC does not provide __sync_fetch_and_add on some archs) 
patch by: klightspeed at netspace dot net dot au
 2011-11-15 20:33:26 +00:00
Felipe Pena
8e6a9d469a - Fixed bug #55874 (GCC does not provide __sync_fetch_and_add on some archs) 
patch by: klightspeed at netspace dot net dot au
 2011-11-15 20:33:26 +00:00
Felipe Pena
1f81004be2 - Fixed bug #52624 (tempnam() by-pass open_basedir with inexistent directory) 2011-11-15 16:59:59 +00:00
Felipe Pena
5f0e6a74ba - Fixed bug #52624 (tempnam() by-pass open_basedir with inexistent directory) 2011-11-15 16:59:59 +00:00
Felipe Pena
fb37f3b20d - Fixed bug #52624 (tempnam() by-pass open_basedir with inexistent directory) 2011-11-15 16:59:59 +00:00
David Soria Parra
020e7e1b72 Forgot the bug specific test. 2011-11-15 13:36:45 +00:00
David Soria Parra
fa4f7411a3 Forgot the bug specific test. 2011-11-15 13:36:45 +00:00
David Soria Parra
fd2e3d6d8e 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
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
Gustavo André dos Santos Lopes
a56c0bd0d8 - Fixed tests in ext/standard/tests/http by adding the INI setting value 
allow_url_fopen=1
- Converted test file from dos line endings to unix line endings.
 2011-11-14 01:12:23 +00:00
Gustavo André dos Santos Lopes
edea1c7b45 - Fixed tests in ext/standard/tests/http by adding the INI setting value 
allow_url_fopen=1
- Converted test file from dos line endings to unix line endings.
 2011-11-14 01:12:23 +00:00
Gustavo André dos Santos Lopes
8b5045fdcd - Fixed tests in ext/standard/tests/http by adding the INI setting value 
allow_url_fopen=1
- Converted test file from dos line endings to unix line endings.
 2011-11-14 01:12:23 +00:00
Rasmus Lerdorf
bd7e9cfca1 Fix test 2011-11-12 19:12:39 +00:00
Rasmus Lerdorf
d391bbae17 Fix test 2011-11-12 19:12:39 +00:00
Rasmus Lerdorf
ffb1c4d8ef Fix typo and don't use 'a' as an invalid filename since it is the default 
gcc binary filename and is thus not unlikely to be left lying around in the
build dir which cause these tests to fail
 2011-11-12 18:46:04 +00:00
Rasmus Lerdorf
aada9503fc Fix typo and don't use 'a' as an invalid filename since it is the default 
gcc binary filename and is thus not unlikely to be left lying around in the
build dir which cause these tests to fail
 2011-11-12 18:46:04 +00:00
Rui Hirokawa
50b2e02c04 revert changes to fix bug #60116. 2011-11-11 14:58:32 +00:00
Rui Hirokawa
40a951ccad revert changes to fix bug #60116. 2011-11-11 14:52:56 +00:00
Arpad Ray
8b6a2d257a Fix hash key length in register/remove_user_shutdown_function 2011-11-11 14:42:18 +00:00
Arpad Ray
d39dbdee24 Fix hash key length in register/remove_user_shutdown_function 2011-11-11 14:42:18 +00:00
Hannes Magnusson
2d97e08d7e register the new shell escape constants 2011-11-10 18:23:20 +00:00
Hannes Magnusson
f66d977c22 Fix build 2011-11-10 17:20:09 +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
Felipe Pena
9da6f6a374 - Make valgrind happy with session_decode_error2.phpt 2011-11-09 23:50:01 +00:00
Felipe Pena
6781229e88 - Make valgrind happy with session_decode_error2.phpt 2011-11-09 23:50:01 +00:00
Felipe Pena
6fac17f9d0 - Initialize BG(serialize_lock) to make valgrind happy 2011-11-09 22:16:31 +00:00
Felipe Pena
cc8d433454 - Initialize BG(serialize_lock) to make valgrind happy 2011-11-09 22:16:31 +00:00
Stanislav Malyshev
10f20585fc fix bug #55475 - implement is_a BC solution 2011-11-09 05:27:45 +00:00
Stanislav Malyshev
3598185a74 fix bug #55475 - implement is_a BC solution 2011-11-09 05:27:45 +00:00
Antony Dovgal
152aaba03f bail out if reading HTTP headers failed 2011-11-08 16:38:56 +00:00
Antony Dovgal
50f5c1e9b2 bail out if reading HTTP headers failed 2011-11-08 14:12:37 +00:00
Antony Dovgal
22b39bcc75 bail out if reading HTTP headers failed 2011-11-08 13:30:58 +00:00
Rui Hirokawa
d73b1a275d fixed bug #60227: header() cannot detect the multi-line header with CR. 2011-11-06 11:07:14 +00:00
Rui Hirokawa
d6015ff972 MFH: added japanese encoding to maintain compatibility with PHP 5.3. 2011-11-05 04:44:16 +00:00
Rui Hirokawa
6dabd7de04 added japanese encoding to maintain compatibility with PHP 5.3. 2011-11-05 04:43:35 +00:00
Rui Hirokawa
71ee976a2d added a test script for bug60116 and fixed behabior of ESCAPE_CMD_END. 2011-10-30 05:57:26 +00:00
Pierre Joye
03b39896a6 - fixed bug #60120, proc_open's streams may hang with stdin/out/err when the data exceeds or is equal to 2048 bytes 2011-10-24 12:39:55 +00:00
Pierre Joye
97076fa68e - fixed bug #60120, proc_open's streams may hang with stdin/out/err when the data exceeds or is equal to 2048 bytes 2011-10-24 12:39:55 +00:00
Pierre Joye
8bd6b9d87a - fixed bug #60120, proc_open's streams may hang with stdin/out/err when the data exceeds or is equal to 2048 bytes 2011-10-24 12:39:55 +00:00
Pierre Joye
b7354a30cd - win9x is not supported anymore since 5.3 2011-10-24 10:53:17 +00:00
Pierre Joye
20422c2653 - win9x is not supported anymore since 5.3 2011-10-24 10:53:17 +00:00
Pierre Joye
87ce6fe18d - win9x is not supported anymore since 5.3 2011-10-24 10:53:17 +00:00
Ferenc Kovacs
c18a8bfe63 duh, I didn't wanted to commit that modification 2011-10-23 20:14:26 +00:00
Rui Hirokawa
f17a215493 fixed bug #60116 escapeshellcmd() cannot escape the dangerous quotes. 2011-10-23 13:49:54 +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
Ferenc Kovacs
11de3aeedb 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
a7a5776be7 fix test, it was fixed for trunk and 5.4 in r314005 2011-10-22 22:57:55 +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
Stanislav Malyshev
ed12ebc79c Changed silent conversion of array to string to produce a notice. (Patrick) 2011-10-21 06:08:47 +00:00
Michael Wallner
849e7ae7aa Fix Bug #55801 Behavior of unserialize has changed: 
(un)serialize in __wakeup/__sleep now use clean var_hashes
 2011-10-19 10:09:24 +00:00
Michael Wallner
b6921369b5 Fix Bug #55801 Behavior of unserialize has changed: 
(un)serialize in __wakeup/__sleep now use clean var_hashes
 2011-10-19 10:09:24 +00:00
Gustavo André dos Santos Lopes
d3fdacb99f - Fixed #55798: serialize followed by unserialize with numeric object prop. 
gives integer prop.
 2011-09-28 14:47:42 +00:00
Gustavo André dos Santos Lopes
ecfa660a82 - Fixed #55798: serialize followed by unserialize with numeric object prop. 
gives integer prop.
 2011-09-28 14:47:42 +00:00
Gustavo André dos Santos Lopes
4eb080226b - Fixed #55798: serialize followed by unserialize with numeric object prop. 
gives integer prop.
 2011-09-28 14:47:42 +00:00
Alan Knowles
0db9b9b141 remove paths from is_a and is_subclass tests 2011-09-27 07:59:47 +00:00
Alan Knowles
60093a0ca5 fix is_a errror test so they test correctly against new behaviour of is_a and is_subclass_of 2011-09-27 00:42:56 +00:00
Alan Knowles
779ca152bf move autoloaded is_a test to where all the other is_a tests are 2011-09-27 00:19:43 +00:00
Pierre Joye
16f6347264 - be sure to check if the var ha not been removed between the two calls 2011-09-26 08:49:28 +00:00
Pierre Joye
aeee365d72 - be sure to check if the var ha not been removed between the two calls 2011-09-26 08:49:28 +00:00
Pierre Joye
2b8fe11dd8 - Fix bug #55622, better fix for this issue, old fix can break if sizeof(size_t) > sizeof(int) like on sparc 2011-09-26 08:38:03 +00:00
Pierre Joye
60bf324ed5 - Fix bug #55622, better fix for this issue, old fix can break if sizeof(size_t) > sizeof(int) like on sparc 2011-09-26 08:36:33 +00:00
Pierre Joye
3e0e2820b8 - Fix bug #55622, better fix for this issue, old fix can break if sizeof(size_t) > sizeof(int) like on sparc 2011-09-26 08:36:33 +00:00
Xinchen Hui
c58f254354 Improve the warning message of incompatible arguments. (#55719) 
And fix tests related.
 2011-09-23 15:08:11 +00:00
Xinchen Hui
8cefbca521 Improve the warning message of incompatible arguments. (#55719) 
And fix tests related.
 2011-09-23 15:08:11 +00:00
Felipe Pena
ad9c9ed529 - Fixed bug #55231 (Unsatisfied symbols __sync_fetch_and_add_4) 2011-09-17 00:01:45 +00:00
Felipe Pena
3d34acbb5f - Fixed bug #55231 (Unsatisfied symbols __sync_fetch_and_add_4) 2011-09-17 00:01:45 +00:00
Felipe Pena
39c6382b14 - Fixed bug #55231 (Unsatisfied symbols __sync_fetch_and_add_4) 2011-09-17 00:01:45 +00:00
Pierre Joye
0ec7852b44 - add -win32 versions and skipif 2011-09-16 10:45:04 +00:00
Pierre Joye
c6b74fe209 - add -win32 versions and skipif 2011-09-16 10:45:04 +00:00
Xinchen Hui
9a6424e95d Forget commit to trunk 2011-09-14 15:45:02 +00:00
Pierre Joye
039fc22164 - fix text (encoding was broken with the previous commit) 2011-09-14 10:30:31 +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
Arpad Ray
45a96e0d5b fix zts break in r316688 2011-09-13 23:07:08 +00:00
Arpad Ray
f8a943cc19 fix zts break in r316688 2011-09-13 23:07:08 +00:00
Arpad Ray
5bc97c6cfa Implement object-oriented session handlers (https://wiki.php.net/rfc/session-oo) 2011-09-13 22:28:15 +00:00
Arpad Ray
47cfae87eb Implement object-oriented session handlers (https://wiki.php.net/rfc/session-oo) 2011-09-13 22:28:15 +00:00
Dmitry Stogov
4a25a7740d Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Dmitry Stogov
e43ff1359e Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Xinchen Hui
4c7cd475dc MFH, fix test 2011-09-13 13:20:09 +00:00
Xinchen Hui
e29ee12223 MFH, fix test 2011-09-13 13:02:57 +00:00
Xinchen Hui
3331bfb604 MFH, fix test 2011-09-13 13:02:57 +00:00
Xinchen Hui
84c94e29c9 Fixed Bug #55674 (fgetcsv & str_getcsv skip empty fields in some tab-separated records) which was introduced by r311543 2011-09-13 12:44:13 +00:00
Xinchen Hui
54d48bb31f Fixed Bug #55674 (fgetcsv & str_getcsv skip empty fields in some tab-separated records) which was introduced by r311543 2011-09-13 12:44:13 +00:00
Xinchen Hui
1bbda643f2 Fixed Bug #55674 (fgetcsv & str_getcsv skip empty fields in some tab-separated records) which was introduced by r311543 2011-09-13 12:44:13 +00:00
Stanislav Malyshev
ba04ba9c82 MFB crypt fix 2011-09-12 17:50:42 +00:00
Ilia Alshanetsky
2ef05a8fa4 Fixed bug #55273 (base64_decode() with strict rejects whitespace after pad) 2011-09-12 17:20:24 +00:00
Ilia Alshanetsky
9915700fa1 Fixed bug #55273 (base64_decode() with strict rejects whitespace after pad) 2011-09-12 17:20:24 +00:00
Ilia Alshanetsky
3d3a6a3b96 Fixed bug #55273 (base64_decode() with strict rejects whitespace after pad) 2011-09-12 17:20:24 +00:00
Hannes Magnusson
d0dbb43935 Sync line ending with 5_4 2011-09-12 10:24:27 +00:00
Pierre Joye
c4c7c48ac6 - fix test, again... 2011-09-08 11:52:37 +00:00
Pierre Joye
0507a433a3 - fix test, again... 2011-09-08 11:52:37 +00:00
Pierre Joye
6f2cd0fcef - fix test 2011-09-08 11:24:33 +00:00
Pierre Joye
923c02bbdc - fix test 2011-09-08 11:24:33 +00:00
Rasmus Lerdorf
d8a0b1a9e3 This test was added to verify that bug 39322 was fixed, which the test 
does test for and this works. However, it consistently failed because
it relied on a SIGHUP not terminating a sh -c /usr/bin/nohup sleep 50
process which doesn't work because the SIGHUP goes to the sh process
not the nohup'ed sleep process. So, I have sped up the test and removed
the nohup and instead of trying to SIGHUP I am just doing the equivalent
of a kill 0 on it to verify that the resource sticks around.
 2011-09-07 18:09:34 +00:00