Anatol Belski
201f90a8cc
add error check and fix leak
2016-08-29 17:25:46 +02:00
Anatol Belski
7ecfb4b954
fix leak
2016-08-29 17:25:13 +02:00
Jakub Zelenka
c4961fa8b6
Bump PHP_JSON_VERSION to 1.5.0
2016-08-29 15:18:00 +01:00
Jakub Zelenka
ab65665a0e
Merge branch 'json_encode_fail_return' into PHP-7.1
2016-08-29 15:01:00 +01:00
Jakub Zelenka
f5b4aae7ac
Update NEWS with info about a json_encode fail return
2016-08-29 14:59:44 +01:00
Jakub Zelenka
27acbcf4df
Add test for fixed bug #68992
2016-08-29 14:49:40 +01:00
Jakub Zelenka
df05dbb3df
Fix recursion and protection in the failed JSON encoding
2016-08-29 14:49:40 +01:00
Jakub Zelenka
12a8c3f6e7
Add initial failure checking for json_encode
2016-08-29 14:49:40 +01:00
Anatol Belski
50c5d13d26
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix leak
2016-08-29 15:44:13 +02:00
Anatol Belski
d80a317c0b
fix leak
2016-08-29 15:43:10 +02:00
Anatol Belski
a747578497
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix possible memory leak
2016-08-29 15:29:52 +02:00
Anatol Belski
1d7ec685c1
fix possible memory leak
2016-08-29 15:28:09 +02:00
Anatol Belski
0e709fe42d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix dealloc mismatch
2016-08-29 13:43:08 +02:00
Anatol Belski
eac7f4b670
fix dealloc mismatch
2016-08-29 12:46:23 +02:00
Dmitry Stogov
b5bab0fce8
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #72944 (Null pointer deref in zval_delref_p).
2016-08-29 12:07:54 +03:00
Dmitry Stogov
b66039db33
Fixed bug #72944 (Null pointer deref in zval_delref_p).
2016-08-29 12:02:50 +03:00
George Wang
0a09eecfcc
code cleanup.
2016-08-28 22:31:08 -04:00
George Wang
413bd261ec
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-28 22:29:38 -04:00
George Wang
ca1eb585ee
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
sapi/litespeed/lsapi_main.c
2016-08-28 22:23:28 -04:00
George Wang
c73bcbefbd
Added .user.ini support.
...
Added LSPHPRC support.
update LiteSpeed SAPI version to 6.10 .
2016-08-28 21:49:30 -04:00
Yasuo Ohgaki
1cf179e415
Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc
2016-08-29 05:57:37 +09:00
Anatol Belski
be0958d291
extend help msg
2016-08-28 20:18:11 +02:00
Anatol Belski
b415290c92
fix leak
2016-08-28 19:42:41 +02:00
Anatol Belski
48b1cb2f12
extend clang vs compat options
2016-08-28 19:42:41 +02:00
Anatol Belski
378ed99424
fix leak
2016-08-28 19:42:41 +02:00
Anatol Belski
10c2ac8c81
integrate clang analyzer
2016-08-28 19:42:41 +02:00
Xinchen Hui
01701912c7
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #72936 (Zend API's zend_symtable_str_update() asserts key should end with '\0')
2016-08-29 00:10:57 +08:00
Xinchen Hui
986d0f87ec
Fixed bug #72936 (Zend API's zend_symtable_str_update() asserts key should end with '\0')
2016-08-29 00:10:31 +08:00
Anatol Belski
92a60a67cf
fix leak
2016-08-27 22:28:13 +02:00
Anatol Belski
b6440a74c1
add parentheses
2016-08-27 22:26:18 +02:00
Anatol Belski
8a8a441972
fix clang compat
2016-08-27 22:25:02 +02:00
Anatol Belski
d58202853d
fix leak
2016-08-27 22:24:24 +02:00
Christoph M. Becker
3a78530b8a
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-27 01:23:36 +02:00
Christoph M. Becker
8fcfacf746
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-27 01:18:10 +02:00
Christoph M. Becker
2139918ea6
Fix #65550 : get_browser() incorrectly parsers entries with "+" sign
...
+ signs in the browscap patterns are meant to be literal characters, so we
have to escape them for the regex matching.
2016-08-27 01:12:01 +02:00
Anatol Belski
88f6706656
fix leak
2016-08-26 22:05:06 +02:00
Christoph M. Becker
14cd14ddaf
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-26 18:52:06 +02:00
Christoph M. Becker
c4c3eb55a7
Fix #72949 : Typo in opcache error message
2016-08-26 18:50:30 +02:00
Xinchen Hui
557f1ccf0c
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #72943 (assign_dim on string doesn't reset hval)
Conflicts:
Zend/zend_execute.c
2016-08-26 18:32:54 +08:00
Xinchen Hui
c67fa3c91d
Fixed bug #72943 (assign_dim on string doesn't reset hval)
2016-08-26 18:30:08 +08:00
Anatol Belski
726e3b8ff0
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
update NEWS
pdo_dblib: stringify uniqidentifier field
2016-08-25 19:46:01 +02:00
Anatol Belski
9f6d2c05b4
update NEWS
2016-08-25 19:44:55 +02:00
Anatol Belski
57509fb969
update NEWS
2016-08-25 19:43:39 +02:00
Alexander Zhuravlev
a000bff2c3
pdo_dblib: stringify uniqidentifier field
...
Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE
pdo_dblib: Stringify uniqidentifier field
Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE
Tests added.
pdo_dblib: Stringify uniqidentifier field
Keep old 5.6 behavior: return Uniqidentifier value as 36-byte hex string (not binary),
when PDO::ATTR_STRINGIFY_FETCHES is TRUE
Tests fix.
pdo_dblib: Stringify uniqueidentifier field Added separate PDO::DBLIB_ATTR_STRINGIFY_UNIQUEIDENTIFIER attribute instead of PDO::ATTR_STRINGIFY_FETCHES.
pdo_dblib: Stringify uniqueidentifier field Added `getAttribute` support for PDO::DBLIB_ATTR_STRINGIFY_UNIQUEIDENTIFIER.
Simplify storage of stringify_uniqueidentifier attribute
2016-08-25 19:37:21 +02:00
Christoph M. Becker
3f53814ca7
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-25 18:41:45 +02:00
Christoph M. Becker
433976f931
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-25 18:29:23 +02:00
Christoph M. Becker
84512a1177
Fix #70825 : Cannot fetch multiple values with group in ini file
...
If we have the position already from the last fetch, we also have to preset
the current group, because it won't be read again.
2016-08-25 18:18:10 +02:00
Anatol Belski
9f0f7c0336
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix check for args by ref
2016-08-25 18:09:37 +02:00
Anatol Belski
51d19c12a5
fix check for args by ref
2016-08-25 18:06:47 +02:00
Christoph M. Becker
96ea8de591
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-25 16:31:03 +02:00
