9047b567e3
Resolve build warnings. Bump ver. Better range check. Fix diffs
2015-08-19 10:42:53 +10:00
4df77a6c58
Fixed bug #70295 (Segmentation fault with setrawcookie)
2015-08-19 01:33:19 +02:00
6a201b3651
Use macros for openssl overflow checks
...
It reduces code duplications
2015-08-18 20:17:04 +01:00
618c327a56
Fix possible overflow in openssl_pbkdf2
...
Especially key_length would lead to the crash if it overflowed
to the negative value.
2015-08-18 19:46:59 +01:00
8acda9cad5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Patch from Rainer Jung to provide Solaris LDAP support
Conflicts:
ext/ldap/ldap.c
2015-08-18 17:26:46 +02:00
40befb943c
Patch from Rainer Jung to provide Solaris LDAP support
2015-08-18 16:52:44 +02:00
dca6d1027a
Fixed bug #70272 (Segfault in pdo_mysql)
2015-08-18 18:33:07 +08:00
d28abb2da2
no need to skip this test if no dictionaries are installed
2015-08-17 21:43:28 +02:00
c3a303d431
Merge branch 'pull-request/1473'
...
* pull-request/1473:
new test for enchant pwl file
2015-08-17 21:42:42 +02:00
3b004baaaa
new test for enchant pwl file
2015-08-17 21:28:37 +02:00
c4a98e876c
Check and use correct signature_len type for EVP_VerifyFinal
2015-08-17 18:43:02 +01:00
07c1b641b5
fixed changed error message in test
2015-08-17 19:33:49 +02:00
61591ea636
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70277 : new DateTimeZone($foo) is ignoring text after null byte
Resolved conflicts:
ext/date/php_date.c
2015-08-17 19:28:46 +02:00
aae9004ebd
Removed dead code
2015-08-17 17:18:25 +02:00
bb057498f7
Fix #70277 : new DateTimeZone($foo) is ignoring text after null byte
...
The DateTimeZone constructors are not binary safe. They're parsing the timezone
as string, but discard the length when calling timezone_initialize(). This
patch adds a tz_len parameter and a respective check to timezone_initialize().
2015-08-17 15:58:37 +02:00
2d475eb943
Fixed tests on 32-bit systems
2015-08-17 12:54:33 +03:00
b010a9d846
Fixed sorting order
...
It needs to match the strcasecmp in parse_tz.c.
2015-08-16 21:27:07 +01:00
cdaf057adb
Updated to version 2015.6 (2015f)
2015-08-16 21:26:12 +01:00
f3abea9f91
Fix some int overflows in openssl
...
There might be more. I just did a quick check for enc/dec, rand
and one BN call.
2015-08-16 15:43:00 +01:00
46101dbec5
fix incompatible types
...
namely between hash_data_type and st_data_t
2015-08-15 12:03:47 +02:00
3689b44453
add SIZEOF_SIZE_T to oniguruma
2015-08-15 11:39:06 +02:00
228eaf5bc4
fix pointer truncation cases
2015-08-15 11:27:07 +02:00
0bd7d7a369
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS for #70157
Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED
2015-08-15 16:49:30 +08:00
0d7159d26d
Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED
2015-08-15 15:10:34 +08:00
c63b505573
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed wrong params in proto
2015-08-15 02:27:09 +02:00
a4e0539188
fixed wrong params in proto
2015-08-15 02:23:56 +02:00
38c19d43c1
fix array size calculation for range, related to bug #70239
2015-08-14 14:34:48 +02:00
86984d7ade
add range() tests
2015-08-14 14:34:48 +02:00
01ee09f3f7
Fixed bug #70239 Creating a huge array doesn't result in exhausted, but segfault
2015-08-14 14:34:47 +02:00
5e93fe3c57
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70266 (DateInterval::__construct.interval_spec is not supposed to be optional)
2015-08-14 14:25:19 +02:00
e66bf11638
Fix #70266 (DateInterval::__construct.interval_spec is not supposed to be optional)
...
The required_num_args argument of ZEND_BEGIN_ARG_INFO_EX() has to be 1.
2015-08-14 14:19:12 +02:00
1ec40e84d4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #70232 : Incorrect bump-along behavior with \K and empty string match
Resolved conflicts:
ext/pcre/php_pcre.c
2015-08-13 14:28:16 +02:00
b9f23c2152
Fix #70232 : Incorrect bump-along behavior with \K and empty string match
...
To do global matching (/g), for every empty match we have to do a second match
with PCRE_NOTEMPTY turned on. That may fail, however, when the \K escape
sequence is involved. For this purpose libpcre 8.0 introduced the
PCRE_NOTEMPTY_ATSTART flag, which we will use if available, and otherwise fall
back to the old (possibly buggy) behavior.
2015-08-13 14:20:04 +02:00
715d5d2855
Get rid of implicit type casting in GC_*() macros in Zend/zend_types.h.
...
This prevented compilation warnings and disclosed few incorrect usages in Zend/zend_vm_def.h and ext/dom/xpath.c.
Now explicit type casting may be required on call site.
This may break some C extension code, but it shoulfn't be a problem to add explicit casting.
2015-08-13 13:56:29 +03:00
f94bcb1026
Of course, we support v2 in PHP 5.6 as well.
2015-08-13 11:07:16 +01:00
159bc6ecdc
Updated to version 2015.6 (2015f)
2015-08-13 10:54:06 +01:00
890204fa45
Updated to version 2015.6 (2015f)
2015-08-13 10:54:03 +01:00
3ddd826684
Tell timelib we support v2
2015-08-13 10:50:28 +01:00
793d8dcffd
Merge branch 'master' of git.php.net:php-src
2015-08-13 13:30:50 +08:00
dc5c6ab774
Fixed bug #70250 (extract() turns array elements to references)
2015-08-13 13:30:25 +08:00
4672aac0a7
Merge branch 'PHP-5.6'
2015-08-13 15:01:24 +10:00
5cfbfbc73c
PDO_OCI is not experimental
2015-08-13 15:01:01 +10:00
adf0e49912
zend_hash_resize seems useless, use zend_hash_extend
2015-08-13 12:19:35 +08:00
e17b1266db
Revert "Updated to version 2015.6 (2015f)"
...
This reverts commit 7b476a600b
2015-08-13 11:55:30 +08:00
7b476a600b
Updated to version 2015.6 (2015f)
2015-08-12 22:00:15 +01:00
a1c06f10dd
Updated to version 2015.6 (2015f)
2015-08-12 22:00:13 +01:00
3b874086e2
Fix #70245 : strtotime does not emit warning when 2nd parameter is object or string
...
Caused by a refactoring strtotime() called
zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ...) instead of
zend_parse_parameters().
2015-08-12 19:01:04 +02:00
2366a070c8
improve condition
...
same as CSPRNG, break by EOF
2015-08-12 14:50:43 +02:00
b7031ba743
Further PHP 7 compat for OCI8
2015-08-12 21:57:16 +10:00
cbcacbb2da
improve condition
...
read() == 0 is EOL
2015-08-12 10:20:26 +02:00
Christopher Jones