622a346302
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
2014-12-16 10:17:07 -08:00
b75867fff0
add missing test file
2014-12-16 10:15:17 -08:00
630f9c33c2
Fix bug #68594 - Use after free vulnerability in unserialize()
2014-12-16 10:15:17 -08:00
9c4de388c6
fix perms
2014-12-16 08:37:48 +01:00
f804a3614e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix undefined behaviour in strnatcmp
update NEWS
move the test to the right place
Fixed bug #68545 NULL pointer dereference in unserialize.c
Conflicts:
NEWS
2014-12-13 22:28:45 +00:00
034e6decb3
Fix undefined behaviour in strnatcmp
2014-12-13 22:27:10 +00:00
07b5896a13
Fix bug #68601 buffer read overflow in gd_gif_in.c
2014-12-13 09:03:44 +01:00
9beb3763db
pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary
2014-12-12 18:16:12 +01:00
86f1875536
Fix bug #68532 : convert.base64-encode omits padding bytes
2014-12-12 16:42:38 +01:00
0323f66fa2
move the test to the right place
2014-12-11 10:39:47 -08:00
13f1c276ab
Fixed bug #68545 NULL pointer dereference in unserialize.c
2014-12-11 10:39:37 -08:00
c5f7dcd1dc
move the test to the right place
2014-12-10 13:19:51 +01:00
20d93534d5
Fixed bug #68545 NULL pointer dereference in unserialize.c
2014-12-10 11:43:33 +01:00
5f9a68d3ef
Fixed day_of_week function as it could sometimes return negative values internally.
2014-12-08 11:06:12 +00:00
e6ad29ae96
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed possible read after end of buffer and use after free.
2014-12-08 12:20:01 +03:00
dd791cd717
Fixed possible read after end of buffer and use after free.
2014-12-08 12:18:27 +03:00
5d126245a3
fixed test
2014-12-06 12:31:27 +01:00
9016018ccc
C89 compat
2014-12-06 12:14:17 +01:00
373aa7c81f
add include for missing localeconv_r proto
2014-12-06 12:09:35 +01:00
1b4d5ad46a
Fixed bug #65230 setting locale randomly broken
2014-12-06 11:59:43 +01:00
625b929c6e
Fix compilation error (ref #68424 )
2014-12-06 10:23:56 +01:00
79131b4617
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert unintentional docblock change
2014-12-05 13:57:46 -08:00
0e985d3726
Revert unintentional docblock change
...
Revert unintentional docblock change
It looks like commit dd8e59da8f
2014-12-05 13:57:03 -08:00
4c0bd5e77a
Start adding new attribute to control multi statements
2014-12-05 17:03:31 +01:00
fccd1eda5f
. Fixed bug #68120 Update bundled libsqlite
2014-12-05 15:43:53 +01:00
7943f944c2
Fixed bug #65769 localeconv() broken in TS builds
2014-12-05 11:06:06 +01:00
557026301f
Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
2014-12-05 10:10:10 +01:00
c65143d571
fix dir separators in test
2014-12-05 07:07:58 +01:00
2bcf8a6cd9
Fixed #65213 - cannot cast SplFileInfo to boolean
2014-12-04 07:17:33 +08:00
a0c03a3ec5
one more refix to the test
2014-12-01 19:09:39 +01:00
b6d624e54e
fix dir separator in test
2014-12-01 18:55:20 +01:00
85e2e6c1fd
Added more useful warning messages
2014-11-30 22:39:25 -08:00
977d84490b
Changed based on comments and make its behaviour equal to the Windows version
2014-11-30 22:39:18 -08:00
7b44790db5
Fix #53092 - dns_get_record does not return false on dns server failure
2014-11-30 22:39:09 -08:00
1b4368db77
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
2014-11-30 22:18:22 -08:00
7049d3450e
Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
2014-11-30 22:18:12 -08:00
84be568366
update news
2014-11-30 21:37:39 -08:00
abf5b9481b
Merge branch 'pull-request/868' into PHP-5.5
...
* pull-request/868:
Apply error-code-salt fix to Windows too
Bug fixes in light of failing bcrypt tests
Add tests from 1.3. Add missing tests.
Upgrade crypt_blowfish to version 1.3
2014-11-30 21:09:41 -08:00
7e870c596d
Bug fixes in light of failing bcrypt tests
...
Conflicts:
ext/standard/crypt.c
2014-11-30 21:06:39 -08:00
2d9d10fbbf
Add tests from 1.3. Add missing tests.
...
3 of the missing tests fail. // TODO
2014-11-30 21:05:40 -08:00
29f51e1ca9
Upgrade crypt_blowfish to version 1.3
2014-11-30 21:05:32 -08:00
17094017f7
Merge branch 'pull-request/914' into PHP-5.5
...
* pull-request/914:
Fixes memory leak introduced in 2b9af967
2014-11-30 18:26:17 -08:00
977974f95f
fix typo
2014-11-30 17:09:53 -08:00
04808aa7e1
Added test and review suggestion
2014-11-30 16:38:20 -08:00
19b5bc8ce2
Fix #60509 , pcntl_signal doesn't decrease ref-count of old handler
2014-11-29 14:39:19 +01:00
605d32bedd
SPL: Fix for bug 66405 RecursiveDirectoryIterator with CURRENT_AS_PATHNAME
...
Currently when you use RecursiveDirectoryIterator with the
CURRENT_AS_PATHNAME flag PHP will throw an UnexpectedValueException with
message 'Objects returned by RecursiveIterator::getChildren() must implement
RecursiveIterator'.This happend because getChildren() will return the
current directory name instead of an Iterator (or subclass of) as required
by the RecursiveIterator interface.
This commit changes getChildren() to return annother
RecursiveDirectoryIterator but current() still returns the path name when
CURRENT_AS_PATHNAME is used. A PHPT test case (bug66405.phpt) that
reproduces the bug is included.
This fix was originally against the PHP-5.4 branch, but it was not merged
before 5.4 reached EOL. I am hoping to get it applied to 5.5, 5.6, and
master.
2014-11-29 12:04:44 +01:00
1813fe9f38
Merge branch 'pull-request/656' into PHP-5.5
...
* pull-request/656:
PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
2014-11-29 11:38:57 +01:00
cf2cd8fb20
PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
...
cleanup and PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
2014-11-29 11:38:36 +01:00
42af411620
refactored the mbstring config.w32
2014-11-27 13:37:00 +01:00
3ec8730e89
Fixed bug #68504 --with-libmbfl configure option not present on Windows
2014-11-27 09:14:47 +01:00
Stanislav Malyshev