granicus.if.org Git

commit | commitdiff | tree

Nikita Popov [Tue, 30 Aug 2016 11:06:38 +0000 (13:06 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Nikita Popov [Tue, 30 Aug 2016 11:06:22 +0000 (13:06 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Nikita Popov [Tue, 30 Aug 2016 11:05:53 +0000 (13:05 +0200)]

commit | commitdiff | tree

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.

commit | commitdiff | tree

Nikita Popov [Tue, 30 Aug 2016 08:56:25 +0000 (10:56 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Nikita Popov [Tue, 30 Aug 2016 08:55:08 +0000 (10:55 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Nikita Popov [Tue, 30 Aug 2016 08:54:31 +0000 (10:54 +0200)]

commit | commitdiff | tree

Yasuo Ohgaki [Tue, 30 Aug 2016 07:05:49 +0000 (16:05 +0900)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Christoph M. Becker [Tue, 30 Aug 2016 00:28:37 +0000 (02:28 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Christoph M. Becker [Tue, 30 Aug 2016 00:21:10 +0000 (02:21 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Christoph M. Becker [Tue, 30 Aug 2016 00:08:50 +0000 (02:08 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

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.

commit | commitdiff | tree

Christoph M. Becker [Mon, 29 Aug 2016 23:19:54 +0000 (01:19 +0200)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Christoph M. Becker [Mon, 29 Aug 2016 23:18:23 +0000 (01:18 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Christoph M. Becker [Mon, 29 Aug 2016 23:07:20 +0000 (01:07 +0200)]

Merge branch 'pull-request/2043' into PHP-7.0

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 19:49:28 +0000 (21:49 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
fix HANDLE leak

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 19:45:39 +0000 (21:45 +0200)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 19:26:13 +0000 (21:26 +0200)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 19:23:20 +0000 (21:23 +0200)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 19:20:36 +0000 (21:20 +0200)]

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 19:16:24 +0000 (21:16 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
ensure null termination

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 19:03:03 +0000 (21:03 +0200)]

ensure null termination

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Dmitry Stogov [Mon, 29 Aug 2016 17:35:17 +0000 (20:35 +0300)]

Allow optional splitting of basic blocks at RECV/RECV_INIT opcodes.

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 17:34:43 +0000 (19:34 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
fix double free

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 17:27:47 +0000 (19:27 +0200)]

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 16:58:15 +0000 (18:58 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
fix double free

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 16:56:25 +0000 (18:56 +0200)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 16:37:35 +0000 (18:37 +0200)]

add note to UPGRADING.INTERNALS

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 16:25:38 +0000 (18:25 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
extend help message

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 16:25:00 +0000 (18:25 +0200)]

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 16:08:31 +0000 (18:08 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
fix leak

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 16:01:21 +0000 (18:01 +0200)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 15:43:36 +0000 (17:43 +0200)]

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 15:29:28 +0000 (17:29 +0200)]

support also cppcheck for static analyze

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 15:25:46 +0000 (17:25 +0200)]

add error check and fix leak

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 15:25:13 +0000 (17:25 +0200)]

commit | commitdiff | tree

Jakub Zelenka [Mon, 29 Aug 2016 14:19:10 +0000 (15:19 +0100)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Jakub Zelenka [Mon, 29 Aug 2016 14:18:00 +0000 (15:18 +0100)]

Bump PHP_JSON_VERSION to 1.5.0

commit | commitdiff | tree

Jakub Zelenka [Mon, 29 Aug 2016 14:03:14 +0000 (15:03 +0100)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Jakub Zelenka [Mon, 29 Aug 2016 14:01:00 +0000 (15:01 +0100)]

Merge branch 'json_encode_fail_return' into PHP-7.1

commit | commitdiff | tree

Jakub Zelenka [Mon, 29 Aug 2016 13:59:44 +0000 (14:59 +0100)]

Update NEWS with info about a json_encode fail return

commit | commitdiff | tree

Jakub Zelenka [Sun, 28 Aug 2016 12:00:49 +0000 (13:00 +0100)]

Add test for fixed bug #68992

commit | commitdiff | tree

Jakub Zelenka [Sun, 28 Aug 2016 11:53:11 +0000 (12:53 +0100)]

Fix recursion and protection in the failed JSON encoding

commit | commitdiff | tree

Jakub Zelenka [Wed, 24 Aug 2016 19:46:33 +0000 (20:46 +0100)]

Add initial failure checking for json_encode

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 13:44:59 +0000 (15:44 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
fix leak

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 13:43:10 +0000 (15:43 +0200)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 13:28:09 +0000 (15:28 +0200)]

fix possible memory leak

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 11:49:20 +0000 (13:49 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
fix dealloc mismatch

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Mon, 29 Aug 2016 00:45:37 +0000 (02:45 +0200)]

fix dealloc mismatch

commit | commitdiff | tree

Dmitry Stogov [Mon, 29 Aug 2016 09:15:37 +0000 (12:15 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed bug #72944 (Null pointer deref in zval_delref_p).

commit | commitdiff | tree

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).

commit | commitdiff | tree

Dmitry Stogov [Mon, 29 Aug 2016 09:02:50 +0000 (12:02 +0300)]

Fixed bug #72944 (Null pointer deref in zval_delref_p).

commit | commitdiff | tree

George Wang [Mon, 29 Aug 2016 02:32:42 +0000 (22:32 -0400)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

George Wang [Mon, 29 Aug 2016 02:31:08 +0000 (22:31 -0400)]

commit | commitdiff | tree

George Wang [Mon, 29 Aug 2016 02:29:38 +0000 (22:29 -0400)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

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

commit | commitdiff | tree

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 .

commit | commitdiff | tree

Yasuo Ohgaki [Sun, 28 Aug 2016 20:58:33 +0000 (05:58 +0900)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Sun, 28 Aug 2016 19:20:31 +0000 (21:20 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
  extend help msg
  fix leak
  extend clang vs compat options
  fix leak
  integrate clang analyzer

commit | commitdiff | tree

Anatol Belski [Sun, 28 Aug 2016 18:18:11 +0000 (20:18 +0200)]

commit | commitdiff | tree

Anatol Belski [Sun, 28 Aug 2016 17:11:03 +0000 (19:11 +0200)]

commit | commitdiff | tree

Anatol Belski [Sun, 28 Aug 2016 16:26:48 +0000 (18:26 +0200)]

extend clang vs compat options

commit | commitdiff | tree

Anatol Belski [Sun, 28 Aug 2016 16:08:06 +0000 (18:08 +0200)]

commit | commitdiff | tree

Anatol Belski [Sun, 28 Aug 2016 16:06:27 +0000 (18:06 +0200)]

integrate clang analyzer

commit | commitdiff | tree

Xinchen Hui [Sun, 28 Aug 2016 16:11:09 +0000 (00:11 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed bug #72936 (Zend API's zend_symtable_str_update() asserts key should end with '\0')

commit | commitdiff | tree

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')

commit | commitdiff | tree

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')

commit | commitdiff | tree

Anatol Belski [Sat, 27 Aug 2016 20:30:06 +0000 (22:30 +0200)]

Merge branch 'PHP-7.1'

* PHP-7.1:
  fix leak
  add parentheses
  fix clang compat
  fix leak

commit | commitdiff | tree

Anatol Belski [Sat, 27 Aug 2016 20:28:13 +0000 (22:28 +0200)]

commit | commitdiff | tree

Anatol Belski [Sat, 27 Aug 2016 20:26:18 +0000 (22:26 +0200)]

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom