]>
granicus.if.org Git - php/log
Anatol Belski [Mon, 29 Aug 2016 19:24:08 +0000 (21:24 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
update NEWS
Anatol Belski [Mon, 29 Aug 2016 19:23:20 +0000 (21:23 +0200)]
update NEWS
Anatol Belski [Mon, 29 Aug 2016 19:22:43 +0000 (21:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Mon, 29 Aug 2016 19:20:36 +0000 (21:20 +0200)]
update NEWS
Anatol Belski [Mon, 29 Aug 2016 19:15:55 +0000 (21:15 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
ensure null termination
Anatol Belski [Mon, 29 Aug 2016 19:13:39 +0000 (21:13 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
ensure null termination
Anatol Belski [Mon, 29 Aug 2016 19:03:03 +0000 (21:03 +0200)]
ensure null termination
Anatol Belski [Mon, 29 Aug 2016 18:34:44 +0000 (20:34 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify
Anatol Belski [Mon, 29 Aug 2016 18:32:55 +0000 (20:32 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify
Anatol Belski [Mon, 29 Aug 2016 18:25:34 +0000 (20:25 +0200)]
Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify
Dmitry Stogov [Mon, 29 Aug 2016 17:37:01 +0000 (20:37 +0300)]
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:php-src:
fix double free
Dmitry Stogov [Mon, 29 Aug 2016 17:35:17 +0000 (20:35 +0300)]
Allow optional splitting of basic blocks at RECV/RECV_INIT opcodes.
Anatol Belski [Mon, 29 Aug 2016 17:34:19 +0000 (19:34 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix double free
Anatol Belski [Mon, 29 Aug 2016 17:33:22 +0000 (19:33 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix double free
Anatol Belski [Mon, 29 Aug 2016 17:27:47 +0000 (19:27 +0200)]
fix double free
Anatol Belski [Mon, 29 Aug 2016 16:57:50 +0000 (18:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix double free
Anatol Belski [Mon, 29 Aug 2016 16:56:25 +0000 (18:56 +0200)]
fix double free
Anatol Belski [Mon, 29 Aug 2016 16:37:35 +0000 (18:37 +0200)]
add note to UPGRADING.INTERNALS
Anatol Belski [Mon, 29 Aug 2016 16:25:00 +0000 (18:25 +0200)]
extend help message
Anatol Belski [Mon, 29 Aug 2016 16:08:17 +0000 (18:08 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix leak
Anatol Belski [Mon, 29 Aug 2016 16:05:47 +0000 (18:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leak
Anatol Belski [Mon, 29 Aug 2016 16:01:21 +0000 (18:01 +0200)]
fix leak
Anatol Belski [Mon, 29 Aug 2016 15:43:36 +0000 (17:43 +0200)]
fix search path
Anatol Belski [Mon, 29 Aug 2016 15:29:28 +0000 (17:29 +0200)]
support also cppcheck for static analyze
Anatol Belski [Mon, 29 Aug 2016 15:25:46 +0000 (17:25 +0200)]
add error check and fix leak
Anatol Belski [Mon, 29 Aug 2016 15:25:13 +0000 (17:25 +0200)]
fix leak
Jakub Zelenka [Mon, 29 Aug 2016 14:18:00 +0000 (15:18 +0100)]
Bump PHP_JSON_VERSION to 1.5.0
Jakub Zelenka [Mon, 29 Aug 2016 14:01:00 +0000 (15:01 +0100)]
Merge branch 'json_encode_fail_return' into PHP-7.1
Jakub Zelenka [Mon, 29 Aug 2016 13:59:44 +0000 (14:59 +0100)]
Update NEWS with info about a json_encode fail return
Jakub Zelenka [Sun, 28 Aug 2016 12:00:49 +0000 (13:00 +0100)]
Add test for fixed bug #68992
Jakub Zelenka [Sun, 28 Aug 2016 11:53:11 +0000 (12:53 +0100)]
Fix recursion and protection in the failed JSON encoding
Jakub Zelenka [Wed, 24 Aug 2016 19:46:33 +0000 (20:46 +0100)]
Add initial failure checking for json_encode
Anatol Belski [Mon, 29 Aug 2016 13:44:13 +0000 (15:44 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix leak
Anatol Belski [Mon, 29 Aug 2016 13:43:10 +0000 (15:43 +0200)]
fix leak
Anatol Belski [Mon, 29 Aug 2016 13:29:52 +0000 (15:29 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix possible memory leak
Anatol Belski [Mon, 29 Aug 2016 13:28:09 +0000 (15:28 +0200)]
fix possible memory leak
Anatol Belski [Mon, 29 Aug 2016 11:43:08 +0000 (13:43 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix dealloc mismatch
Anatol Belski [Mon, 29 Aug 2016 00:45:37 +0000 (02:45 +0200)]
fix dealloc mismatch
Dmitry Stogov [Mon, 29 Aug 2016 09:07:54 +0000 (12:07 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72944 (Null pointer deref in zval_delref_p).
Dmitry Stogov [Mon, 29 Aug 2016 09:02:50 +0000 (12:02 +0300)]
Fixed bug #72944 (Null pointer deref in zval_delref_p).
George Wang [Mon, 29 Aug 2016 02:31:08 +0000 (22:31 -0400)]
code cleanup.
George Wang [Mon, 29 Aug 2016 02:29:38 +0000 (22:29 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
George Wang [Mon, 29 Aug 2016 02:23:28 +0000 (22:23 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
sapi/litespeed/lsapi_main.c
George Wang [Mon, 29 Aug 2016 01:49:30 +0000 (21:49 -0400)]
Added .user.ini support.
Added LSPHPRC support.
update LiteSpeed SAPI version to 6.10 .
Yasuo Ohgaki [Sun, 28 Aug 2016 20:57:37 +0000 (05:57 +0900)]
Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc
Anatol Belski [Sun, 28 Aug 2016 18:18:11 +0000 (20:18 +0200)]
extend help msg
Anatol Belski [Sun, 28 Aug 2016 17:11:03 +0000 (19:11 +0200)]
fix leak
Anatol Belski [Sun, 28 Aug 2016 16:26:48 +0000 (18:26 +0200)]
extend clang vs compat options
Anatol Belski [Sun, 28 Aug 2016 16:08:06 +0000 (18:08 +0200)]
fix leak
Anatol Belski [Sun, 28 Aug 2016 16:06:27 +0000 (18:06 +0200)]
integrate clang analyzer
Xinchen Hui [Sun, 28 Aug 2016 16:10:57 +0000 (00:10 +0800)]
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')
Xinchen Hui [Sun, 28 Aug 2016 16:10:31 +0000 (00:10 +0800)]
Fixed bug #72936 (Zend API's zend_symtable_str_update() asserts key should end with '\0')
Anatol Belski [Sat, 27 Aug 2016 20:28:13 +0000 (22:28 +0200)]
fix leak
Anatol Belski [Sat, 27 Aug 2016 20:26:18 +0000 (22:26 +0200)]
add parentheses
Anatol Belski [Sat, 27 Aug 2016 20:25:02 +0000 (22:25 +0200)]
fix clang compat
Anatol Belski [Sat, 27 Aug 2016 20:24:24 +0000 (22:24 +0200)]
fix leak
Christoph M. Becker [Fri, 26 Aug 2016 23:19:23 +0000 (01:19 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 26 Aug 2016 23:13:32 +0000 (01:13 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 26 Aug 2016 23:02:58 +0000 (01:02 +0200)]
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.
Anatol Belski [Fri, 26 Aug 2016 20:05:06 +0000 (22:05 +0200)]
fix leak
Christoph M. Becker [Fri, 26 Aug 2016 16:51:33 +0000 (18:51 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 26 Aug 2016 16:50:30 +0000 (18:50 +0200)]
Fix #72949: Typo in opcache error message
Xinchen Hui [Fri, 26 Aug 2016 10:32:54 +0000 (18:32 +0800)]
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
Xinchen Hui [Fri, 26 Aug 2016 10:30:08 +0000 (18:30 +0800)]
Fixed bug #72943 (assign_dim on string doesn't reset hval)
Anatol Belski [Thu, 25 Aug 2016 17:46:01 +0000 (19:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
pdo_dblib: stringify uniqidentifier field
Anatol Belski [Thu, 25 Aug 2016 17:44:55 +0000 (19:44 +0200)]
update NEWS
Anatol Belski [Thu, 25 Aug 2016 17:43:39 +0000 (19:43 +0200)]
update NEWS
Alexander Zhuravlev [Mon, 4 Jul 2016 09:47:18 +0000 (12:47 +0300)]
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
Christoph M. Becker [Thu, 25 Aug 2016 16:30:58 +0000 (18:30 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 25 Aug 2016 16:19:43 +0000 (18:19 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 25 Aug 2016 16:10:38 +0000 (18:10 +0200)]
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.
Anatol Belski [Thu, 25 Aug 2016 16:09:37 +0000 (18:09 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix check for args by ref
Anatol Belski [Thu, 25 Aug 2016 16:06:47 +0000 (18:06 +0200)]
fix check for args by ref
Christoph M. Becker [Thu, 25 Aug 2016 14:31:03 +0000 (16:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 25 Aug 2016 14:22:57 +0000 (16:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 25 Aug 2016 14:20:30 +0000 (16:20 +0200)]
Fix #71514: Bad dba_replace condition because of wrong API usage
We're backporting commit
9e309a2d to PHP-5.6, because it is a bugfix.
Anatol Belski [Thu, 25 Aug 2016 10:53:37 +0000 (12:53 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
backport relevant part from bug #72858 patch in 7.0
Anatol Belski [Thu, 25 Aug 2016 10:52:29 +0000 (12:52 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
backport relevant part from bug #72858 patch in 7.0
Anatol Belski [Thu, 25 Aug 2016 10:46:28 +0000 (12:46 +0200)]
backport relevant part from bug #72858 patch in 7.0
Anatol Belski [Thu, 25 Aug 2016 10:14:33 +0000 (12:14 +0200)]
update NEWS
Anatol Belski [Thu, 25 Aug 2016 10:13:55 +0000 (12:13 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72922 COM called from PHP does not return out parameters
Anatol Belski [Thu, 25 Aug 2016 10:12:45 +0000 (12:12 +0200)]
Fixed bug #72922 COM called from PHP does not return out parameters
Xinchen Hui [Thu, 25 Aug 2016 05:29:22 +0000 (13:29 +0800)]
Remove redundant \t
Levi Morrison [Tue, 23 Aug 2016 15:42:04 +0000 (09:42 -0600)]
Revert "Do not prepend ? on nullables in ReflectionType::__toString()"
This reverts commit
8855a2ce76e8bfba1d2eea1345c765fde7a9a441 .
Dmitry Stogov [Tue, 23 Aug 2016 10:17:53 +0000 (13:17 +0300)]
op_arrays may be optimized independetly and "script" might be NULL
Dmitry Stogov [Tue, 23 Aug 2016 09:58:46 +0000 (12:58 +0300)]
Don't keep dangling pointers.
Dmitry Stogov [Tue, 23 Aug 2016 09:14:31 +0000 (12:14 +0300)]
Added tests and NEWS entry
Fixed bug #72598 (Reference is lost after array_slice())
Dmitry Stogov [Tue, 23 Aug 2016 08:51:08 +0000 (11:51 +0300)]
Run ext/opcache/tests/*.phpt by default
Nikita Popov [Sat, 6 Aug 2016 13:24:23 +0000 (15:24 +0200)]
call_user_func(_array): Don't abort on reference warning
Change zend_call_function() to not abort the call if a non-reference
is passed to a reference argument. The usual warning will still be
thrown, but the call will proceed as usual.
Xinchen Hui [Tue, 23 Aug 2016 03:32:21 +0000 (11:32 +0800)]
Fixed tests
Xinchen Hui [Mon, 22 Aug 2016 15:44:38 +0000 (23:44 +0800)]
Fixed bug #72920 (Accessing a private constant using constant() creates an exception AND warning)
Dmitry Stogov [Mon, 22 Aug 2016 13:48:26 +0000 (16:48 +0300)]
Fixed CFG construction for stackless execution (split basic blocks after calls)
Yasuo Ohgaki [Mon, 22 Aug 2016 08:01:07 +0000 (17:01 +0900)]
Adjust test so that it passes on more restrictive filesystems
Jakub Zelenka [Sun, 21 Aug 2016 19:29:03 +0000 (20:29 +0100)]
Do not expect error
0407006A in openssl_private_(en|de)crypt
It makes the test work with OpenSSL 1.1
Christoph M. Becker [Sun, 21 Aug 2016 17:49:57 +0000 (19:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 21 Aug 2016 17:43:17 +0000 (19:43 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 21 Aug 2016 17:39:58 +0000 (19:39 +0200)]
Fix #68716: possible resource leaks in _php_image_convert()
We properly clean up after ourselves wrt. to closing opened file pointers
and created images.
Anatol Belski [Sun, 21 Aug 2016 16:21:07 +0000 (18:21 +0200)]
extend readdir utf-8 name test
Christoph M. Becker [Sun, 21 Aug 2016 15:46:42 +0000 (17:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 21 Aug 2016 15:40:45 +0000 (17:40 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0