Anatoliy Belsky
92153dcfe3
Added test for bug #51353 . It'll be skipped by default and must be
...
activated manually.
2012-08-21 13:22:00 +02:00
Lars Strojny
7b6ebd97e7
Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
2012-08-21 10:09:23 +02:00
Lars Strojny
aaa2eee4c0
Bug 62462: adjusting test
2012-08-21 10:09:05 +02:00
Xinchen Hui
c1284f21a7
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-21 15:23:09 +08:00
Reeze Xia
0cdc1f5626
Move test files to tests dir
...
There are 7 files duplicated, so those files was deleted
2012-08-21 14:32:39 +08:00
Xinchen Hui
8722173ad5
Implemented FR #62840 (Add sort flag to ArrayObject::ksort)
2012-08-21 13:32:15 +08:00
Lars Strojny
c54d73d54c
Bug 62462: Prevent multibyte characters from being split between the lines
...
Merged from https://github.com/php/php-src/pull/120
2012-08-20 23:46:50 +02:00
Xinchen Hui
cc5631eca3
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-20 23:44:21 +08:00
Popa Adrian Marius
b9a050100c
skip test for bug 43130 on firebird , not relevant
2012-08-20 16:56:37 +03:00
Andrew Faulds
4ec29b945c
relative-scheme
2012-08-19 22:16:07 -07:00
Andrew Faulds
36b88d77f2
bug #62844 ; relative URL schemes in parse_url()
2012-08-19 22:15:58 -07:00
Felipe Pena
13768f8650
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 15:09:18 -03:00
Felipe Pena
f4054afe40
- Value stored to var is never used
2012-08-19 15:09:14 -03:00
Felipe Pena
d6e6db4501
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 14:50:52 -03:00
Felipe Pena
3dd256a67b
- Value stored to var is never used
2012-08-19 14:50:49 -03:00
Felipe Pena
9d8d84ebdf
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 14:34:42 -03:00
Felipe Pena
50ab6c63a7
- Value stored to var is never used
2012-08-19 14:34:38 -03:00
Felipe Pena
2497bb97e7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 12:55:43 -03:00
Felipe Pena
6cd0e446dd
- Value stored to var is never used
2012-08-19 12:55:38 -03:00
Felipe Pena
6513ca85c2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never read
2012-08-19 12:13:59 -03:00
Felipe Pena
dc1138b102
- Value stored to var is never read
2012-08-19 12:13:48 -03:00
Xinchen Hui
8693bae624
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-19 18:33:37 +08:00
Reeze Xia
46a3f25772
Fixed bug #62852 (Unserialize invalid DateTime causes crash)
2012-08-19 17:57:45 +08:00
Anatoliy Belsky
15e31d5720
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
More intl tests extracted from symfony
2012-08-17 20:31:00 +02:00
Matt Ficken
1a23d42909
More intl tests extracted from symfony
2012-08-17 20:29:08 +02:00
Xinchen Hui
0b23da1c74
Fixed bug #62836 (Seg fault or broken object references on unserialize())
2012-08-17 18:28:32 +08:00
Pierrick Charron
8ac61a3e60
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62839
2012-08-16 14:50:06 -04:00
Pierrick Charron
9cf0139460
Fixed bug #62839
...
curl_copy_handle segfault with CURLOPT_FILE. The refcount was incremented
before the assignement.
2012-08-16 14:48:44 -04:00
Antony Dovgal
b5494c5f17
Merge commit '8649e42' into PHP-5.4
...
* commit '8649e42':
Fixed bug #62838
2012-08-16 14:34:32 +04:00
Antony Dovgal
8649e4236b
Fixed bug #62838
...
enchant_dict_quick_check() destroys zval, but fails to initialize it
2012-08-16 14:32:55 +04:00
Christopher Jones
c9265b1acd
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix skipifs
2012-08-14 14:13:03 -07:00
Christopher Jones
6524a530df
Fix skipifs
...
Skipifs were referencing an unset variable
2012-08-14 14:10:20 -07:00
Christopher Jones
2b934dfdf9
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Small test tidy up
2012-08-14 11:45:24 -07:00
Christopher Jones
8c3bf96022
Small test tidy up
...
Make some test changes so the tests can be run with the CLI webserver
2012-08-14 11:41:36 -07:00
Xinchen Hui
1a527397cc
better fix & this test pass now
2012-08-15 01:25:31 +08:00
Xinchen Hui
8848778a59
Merge fix e7535e06e6
to 5.3
...
thanks for reeze.xia@gmail.com notice this
2012-08-15 01:06:10 +08:00
Xinchen Hui
a5a409ebff
Fixed bug (segfault due to retval is not initialized)
2012-08-15 00:44:47 +08:00
Xinchen Hui
9be55beb91
Attempt to fix segfault due to retval is not initialized
2012-08-15 00:31:57 +08:00
Xinchen Hui
b2fe342d04
improve the fix
2012-08-15 00:25:06 +08:00
Xinchen Hui
da3660a4c4
Fixed bug (segfault due to PS(mod_user_implemented) not be reseted when closing handler call exit)
2012-08-15 00:15:34 +08:00
Nikita Popov
49e91151c0
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-14 17:37:10 +02:00
Nikita Popov
e1c610fb44
Fix exif test failure
...
There are two slightly different error messages for invalid pointers, so
make the pattern slightly less strict to account for both.
2012-08-14 17:33:38 +02:00
Xinchen Hui
8091256948
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-14 14:03:05 +08:00
Xinchen Hui
da14cdd6f3
Merge branch 'skip-memory-exhaust-tests' of https://github.com/reeze/php-src into PHP-5.3
2012-08-14 13:58:15 +08:00
Nikita Popov
f19351b503
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-13 22:06:18 +02:00
Nikita Popov
7aed239050
Ask for less random data in mcrypt_create_iv
...
Otherwise the RNG blocks and the test takes a lot of time to run (and
occasionally fails).
2012-08-13 22:01:19 +02:00
Nikita Popov
9bc1af1e58
Rename mcrypt_cbf -> mcrypt_cfb
...
Also fix ECB -> CFB in the initialization vector size call (not that it
makes a difference, they have the same size).
2012-08-13 22:01:03 +02:00
Xinchen Hui
212cfb95d1
more test script for #62328
2012-08-13 11:03:35 +08:00
Xinchen Hui
dda0565b53
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-12 20:58:45 +08:00
Xinchen Hui
4970926e45
Fixed bug #62763 (register_shutdown_function and extending class)
2012-08-12 20:58:09 +08:00
Xinchen Hui
7b307fb930
Fixed bug #62328 (implementing __toString and a cast to string fails)
...
__toString should has a high priority
2012-08-12 11:50:28 +08:00
Reeze Xia
0239437903
Skip tests reply on Zend MM turned on
...
Those two tests have expect memory exhausted fatal error
2012-08-11 00:34:37 +08:00
Xinchen Hui
5ae7540abd
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-11 00:24:12 +08:00
Xinchen Hui
7130887719
Fix test, from PR 158
2012-08-11 00:22:52 +08:00
Rob Richards
c5a611b257
Merge branch 'PHP-5.3' into PHP-5.4
...
# By Daniel Veillard
* PHP-5.3:
Update to work with libxml 2.9.0
2012-08-09 14:24:50 -04:00
Daniel Veillard
c4b26cc1b0
Update to work with libxml 2.9.0
2012-08-09 14:02:33 -04:00
Stanislav Malyshev
c98a51a169
Merge branch 'bug40459' into PHP-5.4
...
* bug40459:
News for bug#40459
fix bug #40459 - make all stream funcs that create object call ctor
2012-08-09 00:10:31 -07:00
Stanislav Malyshev
4db70fd406
fix bug #40459 - make all stream funcs that create object call ctor
2012-08-07 22:59:12 -07:00
Anatoliy Belsky
55b82abe00
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Added the intl tests extracted from Symfony. These are making the intl ext crash with ICU at least 4.6, but probably with earlier versions too.
2012-08-06 14:12:04 +02:00
Matt Ficken
ed793b2a3f
Added the intl tests extracted from Symfony. These are making the intl ext crash with ICU at least 4.6, but probably with earlier versions too.
2012-08-06 14:07:42 +02:00
Derick Rethans
de59314a60
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-06 12:59:39 +01:00
Derick Rethans
0a2833bbef
- Updated to version 2012.5 (2012e)
2012-08-06 12:59:38 +01:00
Lonny Kapelushnik
45f3322905
var_export outputs an E_WARNING when recursion is detected
2012-08-05 20:56:06 -07:00
Brett Bieber
82bc8821f9
Minor spelling corrections
2012-08-05 20:43:22 -07:00
Xinchen Hui
228c288686
Fix 126 tests failed of phar when --enable-zend-multibyte
2012-08-05 12:40:59 +08:00
Xinchen Hui
170ee90bf9
Fixed bug that can not get default value of parameter if it's not optional
2012-08-02 22:28:04 +08:00
Xinchen Hui
49b202f2cf
Fixed bug that can not get default value of parameter if it's not optional
2012-08-02 22:16:46 +08:00
Xinchen Hui
cbf1db38f7
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-02 19:33:27 +08:00
Xinchen Hui
2b6ac9e1a0
Fix test, wrong exepct rule used
2012-08-02 19:31:34 +08:00
Xinchen Hui
6fb9a6922d
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/standard/tests/file/realpath_cache.phpt
2012-08-02 19:23:04 +08:00
Xinchen Hui
9a690859f6
fix test due to float value
2012-08-02 19:14:06 +08:00
Xinchen Hui
53c8612fe7
Fixed bug #62685 (Wrong return datatype in PDO::inTransaction())
2012-08-02 12:55:05 +08:00
Xinchen Hui
cd896d69d9
Fixed bug #62685 (Wrong return datatype in PDO::inTransaction())
2012-08-02 12:52:11 +08:00
Xinchen Hui
2026e9040f
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-01 20:24:14 +08:00
Xinchen Hui
10642aa9e4
Fixed bug #62715 (ReflectionParameter::isDefaultValueAvailable() wrong result)
2012-08-01 20:23:30 +08:00
Stanislav Malyshev
4d6bae896d
skip tests if ibase not present
2012-07-31 21:45:04 -07:00
Gustavo André dos Santos Lopes
86ca788cc7
Fix test title and limit it to ICU >= 4.8
2012-07-30 11:04:10 +02:00
Gustavo André dos Santos Lopes
f8e693248f
Remove executable bit from files
2012-07-30 10:32:27 +02:00
Gustavo André dos Santos Lopes
dec7bad635
Merge branch '5.3' into 5.4
...
* 5.3:
Limit test to ICU 49
Remove executable bit from files
2012-07-30 10:31:10 +02:00
Gustavo André dos Santos Lopes
7e3e1837c8
Limit test to ICU 49
2012-07-30 10:27:41 +02:00
Gustavo André dos Santos Lopes
9762609cec
Remove executable bit from files
2012-07-30 10:25:17 +02:00
Xinchen Hui
e0c014dead
Merge branch 'PHP-5.3' into PHP-5.4
2012-07-29 14:31:04 +08:00
Xinchen Hui
f419d614ba
Sike test while there is no zend mm max_size guard
2012-07-29 14:30:01 +08:00
Xinchen Hui
c6ad98975e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Skip test while zend mm is disabled
2012-07-29 13:26:05 +08:00
Xinchen Hui
880a6cee00
Skip test while zend mm is disabled
2012-07-29 13:25:31 +08:00
Felipe Pena
b26749b4e9
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu
2012-07-28 19:05:46 -03:00
Felipe Pena
068fc008c6
- Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu
2012-07-28 19:05:13 -03:00
Felipe Pena
54cba5aa91
- Fixed ZTS build
2012-07-24 10:02:32 -03:00
Florian Anderiasch
ddc8d16245
Add syslog support to mail.log #62356
...
Patch by Michael Orlitzky
2012-07-24 14:31:30 +02:00
Xinchen Hui
9fe8c58130
binary compatibility
2012-07-24 14:45:13 +08:00
Xinchen Hui
4c1e2bbd6f
Re-fix bug #55544
2012-07-24 14:43:53 +08:00
Xinchen Hui
2abc4c2f6f
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2012-07-24 13:38:11 +08:00
Xinchen Hui
c20b2ab0bd
folders
2012-07-24 13:37:44 +08:00
Gustavo André dos Santos Lopes
f3f824823d
Duplicate test for ICU 49
...
The output in ICU < 49 actually seems wrong here; ICU 49 seems to
fix the data.
2012-07-23 02:08:12 +02:00
Xinchen Hui
777b6679a4
missed the test script
2012-07-21 23:30:32 +08:00
Xinchen Hui
ead076bac6
Fix test failed
2012-07-21 23:27:09 +08:00
Xinchen Hui
cc30524c89
Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
2012-07-21 23:26:18 +08:00
Xinchen Hui
0c996613c0
Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
2012-07-21 22:45:16 +08:00
Xinchen Hui
a6f1533789
Fixed bug #55544 (ob_gzhandler always conflicts with zlib.output_compression)
2012-07-21 02:57:36 +08:00
Xinchen Hui
683b4f7a2b
merge 9eb5cb6571
to 5.3
2012-07-21 00:46:32 +08:00
Derick Rethans
ceee821d73
Merge branch 'PHP-5.3' into PHP-5.4
2012-07-20 10:07:24 +01:00
Derick Rethans
d621a91a50
- Updated to version 2012.4 (2012d)
2012-07-20 10:07:23 +01: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
Xinchen Hui
25be12a3bc
Fixed bug #62594 (segfault in mysqlnd_res_meta::set_mode)
2012-07-18 19:06:27 +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
Anatoliy Belsky
bd39495332
Fix for bug #62379 was missing in 5.3
2012-07-17 17:50:05 +02:00
Xinchen Hui
c8f285d190
Update libmagic.patch
2012-07-15 18:25:58 +08:00
Stanislav Malyshev
f4809424cd
Merge branch 'pull-request/96' into PHP-5.4
...
* pull-request/96:
Implemented FR #61602 Allow access to name of constant used as default value
2012-07-14 23:08:50 -07:00
Stanislav Malyshev
a5d45bae85
Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end)
2012-07-14 22:34:28 -07: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
donnut
53ba768ed8
removed unneccesary arrat and ini settings
2012-07-14 19:22:03 -07:00
donnut
4539d799bb
addition SplFileObject tests
2012-07-14 19:21:50 -07:00
donnut
2cb7a678a1
new tests from PHP TestFest June 2012
2012-07-14 19:21:34 -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
Stanislav Malyshev
1916bb223e
Merge branch 'pull-request/91' into PHP-5.4
...
* pull-request/91:
Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-07-14 18:52:24 -07:00
Felipe Pena
d640e446ab
- Fixed conflict
2012-07-14 13:16:35 -03:00
Felipe Pena
864575251a
- Fixed memory leak when extending DOMXPath
2012-07-14 13:13:31 -03:00
Felipe Pena
0bff7cfadd
- Fixed bug #62565 (Crashes due non-initialized internal properties_table)
2012-07-14 12:16:16 -03:00
Felipe Pena
8b093dee21
- Fixed bug #62564 (Extending MessageFormatter and adding property causes crash)
2012-07-14 11:37:08 -03:00
Matt Ficken
10251b20c3
Fixed bug #62379 failing ODBC long column functionality
2012-07-13 15:34:00 +02:00
Anatoliy Belsky
d9d21b2037
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
2012-07-13 11:46:14 +02:00
Anatoliy Belsky
02b8362ec2
Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
...
The test is known to fail on windows with zlib version < 1.2.7 (current dep is 1.2.5),
with 1.2.7 it works. As it's primarily a zlib 1.2.5 issue on windows, skip it for now.
2012-07-13 11:39:57 +02:00
Anatoliy Belsky
cf91b163e1
fixed the test for warnings changed
2012-07-12 18:24:38 +02:00
Anatoliy Belsky
86428169d3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
reverted changes for #62477
2012-07-12 10:57:26 +02:00
Anatoliy Belsky
ad7eeba3c1
reverted changes for #62477
2012-07-12 10:54:14 +02:00
Anatoliy Belsky
40f8010a13
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62477 LimitIterator int overflow
2012-07-11 22:29:45 +02:00
Anatoliy Belsky
b383ddf1e5
Fixed bug #62477 LimitIterator int overflow
2012-07-11 22:25:31 +02:00
Xinchen Hui
bcf5853eaa
Fixed Bug #62500 (Segfault in DateInterval class when extended)
2012-07-10 18:43:11 +08:00
Anatoliy Belsky
97b8798520
Fixed test bug #62312 (warnings changed one more time)
2012-07-09 18:21:51 +02:00
andrey
66e1ac23c1
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
2012-07-09 17:59:42 +03:00
andrey
555db7dc4e
fix valgrind warning
2012-07-09 17:59:23 +03:00
Anatoliy Belsky
2032470e41
fixed #62433 test for win
2012-07-09 12:42:10 +02:00
Xinchen Hui
0398cc22a9
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
appease MSVC (doesnt like unary minus of unsigned ints)
Conflicts:
ext/curl/interface.c
2012-07-09 08:38:03 +08:00
Xinchen Hui
c819cf9d6b
Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
...
this bc break is caused by the fix for #61948
2012-07-09 08:32:40 +08:00
Xinchen Hui
e3b9b1e6dc
Fixed Bug #62500 (Segfault in DateInterval class when extended)
...
This fix also fixed bug #62508 (Segfault while access a non-string
property of DateInterval object)
2012-07-09 00:25:48 +08:00
Stanislav Malyshev
a213c10ef2
Merge branch 'pull-request/112' into PHP-5.4
...
* pull-request/112:
Added in NEWS and UPGRADING for feature 55218
Adding in test for feature 55218
Implements feature 55218
2012-07-07 12:51:26 -07: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
johannes
bcc87ba68e
Revert change 3f3ad30c50
: There shouldn't be new features in 5.3, especially
...
not if they aren't in 5.4, too.
2012-07-05 00:55:47 +02:00
Xinchen Hui
be4053cea0
Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to dot files).
2012-07-02 11:33:38 +08:00
Nikita Popov
b7903f9778
Revert JSON merges to 5.4
...
This reverts the following merge commits (-m 1):
405ebfcd18
d372b33c9b
36fa17a5fa
2012-07-01 16:38:26 +02:00
Nikita Popov
250393f925
Revert JSON changes to PHP 5.3
...
This reverts the following commits:
974324676b
4662151ea7
84fe2cc890
This does not revert the JSON changes released in PHP 5.3.14.
2012-07-01 16:28:57 +02:00
Stanislav Malyshev
b741d3315b
fix bug #61359 : json_encode() calls too many reallocs
2012-06-30 19:14:30 -07:00
Marc Easen
896ac689c9
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 16:54:03 -07:00
andrey
ed1f058591
merge
2012-06-29 16:32:55 +03:00
andrey
b7dbcbd41f
Merge branch 'PHP-5.3' into PHP-5.4
2012-06-29 14:48:37 +03:00
andrey
8fe87e7fea
fix Bug #62273 Segmentation Fault in Mysqli/Mysqlnd
2012-06-29 14:42:36 +03:00
andrey
a19d5c520c
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
2012-06-29 14:41:01 +03:00
andrey
1ac611f24f
Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3
2012-06-29 14:40:41 +03: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
andrey
08f4b3c3ac
Merge branch 'PHP-5.3' into PHP-5.4
2012-06-29 12:43:14 +03:00
andrey
f826ea093f
new charsets
2012-06-29 12:42:54 +03: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
Nikita Popov
405ebfcd18
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Add json_last_error_msg() function
2012-06-28 20:18:19 +02:00
Nikita Popov
974324676b
Add json_last_error_msg() function
...
This replaces json_last_error(true) and is consistent with other custom
error handling functions.
2012-06-28 20:11:27 +02:00
Johannes Schlüter
b025b9d0cf
Fix #62432 ReflectionMethod random corrupt memory on high concurrent
...
This fixes the same issue in multiple extensions. This isn't needed
in later branches as 5.4 introduced object_properties_init()
2012-06-27 23:26:33 +02:00
Nikita Popov
d372b33c9b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Improve JSON error handling
Conflicts:
ext/json/tests/bug54058.phpt
ext/json/tests/bug61537.phpt
2012-06-27 12:28:55 +02:00
Nikita Popov
4662151ea7
Improve JSON error handling
...
json_encode() no longer throws warnings. Instead only the error code for
json_last_error() is set.
As it is hard to debug the error from just an error code an optional
$as_string parameter was added to json_last_error(), which returns an
error message instead of an error code.
2012-06-27 12:21:48 +02: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
Nikita Popov
36fa17a5fa
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Improve json_encode error handling
- BFN
Conflicts:
ext/json/json.c
2012-06-23 21:14:45 +02:00
Nikita Popov
84fe2cc890
Improve json_encode error handling
...
json_encode() now returns bool(false) for all possible errors, throws the
respective warning and also sets the respective json_last_error() error
code. Three new error codes have been added:
* JSON_ERROR_RECURSION
* JSON_ERROR_INF_OR_NAN
* JSON_ERROR_UNSUPPORTED_TYPE
To get a partial JSON output instead of bool(false) the option
JSON_PARTIAL_OUTPUT_ON_ERROR can be specified. In this case the invalid
segments will be replaced either by null (for recursion, unsupported type
and invalid JSON) or 0 (for Inf and NaN).
The warning for invalid UTF-8 stays intact and is thrown also with
display_errors = On. If this behavior is undesired this can be remedied
later.
2012-06-23 20:51:52 +02:00
Felipe Pena
5e36306feb
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Improved fix for #62384
2012-06-23 15:16:13 -03:00
Felipe Pena
c3f34796a0
- Improved fix for #62384
2012-06-23 15:10:47 -03: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
Felipe Pena
4af92aca87
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #62384 (Attempting to invoke a Closure more than once causes segfaul)
2012-06-22 12:05:55 -03:00
Felipe Pena
b8e946b02e
- Fixed bug #62384 (Attempting to invoke a Closure more than once causes segfaul)
2012-06-22 12:05:29 -03:00
Johannes Schlüter
af516750ff
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Improve check for :memory: pseudo-filename in SQlite
Conflicts:
ext/sqlite3/sqlite3.c
2012-06-22 12:50:30 +02:00
Johannes Schlüter
055ecbc628
Improve check for :memory: pseudo-filename in SQlite
2012-06-22 12:48:39 +02:00
Lonny Kapelushnik
2178b1d02d
Adding in test for feature 55218
2012-06-21 23:21:17 -04:00
Lonny Kapelushnik
f1ef8b327f
Implements feature 55218
...
Allows you to recursively check namespaces under a child node
instead of from the root of the XML doc
2012-06-21 22:34:46 -04:00
Johannes Schlüter
041dd77135
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Remove outdated and user-specific files
2012-06-20 19:47:44 +02:00
Johannes Schlüter
d93892de7a
Remove outdated and user-specific files
2012-06-20 19:46:32 +02:00
Nikita Popov
fed1f2d124
Fixed bug RecursiveArrayIterator does not implement Countable
...
ArrayIterator implemented Countable only after it was already inherited by
RecursiveArrayIterator. Thus the interface was missing in RAI.
2012-06-19 18:32:44 +02:00
Nikita Popov
cce4764f13
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug RecursiveArrayIterator does not implement Countable
Conflicts:
ext/spl/spl_array.c
2012-06-19 18:08:22 +02:00
Nikita Popov
4cba4c6193
Fixed bug RecursiveArrayIterator does not implement Countable
...
ArrayIterator implemented Countable only after it was already inherited by
RecursiveArrayIterator. Thus the interface was missing in RAI.
2012-06-19 18:04:14 +02:00
Anatoliy Belsky
34bd1c941b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
sync zip ext version with pecl
2012-06-19 17:17:11 +02:00
Anatoliy Belsky
e793539678
sync zip ext version with pecl
2012-06-19 17:15:56 +02:00
Anatoliy Belsky
0a65b661e4
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
split gzgetc_basic.phpt for zlib 1.2.7
2012-06-19 14:12:54 +02:00
Anatoliy Belsky
a8948d0808
split gzgetc_basic.phpt for zlib 1.2.7
2012-06-19 14:08:34 +02:00
Anatoliy Belsky
c56ff2bf75
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Reverted the BC fix regarding to #57905 , test adopted
2012-06-17 16:10:56 +02:00
Anatoliy Belsky
d3780f1f90
Reverted the BC fix regarding to #57905 , test adopted
...
New 0.10.1 has a stronger archive integrity check. Restoring
the old behaviour of libzip < 0.10.1 makes no sense at this
place.
2012-06-17 16:04:36 +02:00
Anatoliy Belsky
280e3a4ec8
Fixed bug #62312 ext\sockets\tests\socket_import_stream-4.phpt fails
2012-06-14 18:02:53 +02:00
Anatoliy Belsky
3faebe2bec
Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32
2012-06-14 17:59:39 +02:00
Stanislav Malyshev
c7be96b08f
Revert "Add PBKDF2 support via openssl()"
...
This reverts commit b5b8ea1050
.
Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
2012-06-12 11:22:49 -07:00
Stanislav Malyshev
a2bfad051d
Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell."
...
This reverts commit bccd1e672f
.
Looks like we don't have agreement yet on this for 5.4. Let's keep it in 5.5 for now.
2012-06-12 11:21:54 -07:00
Scott MacVicar
bccd1e672f
Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell.
...
Summary:
Stas pointed out that this is named pretty poorly. Go for openssl_pbkdf2()
2012-06-11 15:41:41 -07:00
Scott MacVicar
b5b8ea1050
Add PBKDF2 support via openssl()
...
Summary:
No easy way to put these in the hash extension since we don't really support optional
parameters to certain algorithms. Implemented in openssl for now since it has it already
and is pretty stable.
Only SHA1 is confirmed to work as an algorithm but openssl has a parameter so it can be
changed in the future.
Will backport to 5.4 potentially with Stas' approval.
Test Plan:
Ran newly added tests which came from RFC 6070
2012-06-11 13:35:25 -07:00
Matt Ficken
a18cede1c5
Fix bug #62271 test bug - ext/wddx/tests/bug48562.phpt
2012-06-11 17:00:36 +02:00
David Soria Parra
b9babd22e0
Merge branch 'PHP-5.3' into PHP-5.4
...
By Stanislav Malyshev (1) and michelangelo (1)
* PHP-5.3:
Adding a test for ext/posix/tests/posix_getegid_basic.phpt
typo
2012-06-10 17:08:02 +04:00
michelangelo
cda14b995c
Adding a test for ext/posix/tests/posix_getegid_basic.phpt
2012-06-10 17:07:49 +04:00
Gustavo André dos Santos Lopes
503358c179
Fix bug #62266
...
Custom extension segfaults during xmlParseFile with FPM SAPI
because the regular list is not prepared during the MINIT phase
and our custom external entity loader tries to open PHP streams.
2012-06-09 17:29:47 +01:00
Anatoliy Belsky
d24d5b62c1
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
set current versions for libzip and zip ext
2012-06-07 22:37:32 +02:00
Anatoliy Belsky
baacc2cb13
set current versions for libzip and zip ext
2012-06-07 22:32:03 +02:00
Anatoliy Belsky
5ebdc46aa0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
zip windows fixes
fixed bc break related to #57905
fixed a bit overlooked from the last libzip port
brought the fix for #47667 back
fixed zip entry freeing
rechecked the merged libzip, took also the indents from the original to avoid confusion next time
fixed a double freeing crash
fixed header include
initial libzip upgrade patch to 0.10.1
- BFN
Conflicts:
NEWS
2012-06-07 21:06:31 +02:00
Anatoliy Belsky
bde0e8c2a1
zip windows fixes
2012-06-07 21:01:32 +02:00
Anatoliy Belsky
8ca457f64d
fixed bc break related to #57905
2012-06-07 21:01:32 +02:00
Anatoliy Belsky
e883892664
fixed a bit overlooked from the last libzip port
2012-06-07 21:01:32 +02:00
Anatoliy Belsky
b8cdc731b8
brought the fix for #47667 back
2012-06-07 21:01:32 +02:00
Anatoliy Belsky
a37e84e549
fixed zip entry freeing
2012-06-07 21:01:32 +02:00
Anatoliy Belsky
f4a44f18b8
rechecked the merged libzip, took also the indents from the original to
...
avoid confusion next time
2012-06-07 21:01:31 +02:00
Anatoliy Belsky
a39bcfc5ee
fixed a double freeing crash
2012-06-07 21:01:31 +02:00
Anatoliy Belsky
9a2365412e
fixed header include
2012-06-07 21:01:31 +02:00
Anatoliy Belsky
335a11b14b
initial libzip upgrade patch to 0.10.1
2012-06-07 21:01:31 +02:00
Felipe Pena
018a9b321f
Merge commit '15213768e6cc098ab4e53cacc3b5eb86fa85284a' into PHP-5.3
2012-06-07 14:18:34 -03: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
83542dcf3b
Merge branch 'PHP-5.3' into PHP-5.4
...
By Gustavo André dos Santos Lopes (4) and others
via Felipe Pena (1) and Xinchen Hui (1)
* PHP-5.3:
Remove unused codes
based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe.
Fix ext/intl build on ICU < 4.8
Optimization in ext/intl/msgformat
Fixed tests in ext/intl
Changed XFAILed collator_get_sort_key.phpt
2012-06-07 14:32:47 +08:00
Gustavo André dos Santos Lopes
c1ac325228
Fix ext/intl build on ICU < 4.8
2012-06-06 12:10:00 +02:00
Gustavo André dos Santos Lopes
52d541a314
Optimization in ext/intl/msgformat
...
Don't transform the string to make it apostrophe friendly in ICU 4.8+
as that it is now the default.
2012-06-06 11:36:00 +02:00
Gustavo André dos Santos Lopes
45b3fa4dee
Fixed tests in ext/intl
...
21 is not a valid value for UNUM_PADDING_POSITION. Changed the test to
use 2 instead.
Remove ICU 4.2- test. No one cares.
2012-06-05 16:47:00 +02:00
Felipe Pena
15213768e6
- Fixed bug #62227 (Invalid phar stream path causes crash)
2012-06-04 20:07:14 -03:00
Gustavo André dos Santos Lopes
9b233b7e5e
Changed XFAILed collator_get_sort_key.phpt
...
Ressurected and limited to ICU 4.8 in the hope that the sort keys
will remain stable in more recent ICU versions. I have only tested
with ICU 4.8 so far.
2012-06-04 10:18:24 +02:00
Felipe Pena
8779a9aad5
Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' into PHP-5.4
2012-06-03 19:01:50 -03:00
Felipe Pena
4fc49c04df
Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' into PHP-5.3
2012-06-03 19:00:49 -03:00
Felipe Pena
e59b6dc0ae
- Fixed information leak in ext exif (discovered by Martin Noga, Matthew "j00ru" Jurczyk, Gynvael Coldwind)
2012-06-03 15:23:07 -03:00
Xinchen Hui
b548d9ad2e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant)
2012-06-01 15:00:02 +08:00
Xinchen Hui
1f5327a602
Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant)
2012-06-01 14:57:27 +08:00
Reeze Xia
13a9555342
Implemented FR #61602 Allow access to name of constant used as default value
...
This is an improved commit for FR #61602 , this fixed the previous
commit 054f3e3's C99 compiler compatibility issue
2012-05-31 23:31:00 +08:00
Stanislav Malyshev
ed6ce83101
fix bug #55042 - erealloc without updating pointer
2012-05-30 22:26:26 -07:00
Johannes Schlüter
428dddd3e8
Fix bug #62186 readline fails to compile
2012-05-31 01:15:22 +02:00
Stanislav Malyshev
fa05f038cb
fix unchecked emalloc
...
(cherry picked from commit 158d8a6b08
)
2012-05-30 21:37:28 +02:00
Stanislav Malyshev
9b98cf7865
fix test
2012-05-29 23:52:47 -07: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
6074da9809
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
updated the libmagic patch after Felipes regex fix
2012-05-29 17:41:57 +02:00
Anatoliy Belsky
8d5e953a19
updated the libmagic patch after Felipes regex fix
2012-05-29 17:38:30 +02:00
Anatoliy Belsky
c0e046a130
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
Bug #62177 deactivate the linux test version on win
Fix bug #62177 Test Bug - finfo_file_regex.phpt
2012-05-29 16:43:20 +02:00
Matt Ficken
ad0371ac7e
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
2012-05-29 16:38:57 +02:00
Matt Ficken
b4b0aaae93
Bug #62177 deactivate the linux test version on win
2012-05-29 16:37:19 +02:00
Matt Ficken
dbc727373c
Fix bug #62177 Test Bug - finfo_file_regex.phpt
2012-05-29 16:31:47 +02:00
Stanislav Malyshev
158d8a6b08
fix unchecked emalloc
2012-05-28 18:54:15 -07:00
Reeze Xia
1d2f619049
Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-05-25 18:55:34 +08: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
86d2fafded
Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
2012-05-25 10:44:59 +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