]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 23:10:35 +0000 (08:10 +0900)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix bug #72940 properly. Reduce needless branches

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 22:47:27 +0000 (07:47 +0900)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #72940 properly. Reduce needless branches

8 years agoFix bug #72940 properly. Reduce needless branches
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 22:47:04 +0000 (07:47 +0900)]
Fix bug #72940 properly. Reduce needless branches

8 years agoUpdate UPGRADING
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 20:52:29 +0000 (05:52 +0900)]
Update UPGRADING

8 years agoRevert "Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc"
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 20:54:55 +0000 (05:54 +0900)]
Revert "Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc"

This reverts commit 1cf179e4150308d8217d9517408ca5e22b5d607f.

8 years agoRevert "Merge RFC https://wiki.php.net/rfc/session-create-id"
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 20:54:30 +0000 (05:54 +0900)]
Revert "Merge RFC https://wiki.php.net/rfc/session-create-id"

This reverts commit 7ee9f81c54ca888beae1c6aaeaccee1260012076.

8 years agoRevert "Add tests"
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 20:54:19 +0000 (05:54 +0900)]
Revert "Add tests"

This reverts commit aff4c7d826316dc8f577d08c79a3c53c02b90910.

8 years agoFix NEWS
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 20:53:26 +0000 (05:53 +0900)]
Fix NEWS

8 years agoUpdate UPGRADING
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 18:24:06 +0000 (03:24 +0900)]
Update UPGRADING

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Davey Shafik [Wed, 31 Aug 2016 17:41:10 +0000 (10:41 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Update NEWS for 7.1.0RC2

8 years agoUpdate NEWS for 7.1.0RC2
commit | commitdiff | tree
Davey Shafik [Wed, 31 Aug 2016 17:01:42 +0000 (17:01 +0000)]
Update NEWS for 7.1.0RC2

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Christoph M. Becker [Wed, 31 Aug 2016 14:52:37 +0000 (16:52 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Christoph M. Becker [Wed, 31 Aug 2016 14:43:54 +0000 (16:43 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Christoph M. Becker [Wed, 31 Aug 2016 14:38:38 +0000 (16:38 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #71882 amendment 2: Negative ftruncate() on php://memory exhausts memory
commit | commitdiff | tree
Christoph M. Becker [Wed, 31 Aug 2016 14:33:14 +0000 (16:33 +0200)]
Fix #71882 amendment 2: Negative ftruncate() on php://memory exhausts memory

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Christoph M. Becker [Wed, 31 Aug 2016 12:55:58 +0000 (14:55 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Christoph M. Becker [Wed, 31 Aug 2016 12:54:51 +0000 (14:54 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Christoph M. Becker [Wed, 31 Aug 2016 12:53:53 +0000 (14:53 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #71882 amendment: Negative ftruncate() on php://memory exhausts memory
commit | commitdiff | tree
Christoph M. Becker [Wed, 31 Aug 2016 12:51:37 +0000 (14:51 +0200)]
Fix #71882 amendment: Negative ftruncate() on php://memory exhausts memory

To avoid BC breaks, we do not raise a warning for now.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Christoph M. Becker [Wed, 31 Aug 2016 12:33:43 +0000 (14:33 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Christoph M. Becker [Wed, 31 Aug 2016 12:16:12 +0000 (14:16 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoUpdate NEWS
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 12:09:56 +0000 (21:09 +0900)]
Update NEWS

8 years agoUpdate NEWS
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 12:06:05 +0000 (21:06 +0900)]
Update NEWS

8 years agoUpdate NEWS
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 12:06:19 +0000 (21:06 +0900)]
Update NEWS

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 12:03:38 +0000 (21:03 +0900)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Add tests

8 years agoAdd tests
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 12:03:10 +0000 (21:03 +0900)]
Add tests

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 11:34:43 +0000 (20:34 +0900)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Merge RFC https://wiki.php.net/rfc/session-create-id

8 years agoMerge RFC https://wiki.php.net/rfc/session-create-id
commit | commitdiff | tree
Yasuo Ohgaki [Wed, 31 Aug 2016 11:34:20 +0000 (20:34 +0900)]
Merge RFC https://wiki.php.net/rfc/session-create-id

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Christoph M. Becker [Wed, 31 Aug 2016 11:27:23 +0000 (13:27 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #71882 amendment: Negative ftruncate() on php://memory exhausts memory
commit | commitdiff | tree
Christoph M. Becker [Wed, 31 Aug 2016 11:24:37 +0000 (13:24 +0200)]
Fix #71882 amendment: Negative ftruncate() on php://memory exhausts memory

To avoid BC breaks, we do not raise a warning for now.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Wed, 31 Aug 2016 10:27:14 +0000 (12:27 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  sync tests

8 years agosync tests
commit | commitdiff | tree
Anatol Belski [Wed, 31 Aug 2016 10:26:51 +0000 (12:26 +0200)]
sync tests

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
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

8 years agoadd more defs for resource alloc/dealloc
commit | commitdiff | tree
Anatol Belski [Wed, 31 Aug 2016 10:09:56 +0000 (12:09 +0200)]
add more defs for resource alloc/dealloc

8 years agoadd yet one define
commit | commitdiff | tree
Anatol Belski [Wed, 31 Aug 2016 10:09:26 +0000 (12:09 +0200)]
add yet one define

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
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

8 years agoUpdate NEWS
commit | commitdiff | tree
Davey Shafik [Wed, 31 Aug 2016 02:47:50 +0000 (19:47 -0700)]
Update NEWS

8 years agoImplement \ArgumentCountError exception
commit | commitdiff | tree
Davey Shafik [Tue, 30 Aug 2016 19:09:26 +0000 (12:09 -0700)]
Implement \ArgumentCountError exception

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Nikita Popov [Tue, 30 Aug 2016 16:07:28 +0000 (18:07 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Nikita Popov [Tue, 30 Aug 2016 16:06:59 +0000 (18:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix bug #71711
commit | commitdiff | tree
Nikita Popov [Tue, 30 Aug 2016 16:06:18 +0000 (18:06 +0200)]
Fix bug #71711

Also handle another case of bug #71996.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Nikita Popov [Tue, 30 Aug 2016 15:21:42 +0000 (17:21 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Nikita Popov [Tue, 30 Aug 2016 15:21:13 +0000 (17:21 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed bug #71996
commit | commitdiff | tree
Nikita Popov [Tue, 30 Aug 2016 15:19:19 +0000 (17:19 +0200)]
Fixed bug #71996

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Christoph M. Becker [Tue, 30 Aug 2016 13:13:30 +0000 (15:13 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Christoph M. Becker [Tue, 30 Aug 2016 13:02:14 +0000 (15:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Christoph M. Becker [Tue, 30 Aug 2016 12:54:44 +0000 (14:54 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #66797: mb_substr only takes 32-bit signed integer
commit | commitdiff | tree
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.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
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

8 years agofix typo
commit | commitdiff | tree
Anatol Belski [Tue, 30 Aug 2016 12:11:47 +0000 (14:11 +0200)]
fix typo

8 years agoprepare for next
commit | commitdiff | tree
Anatol Belski [Tue, 30 Aug 2016 12:10:54 +0000 (14:10 +0200)]
prepare for next

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Nikita Popov [Tue, 30 Aug 2016 11:45:58 +0000 (13:45 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Nikita Popov [Tue, 30 Aug 2016 11:45:49 +0000 (13:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Nikita Popov [Tue, 30 Aug 2016 11:44:59 +0000 (13:44 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoTest case for bug #72771
commit | commitdiff | tree
Ville Hukkamäki [Fri, 19 Aug 2016 22:05:04 +0000 (22:05 +0000)]
Test case for bug #72771

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Nikita Popov [Tue, 30 Aug 2016 11:06:38 +0000 (13:06 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoFix bug #72957
commit | commitdiff | tree
Nikita Popov [Tue, 30 Aug 2016 11:05:53 +0000 (13:05 +0200)]
Fix bug #72957

8 years agoFollowup for bug #72971
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.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Nikita Popov [Tue, 30 Aug 2016 08:56:25 +0000 (10:56 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoFix bug #72971
commit | commitdiff | tree
Nikita Popov [Tue, 30 Aug 2016 08:54:31 +0000 (10:54 +0200)]
Fix bug #72971

8 years agoUpdate NEWS
commit | commitdiff | tree
Yasuo Ohgaki [Tue, 30 Aug 2016 07:05:49 +0000 (16:05 +0900)]
Update NEWS

8 years agoMerge branch 'PHP-7.1'
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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoFixed 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

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Christoph M. Becker [Tue, 30 Aug 2016 00:28:37 +0000 (02:28 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
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

8 years agoFix #71882: Negative ftruncate() on php://memory exhausts memory
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.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Christoph M. Becker [Mon, 29 Aug 2016 23:19:54 +0000 (01:19 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoMerge branch 'pull-request/2043' into PHP-7.0
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

8 years agoMerge branch 'PHP-7.1'
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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
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

8 years agofix HANDLE leak
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 19:45:39 +0000 (21:45 +0200)]
fix HANDLE leak

8 years agoMerge branch 'PHP-7.1'
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

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 19:26:13 +0000 (21:26 +0200)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 19:23:20 +0000 (21:23 +0200)]
update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
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

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 19:20:36 +0000 (21:20 +0200)]
update NEWS

8 years agoMerge branch 'PHP-7.1'
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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
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

8 years agoensure null termination
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 19:03:03 +0000 (21:03 +0200)]
ensure null termination

8 years agoMerge branch 'PHP-7.1'
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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
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

8 years agoFixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_v...
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

8 years agoMerge branch 'master' of git.php.net:php-src
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

8 years agoMerge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
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

8 years agoMerge branch 'PHP-7.1'
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.

8 years agoAllow 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.

8 years agoMerge branch 'PHP-7.1'
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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
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

8 years agofix double free
commit | commitdiff | tree
Anatol Belski [Mon, 29 Aug 2016 17:27:47 +0000 (19:27 +0200)]
fix double free

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