8199278ffb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
Fix Bug #68536 Pack for 64bits integer is broken on bigendian.
2014-12-02 08:41:35 +01:00
6f3714a8fc
Fix Bug #68536 Pack for 64bits integer is broken on bigendian.
...
Covered by ext/standard/tests/strings/pack64.phpt
2014-12-02 08:38:39 +01:00
9aabfeb6c4
fix string is optional, set default length, thanks laruence
2014-12-02 07:41:35 +01:00
67fc5d6bbb
Fix type of string length in zpp call
...
Fix 23 failed tests (detected on bigendian)
2014-12-02 07:06:10 +01:00
6ae09ddf49
Merge branch 'PHP-5.6'
...
* PHP-5.6:
one more refix to the test
2014-12-01 19:10:44 +01:00
c45fcfd063
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
one more refix to the test
2014-12-01 19:10:18 +01:00
a0c03a3ec5
one more refix to the test
2014-12-01 19:09:39 +01:00
65ad2aadea
cleanup uneeded cast
2014-12-01 19:06:16 +01:00
1b8b384b11
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix dir separator in test
2014-12-01 18:56:14 +01:00
fe4a5abf30
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in test
2014-12-01 18:55:52 +01:00
b6d624e54e
fix dir separator in test
2014-12-01 18:55:20 +01:00
4d16ca0beb
Fix type of string lengths.
...
Those values are used in various call (including zpp) where
a size_t is expected.
This fix 82 failed test on ppc64
(bigendian is perfect to detect stack issue)
2014-12-01 16:10:44 +01:00
7ccd7b5975
Added more useful warning messages
2014-11-30 22:42:31 -08:00
0109eb07cf
Changed based on comments and make its behaviour equal to the Windows version
2014-11-30 22:42:31 -08:00
f2b7aeda2b
Fix #53092 - dns_get_record does not return false on dns server failure
2014-11-30 22:42:31 -08:00
bfe7c6988f
Added more useful warning messages
2014-11-30 22:42:13 -08:00
904dca6392
Changed based on comments and make its behaviour equal to the Windows version
2014-11-30 22:42:13 -08:00
d037785165
Fix #53092 - dns_get_record does not return false on dns server failure
2014-11-30 22:42:13 -08: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
8b2a8c46b0
Merge branch 'pull-request/728'
...
* pull-request/728:
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
Conflicts:
ext/curl/multi.c
2014-11-30 22:22:15 -08:00
e0b6e5222b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
2014-11-30 22:22:01 -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
85bada10c1
fix ZTS
2014-11-30 21:50:29 -08:00
bfc8d297be
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update news
update news
update NEWS
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
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
Conflicts:
ext/standard/crypt.c
2014-11-30 21:47:40 -08:00
720ba67948
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update news
update news
update NEWS
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
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:39:49 -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
4675b79e65
Conflicts:
...
ext/date/php_date.c
2014-11-30 20:49:18 -08:00
9924a08558
Merge branch 'pull-request/878'
...
* pull-request/878:
#68268 : DatePeriod: Getter for start date, end date and interval
2014-11-30 20:37:37 -08:00
cd55c19695
Merge branch 'pull-request/877'
...
* pull-request/877:
gmp_random_seed()
2014-11-30 20:28:25 -08:00
c64949626d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Adds test cases for openssl EC improvements
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
Fixes memory leak introduced in 2b9af967
2014-11-30 18:32:56 -08:00
25e3e78016
Merge branch 'pull-request/916'
...
* pull-request/916:
Adds test cases for openssl EC improvements
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
2014-11-30 18:27:37 -08:00
de65eaa8c8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixes memory leak introduced in 2b9af967
2014-11-30 18:26:39 -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
8c08124c0e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Adds test cases for openssl EC improvements
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
2014-11-30 18:24:23 -08:00
6048ac32b4
Adds test cases for openssl EC improvements
2014-11-30 18:17:48 -08:00
5d1cc7d135
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
...
When working with elliptic curve and openssl some functions are not
aware of the different handling.
Improvements:
- Fixes export of EC private keys
- Adds curve information to openssl_pkey_get_details
Conflicts:
ext/openssl/openssl.c
2014-11-30 18:02:55 -08:00
b564e7b0de
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Update NEWS
fix typo
Added test and review suggestion
Fix bug #68335 : rmdir doesnt work with file:// stream wrapper
2014-11-30 17:35:11 -08:00
aae5d4d9db
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
fix typo
2014-11-30 17:34:51 -08:00
977974f95f
fix typo
2014-11-30 17:09:53 -08:00
60d5b2ec24
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added test and review suggestion
Fix bug #68335 : rmdir doesnt work with file:// stream wrapper
2014-11-30 17:07:02 -08:00
04808aa7e1
Added test and review suggestion
2014-11-30 16:38:20 -08:00
fff70770dd
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix tests for systems with no de_DE locales
2014-11-30 16:13:14 -08:00
f6aa6324fb
fix tests for systems with no de_DE locales
2014-11-30 16:12:56 -08:00
8779578354
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS
Updated NEWS
Fix #60509 , pcntl_signal doesn't decrease ref-count of old handler
2014-11-29 14:42:07 +01:00
736279239e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fix #60509 , pcntl_signal doesn't decrease ref-count of old handler
2014-11-29 14:41:06 +01:00
19b5bc8ce2
Fix #60509 , pcntl_signal doesn't decrease ref-count of old handler
2014-11-29 14:39:19 +01:00
2faf448982
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS
Updated NEWS
SPL: Fix for bug 66405 RecursiveDirectoryIterator with CURRENT_AS_PATHNAME
Conflicts:
ext/spl/spl_directory.c
2014-11-29 12:14:37 +01:00
Remi Collet