Florian Anderiasch
ddc8d16245
Add syslog support to mail.log #62356
...
Patch by Michael Orlitzky
2012-07-24 14:31:30 +02:00
Xinchen Hui
ead076bac6
Fix test failed
2012-07-21 23:27:09 +08:00
Xinchen Hui
683b4f7a2b
merge 9eb5cb6571
to 5.3
2012-07-21 00:46:32 +08:00
Xinchen Hui
b81b8bf77d
this initialization is unnecessary anymore after commit 2d9d2cadad
2012-07-18 21:45:37 +08:00
Xinchen Hui
2d9d2cadad
Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)
2012-07-18 20:16:27 +08:00
Xinchen Hui
11d0558928
skip for ZTS
2012-07-18 19:47:54 +08:00
Xinchen Hui
282a6659aa
fix test (dos2unix, typo)
2012-07-18 19:25:22 +08:00
Xinchen Hui
41a9c681a0
fix test, the key may be a float value
2012-07-18 19:21:25 +08: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
Stanislav Malyshev
cfdccdb805
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Typofix in test-description
2012-07-14 22:08:19 -07:00
Jille Timmermans
86b4252c8e
Typofix in test-description
2012-07-14 22:07:50 -07:00
Adam Gegotek
8b70dd202a
Fixing up closing tag
2012-07-14 18:59:04 -07:00
Adam Gegotek
152f73f92a
Testing variation on input parameters of http_build_query() function
2012-07-14 18:58:52 -07:00
Felipe Pena
0bff7cfadd
- Fixed bug #62565 (Crashes due non-initialized internal properties_table)
2012-07-14 12:16:16 -03:00
Nikita Popov
5cf2f87fa7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix potential integer overflow in nl2br
Fix potential integer overflow in bin2hex
Conflicts:
ext/standard/string.c
2012-07-05 20:59:18 +02:00
Nikita Popov
157ddd9577
Fix potential integer overflow in nl2br
...
The buffer size was calculated manually, thus creating integer overflows
for very large inputs, e.g. nl2br(str_repeat("\n", 613566757)).
The code now uses safe_emalloc, thus making the code throw an error
instead of crashing.
2012-07-05 20:41:54 +02:00
Nikita Popov
88f46b162b
Fix potential integer overflow in bin2hex
...
The code was already using safe_emalloc but did the multiplication in
the first argument, thus making the use of safe_emalloc pretty useless.
The *2 is now moved to the second argument.
2012-07-05 20:14:49 +02:00
Marc Easen
896ac689c9
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 16:54:03 -07:00
Nikita Popov
d86b6ea35c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix some lengths in crypt()
Conflicts:
ext/standard/crypt.c
2012-06-29 13:15:35 +02:00
Nikita Popov
e6cf7d7745
Fix some lengths in crypt()
...
Use salt_len_in instead of strlen(salt) or PHP_MAX_SALT_LEN, otherwise too
much memory will be allocated.
sha512 has a 86 character checksum, not 43. That probably was a copy&paste
from the sha256 code which indeed has 43.
The allocation also was using sizeof(char *), thus allocating 4 or 8 times
as much memory as necessary. The sizeof(char *) was removed in the 5.4
branch in b7a92c9
but forgotten on 5.3.
The memset 0 call was using PHP_MAX_SALT_LEN which can be smaller than the
output buffer and thus not zeroing out everything. Use the size of the
output buffer (needed) instead.
2012-06-29 13:11:43 +02:00
Anthony Ferrara
34ab5650bc
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)
2012-06-28 20:36:21 -04:00
Anthony Ferrara
7e8276ca68
Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)
...
Fixed a memory allocation bug in crypt() SHA256/512 that can
cause segmentation faults when passed in salts with a null byte
early.
2012-06-28 20:00:03 -04:00
Moriyoshi Koizumi
91e1df704e
Fix bug #62373 (serialize() generates wrong reference to the object)
2012-06-25 19:14:19 +09:00
Moriyoshi Koizumi
e427182279
Fix bug #62373 (serialize() generates wrong reference to the object)
2012-06-25 19:13:23 +09:00
Nikita Popov
ad641950b3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix memory allocation checks for base64 encode
2012-06-24 23:56:55 +02:00
Nikita Popov
5b3f4d25ea
Fix memory allocation checks for base64 encode
...
base64_encode used safe_emalloc, but one of the arguments was derived from a
multiplication, thus making the allocation unsafe again.
There was a size check in place, but it was off by a factor of two as it
didn't account for the signedness of the integer type.
The unsafe allocation is not exploitable, but still causes funny behavior
when the sized overflows into a negative number.
To fix the issue the *4 factor is moved into the size argument (where it is
known to be safe), so safe_emalloc can carry out the multiplication.
The size check is removed as it doesn't really make sense once safe_emalloc
works correctly. (Would only cause base64_encode to silently return false
instead of throwing an error. Also could cause problems with other uses of
the base64 encoding API, which all don't check for a NULL return value.)
Furthermore the (length + 2) < 0 check is replaced with just length < 0.
Allowing lengths -2 and -1 doesn't make sense semantically and also is not
honored in the following code (negative length would access unallocated
memory.)
Actually the length < 0 check doesn't make sense altogether, but I left it
there just to be safe.
2012-06-24 23:32:50 +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
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
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
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
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
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
72c7cfe6f2
Fixed bug #62140 ext\standard\tests\file\tempnam_variation7-win32.phpt fails
2012-05-24 13:58:42 +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
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
df2a38e7f8
fd fix
2012-05-15 22:35:43 -07:00
zoe slattery
63401268db
Changes to remaining two tests, #62022
2012-05-15 14:39:51 +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
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
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
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
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
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
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
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
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
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
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
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
Rui Hirokawa
882dca647a
MFH: fixed a mistake on reverting my previous patch.
2012-04-09 23:49:18 +09: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
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
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
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
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
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
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
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
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
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
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
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
Pierrick Charron
d102030b00
Fixed memory leak in substr_replace
2012-03-01 15:10:29 +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
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
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
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
David Soria Parra
dd14c92499
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
33125e2312
Improved fix for #61058 , and add test script
2012-02-12 05:32:24 +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
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
Dmitry Stogov
ca77173afb
Fixed incorrect type cast
2012-01-11 15:04:14 +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
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +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
Pierre Joye
b02c751074
- 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
1a7f05705f
- skip on win
2011-12-12 13:34:21 +00:00