]>
granicus.if.org Git - php/log
Anatol Belski [Wed, 31 Aug 2016 10:27:14 +0000 (12:27 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
sync tests
Anatol Belski [Wed, 31 Aug 2016 10:26:51 +0000 (12:26 +0200)]
sync tests
Anatol Belski [Wed, 31 Aug 2016 10:11:19 +0000 (12:11 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
add more defs for resource alloc/dealloc
add yet one define
Anatol Belski [Wed, 31 Aug 2016 10:09:56 +0000 (12:09 +0200)]
add more defs for resource alloc/dealloc
Anatol Belski [Wed, 31 Aug 2016 10:09:26 +0000 (12:09 +0200)]
add yet one define
Anatol Belski [Wed, 31 Aug 2016 10:07:38 +0000 (12:07 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Implement \ArgumentCountError exception
Davey Shafik [Wed, 31 Aug 2016 02:47:50 +0000 (19:47 -0700)]
Update NEWS
Davey Shafik [Tue, 30 Aug 2016 19:09:26 +0000 (12:09 -0700)]
Implement \ArgumentCountError exception
Nikita Popov [Tue, 30 Aug 2016 16:07:28 +0000 (18:07 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 30 Aug 2016 16:06:59 +0000 (18:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 30 Aug 2016 16:06:18 +0000 (18:06 +0200)]
Fix bug #71711
Also handle another case of bug #71996.
Nikita Popov [Tue, 30 Aug 2016 15:21:42 +0000 (17:21 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 30 Aug 2016 15:21:13 +0000 (17:21 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 30 Aug 2016 15:19:19 +0000 (17:19 +0200)]
Fixed bug #71996
Christoph M. Becker [Tue, 30 Aug 2016 13:13:30 +0000 (15:13 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Tue, 30 Aug 2016 13:02:14 +0000 (15:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 30 Aug 2016 12:54:44 +0000 (14:54 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 30 Aug 2016 12:48:24 +0000 (14:48 +0200)]
Fix #66797: mb_substr only takes 32-bit signed integer
`from` and `len` are `long`, but get passed to mbfl_substr() which expects
`int`s. Therefore we clamp the values to avoid the undefined conversion
behavior.
Anatol Belski [Tue, 30 Aug 2016 12:16:56 +0000 (14:16 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix typo
prepare for next
Anatol Belski [Tue, 30 Aug 2016 12:16:48 +0000 (14:16 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix typo
prepare for next
Anatol Belski [Tue, 30 Aug 2016 12:11:47 +0000 (14:11 +0200)]
fix typo
Anatol Belski [Tue, 30 Aug 2016 12:10:54 +0000 (14:10 +0200)]
prepare for next
Nikita Popov [Tue, 30 Aug 2016 11:45:58 +0000 (13:45 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 30 Aug 2016 11:45:49 +0000 (13:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 30 Aug 2016 11:44:59 +0000 (13:44 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ville Hukkamäki [Fri, 19 Aug 2016 22:05:04 +0000 (22:05 +0000)]
Test case for bug #72771
Nikita Popov [Tue, 30 Aug 2016 11:06:38 +0000 (13:06 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 30 Aug 2016 11:06:22 +0000 (13:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 30 Aug 2016 11:05:53 +0000 (13:05 +0200)]
Fix bug #72957
Nikita Popov [Tue, 30 Aug 2016 10:43:41 +0000 (12:43 +0200)]
Followup for bug #72971
Property writes did not respect the namespace either. This is an
incomplete fix in that it only handles the case where an existing
child element is modified, not when a new one is created.
Nikita Popov [Tue, 30 Aug 2016 08:56:25 +0000 (10:56 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 30 Aug 2016 08:55:08 +0000 (10:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 30 Aug 2016 08:54:31 +0000 (10:54 +0200)]
Fix bug #72971
Yasuo Ohgaki [Tue, 30 Aug 2016 07:05:49 +0000 (16:05 +0900)]
Update NEWS
Yasuo Ohgaki [Tue, 30 Aug 2016 06:59:53 +0000 (15:59 +0900)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #72940 SID always return "name=ID", even if session cookie exist
Yasuo Ohgaki [Tue, 30 Aug 2016 06:58:55 +0000 (15:58 +0900)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72940 SID always return "name=ID", even if session cookie exist
Yasuo Ohgaki [Tue, 30 Aug 2016 06:56:06 +0000 (15:56 +0900)]
Fixed bug #72940 SID always return "name=ID", even if session cookie exist
Christoph M. Becker [Tue, 30 Aug 2016 00:28:37 +0000 (02:28 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Tue, 30 Aug 2016 00:21:10 +0000 (02:21 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 30 Aug 2016 00:08:50 +0000 (02:08 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 29 Aug 2016 23:53:27 +0000 (01:53 +0200)]
Fix #71882: Negative ftruncate() on php://memory exhausts memory
We must not pass negative sizes to a size_t parameter.
Christoph M. Becker [Mon, 29 Aug 2016 23:19:54 +0000 (01:19 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Mon, 29 Aug 2016 23:18:23 +0000 (01:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Mon, 29 Aug 2016 23:07:20 +0000 (01:07 +0200)]
Merge branch 'pull-request/2043' into PHP-7.0
Anatol Belski [Mon, 29 Aug 2016 19:49:28 +0000 (21:49 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix HANDLE leak
Anatol Belski [Mon, 29 Aug 2016 19:48:50 +0000 (21:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix HANDLE leak
Anatol Belski [Mon, 29 Aug 2016 19:47:54 +0000 (21:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix HANDLE leak
Anatol Belski [Mon, 29 Aug 2016 19:45:39 +0000 (21:45 +0200)]
fix HANDLE leak
Anatol Belski [Mon, 29 Aug 2016 19:26:36 +0000 (21:26 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
update NEWS
update NEWS
Anatol Belski [Mon, 29 Aug 2016 19:26:13 +0000 (21:26 +0200)]
update NEWS
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:16:24 +0000 (21:16 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
ensure null termination
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:35:16 +0000 (20:35 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify
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:15 +0000 (20:37 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
fix double free
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:36:08 +0000 (20:36 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Allow optional splitting of basic blocks at RECV/RECV_INIT opcodes.
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:43 +0000 (19:34 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix double free
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:58:15 +0000 (18:58 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
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:38:23 +0000 (18:38 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
add note to UPGRADING.INTERNALS
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:38 +0000 (18:25 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
extend help message
Anatol Belski [Mon, 29 Aug 2016 16:25:00 +0000 (18:25 +0200)]
extend help message
Anatol Belski [Mon, 29 Aug 2016 16:08:31 +0000 (18:08 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix leak
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:47:21 +0000 (17:47 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix search path
support also cppcheck for static analyze
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:26:41 +0000 (17:26 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
add error check and fix leak
fix leak
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:19:10 +0000 (15:19 +0100)]
Merge branch 'PHP-7.1'
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:03:14 +0000 (15:03 +0100)]
Merge branch 'PHP-7.1'
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:59 +0000 (15:44 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix leak
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:30:49 +0000 (15:30 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix possible memory 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