]> granicus.if.org Git - php/log
php
8 years agoUse SEND_USER for CONST|TMP as well
Nikita Popov [Sun, 25 Sep 2016 10:30:32 +0000 (12:30 +0200)]
Use SEND_USER for CONST|TMP as well

Otherwise we're missing the "expected to be a reference, value
given" warning that appears for ordinary calls to call_user_func().

Also update an UPGRADING note with recent changes wrt
call_user_func().

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 25 Sep 2016 08:49:43 +0000 (10:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 25 Sep 2016 08:46:44 +0000 (10:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix test_image_equals_file() wrt. palette images
Christoph M. Becker [Sun, 25 Sep 2016 08:30:48 +0000 (10:30 +0200)]
Fix test_image_equals_file() wrt. palette images

The recently introduced test_image_equals_file() doesn't properly work for
palette images, because in this case only the palette indexes are compared,
what can lead to false positives and negatives as shown in the added test.

To fix that we convert palette images to truecolor, what is supposed to be
faster than calling imagecolorsforindex() for each pixel.

We furthermore rely on PHP's refcounting to free unused images; after all,
this is not C.

8 years agoFix a couple of ASSIGN_DIM/OBJ inference bugs
Nikita Popov [Sat, 24 Sep 2016 19:26:17 +0000 (21:26 +0200)]
Fix a couple of ASSIGN_DIM/OBJ inference bugs

Account for possible null return values better.

8 years agoAdd range inference for ZEND_STRLEN
Nikita Popov [Sat, 24 Sep 2016 19:03:13 +0000 (21:03 +0200)]
Add range inference for ZEND_STRLEN

On 32-bit systems we conservatively allow negative lengths.
On 64-bit systems, the range could additionally be restricted to
the canonical 48-bit size.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 24 Sep 2016 16:18:34 +0000 (18:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 24 Sep 2016 16:05:21 +0000 (18:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoMerge branch 'pull-request/2120' into PHP-5.6
Christoph M. Becker [Sat, 24 Sep 2016 15:52:15 +0000 (17:52 +0200)]
Merge branch 'pull-request/2120' into PHP-5.6

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 24 Sep 2016 11:22:00 +0000 (13:22 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed bug #73163
Nikita Popov [Sat, 24 Sep 2016 11:18:43 +0000 (13:18 +0200)]
Fixed bug #73163

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 24 Sep 2016 10:46:20 +0000 (12:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 24 Sep 2016 10:39:56 +0000 (12:39 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #73161: imagecreatefromgd2() may leak memory
Christoph M. Becker [Sat, 24 Sep 2016 10:36:54 +0000 (12:36 +0200)]
Fix #73161: imagecreatefromgd2() may leak memory

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 24 Sep 2016 09:36:50 +0000 (11:36 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 24 Sep 2016 09:31:11 +0000 (11:31 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #73159: imagegd2(): unrecognized formats may result in corrupted files
Christoph M. Becker [Sat, 24 Sep 2016 09:28:20 +0000 (11:28 +0200)]
Fix #73159: imagegd2(): unrecognized formats may result in corrupted files

We must not apply the format correction twice for truecolor images.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 24 Sep 2016 08:57:30 +0000 (10:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 24 Sep 2016 08:47:11 +0000 (10:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #73155: imagegd2() writes wrong chunk sizes on boundaries
Christoph M. Becker [Fri, 23 Sep 2016 22:46:35 +0000 (00:46 +0200)]
Fix #73155: imagegd2() writes wrong chunk sizes on boundaries

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 23 Sep 2016 22:37:37 +0000 (00:37 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 23 Sep 2016 22:36:53 +0000 (00:36 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #73157 (again): imagegd2() ignores 3rd param if 4 are given
Christoph M. Becker [Fri, 23 Sep 2016 22:35:24 +0000 (00:35 +0200)]
Fix #73157 (again): imagegd2() ignores 3rd param if 4 are given

Obviously, there was a bad merge.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 23 Sep 2016 22:07:11 +0000 (00:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoupdate NEWS
Adam Baratz [Fri, 23 Sep 2016 21:53:24 +0000 (17:53 -0400)]
update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 23 Sep 2016 21:44:02 +0000 (23:44 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #73157: imagegd2() ignores 3rd param if 4 are given
Christoph M. Becker [Fri, 23 Sep 2016 21:23:45 +0000 (23:23 +0200)]
Fix #73157: imagegd2() ignores 3rd param if 4 are given

We must initialize `q` for *more* than three parameters, too.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 23 Sep 2016 16:48:14 +0000 (18:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 23 Sep 2016 16:46:51 +0000 (18:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"

8 years agoRevert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
Anatol Belski [Fri, 23 Sep 2016 16:45:03 +0000 (18:45 +0200)]
Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"

This reverts commit f9a699f6c3aa7acea922242a0f14731f6b829742.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 23 Sep 2016 16:10:55 +0000 (18:10 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  skip this test for now as it seems to have issues running dev server
  Fixed bug #73037 SoapServer reports Bad Request when gzipped

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 23 Sep 2016 16:10:07 +0000 (18:10 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  skip this test for now as it seems to have issues running dev server
  Fixed bug #73037 SoapServer reports Bad Request when gzipped

8 years agoskip this test for now as it seems to have issues running dev server
Anatol Belski [Fri, 23 Sep 2016 16:07:08 +0000 (18:07 +0200)]
skip this test for now as it seems to have issues running dev server

8 years agoFixed bug #73037 SoapServer reports Bad Request when gzipped
Anatol Belski [Fri, 23 Sep 2016 14:02:50 +0000 (16:02 +0200)]
Fixed bug #73037 SoapServer reports Bad Request when gzipped

(cherry picked from commit 410c68788ae4826807e8ced3f4a02e676142b22a)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 23 Sep 2016 14:26:54 +0000 (16:26 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 23 Sep 2016 14:25:21 +0000 (16:25 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoUpdate NEWS
Christoph M. Becker [Fri, 23 Sep 2016 14:23:58 +0000 (16:23 +0200)]
Update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 23 Sep 2016 14:07:12 +0000 (16:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73037 SoapServer reports Bad Request when gzipped

8 years agoFixed bug #73037 SoapServer reports Bad Request when gzipped
Anatol Belski [Fri, 23 Sep 2016 14:02:50 +0000 (16:02 +0200)]
Fixed bug #73037 SoapServer reports Bad Request when gzipped

8 years agoFix FreeType tests using UTF-8 font file names
Christoph M. Becker [Fri, 23 Sep 2016 13:22:45 +0000 (15:22 +0200)]
Fix FreeType tests using UTF-8 font file names

UTF-8 font file names are not yet supported on Windows[1], so we're skipping
the respective tests on this platform, but enable them on other platforms.

[1] <http://news.php.net/php.internals.win/1142>

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Julien Pauli [Fri, 23 Sep 2016 11:54:22 +0000 (13:54 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap

Conflicts:
sapi/fpm/fpm/fpm_scoreboard.c

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Julien Pauli [Fri, 23 Sep 2016 11:53:22 +0000 (13:53 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap

8 years agoFormatting. Fix possible memory corruption in FPM SHM management
Julien Pauli [Fri, 23 Sep 2016 11:24:31 +0000 (13:24 +0200)]
Formatting. Fix possible memory corruption in FPM SHM management

8 years agofix every work call mmap
tom916 [Fri, 16 Sep 2016 14:37:09 +0000 (22:37 +0800)]
fix every work call mmap

fix fpm_scoreboard_free

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 23 Sep 2016 10:55:13 +0000 (12:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 23 Sep 2016 10:29:37 +0000 (12:29 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoRework FreeType related tests
Christoph M. Becker [Thu, 22 Sep 2016 09:52:10 +0000 (11:52 +0200)]
Rework FreeType related tests

Firstly, there is no fundamental difference between running the tests on
freetype before and after 2.4.10, so we re-join the respective test cases.

Secondly, there are some minor differences in the results depending on
architecture, freetype versions and config options, so we cater to that
by allowing small deviations from the expectations.

8 years agoupdate NEWS
Anatol Belski [Fri, 23 Sep 2016 09:26:03 +0000 (11:26 +0200)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 23 Sep 2016 09:25:33 +0000 (11:25 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS
  phpdbg next command must stop when leaving function

8 years agoupdate NEWS
Anatol Belski [Fri, 23 Sep 2016 09:24:55 +0000 (11:24 +0200)]
update NEWS

8 years agophpdbg next command must stop when leaving function
Bob Weinand [Fri, 23 Sep 2016 01:29:37 +0000 (03:29 +0200)]
phpdbg next command must stop when leaving function

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 22 Sep 2016 23:55:17 +0000 (01:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390

8 years agoFix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390
Anatol Belski [Thu, 22 Sep 2016 23:52:42 +0000 (01:52 +0200)]
Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 22 Sep 2016 15:03:49 +0000 (17:03 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update libs versions
  update libs versions

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Thu, 22 Sep 2016 15:03:12 +0000 (17:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update libs versions

8 years agoupdate libs versions
Anatol Belski [Thu, 22 Sep 2016 15:02:54 +0000 (17:02 +0200)]
update libs versions

8 years agoupdate libs versions
Anatol Belski [Thu, 22 Sep 2016 15:01:02 +0000 (17:01 +0200)]
update libs versions

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 22 Sep 2016 10:50:29 +0000 (12:50 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Thu, 22 Sep 2016 10:48:38 +0000 (12:48 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agofix bug related to #865
Márcio Almada [Mon, 19 Sep 2016 16:42:07 +0000 (12:42 -0400)]
fix bug related to #865

In case USE_KEY flag is active, RegexIterator->accept() should keep it's
old behavior which is to accept keys mapping arrays.

This broke after PHP 5.5 but was not noticed due to lack of tests for USE_KEY.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 22 Sep 2016 10:38:48 +0000 (12:38 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix bug #69579
John Boehr [Thu, 22 Sep 2016 03:09:45 +0000 (20:09 -0700)]
Fix bug #69579

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 22 Sep 2016 10:34:55 +0000 (12:34 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix bug #69579
John Boehr [Thu, 22 Sep 2016 03:09:45 +0000 (20:09 -0700)]
Fix bug #69579

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 22 Sep 2016 10:07:37 +0000 (12:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS

8 years agoupdate NEWS
Anatol Belski [Thu, 22 Sep 2016 10:06:25 +0000 (12:06 +0200)]
update NEWS

8 years agoupdate NEWS
Anatol Belski [Thu, 22 Sep 2016 10:04:37 +0000 (12:04 +0200)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 22 Sep 2016 09:51:39 +0000 (11:51 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73126 Cannot pass parameter 1 by reference

8 years agoFixed bug #73126 Cannot pass parameter 1 by reference
Anatol Belski [Thu, 22 Sep 2016 09:49:35 +0000 (11:49 +0200)]
Fixed bug #73126 Cannot pass parameter 1 by reference

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Adam Baratz [Wed, 21 Sep 2016 20:23:58 +0000 (16:23 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Limit size of result set for test query

8 years agoLimit size of result set for test query
Adam Baratz [Wed, 21 Sep 2016 20:21:33 +0000 (16:21 -0400)]
Limit size of result set for test query

This result set can be very large, depending on the database. This change
ensures this test won't be slow.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Adam Baratz [Wed, 21 Sep 2016 19:15:18 +0000 (15:15 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS
  PHP bug 67130: nextRowset should work with unfetched rows

8 years agoupdate NEWS
Adam Baratz [Wed, 21 Sep 2016 18:29:42 +0000 (14:29 -0400)]
update NEWS

8 years agoPHP bug 67130: nextRowset should work with unfetched rows
Peter LeBrun [Fri, 1 Jul 2016 19:44:06 +0000 (15:44 -0400)]
PHP bug 67130: nextRowset should work with unfetched rows

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Adam Baratz [Wed, 21 Sep 2016 16:02:17 +0000 (12:02 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Move dtor before memory freed to avoid invalid read

8 years agoMove dtor before memory freed to avoid invalid read
Adam Baratz [Wed, 21 Sep 2016 16:00:19 +0000 (12:00 -0400)]
Move dtor before memory freed to avoid invalid read

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Wed, 21 Sep 2016 09:20:35 +0000 (17:20 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed skip

8 years agoFixed skip
Xinchen Hui [Wed, 21 Sep 2016 09:20:02 +0000 (17:20 +0800)]
Fixed skip

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 20 Sep 2016 10:17:06 +0000 (12:17 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoSkip failing FreeType tests for now
Christoph M. Becker [Tue, 20 Sep 2016 10:16:16 +0000 (12:16 +0200)]
Skip failing FreeType tests for now

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Tue, 20 Sep 2016 09:34:58 +0000 (12:34 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply()

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Dmitry Stogov [Tue, 20 Sep 2016 09:34:40 +0000 (12:34 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply()

8 years agoFixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash...
Dmitry Stogov [Tue, 20 Sep 2016 09:29:57 +0000 (12:29 +0300)]
Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply()

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Mon, 19 Sep 2016 23:32:32 +0000 (01:32 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 19 Sep 2016 23:25:08 +0000 (01:25 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoMerge branch 'pull-request/1845' into PHP-5.6
Christoph M. Becker [Mon, 19 Sep 2016 23:05:57 +0000 (01:05 +0200)]
Merge branch 'pull-request/1845' into PHP-5.6

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
George Wang [Mon, 19 Sep 2016 14:50:21 +0000 (10:50 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
George Wang [Mon, 19 Sep 2016 14:49:26 +0000 (10:49 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix wrong year in previous commit.
George Wang [Mon, 19 Sep 2016 14:46:46 +0000 (10:46 -0400)]
Fix wrong year in previous commit.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Julien Pauli [Mon, 19 Sep 2016 14:12:33 +0000 (16:12 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Do not wrap user exception in case of custom JSON serialization

Conflicts:
ext/json/json_encoder.c

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Julien Pauli [Mon, 19 Sep 2016 14:08:37 +0000 (16:08 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Do not wrap user exception in case of custom JSON serialization

Conflicts:
ext/json/json.c

8 years agoDo not wrap user exception in case of custom JSON serialization
Julien Pauli [Mon, 19 Sep 2016 14:06:12 +0000 (16:06 +0200)]
Do not wrap user exception in case of custom JSON serialization

8 years agoUpdated NEWS
Julien Pauli [Mon, 19 Sep 2016 13:20:22 +0000 (15:20 +0200)]
Updated NEWS

8 years agoFix 73113 - Segfault with throwing JsonSerializable
Julien Pauli [Mon, 19 Sep 2016 13:01:54 +0000 (15:01 +0200)]
Fix 73113 - Segfault with throwing JsonSerializable

8 years agowhen needle is short, Sunday algorithm is slower than glibc memchr()
TAKEKOSHI Akishige [Sun, 18 Sep 2016 06:46:40 +0000 (15:46 +0900)]
when needle is short, Sunday algorithm is slower than glibc memchr()

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 17 Sep 2016 20:56:02 +0000 (22:56 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoAdd test for bug #72489
Nikita Popov [Sat, 17 Sep 2016 20:54:25 +0000 (22:54 +0200)]
Add test for bug #72489

8 years agoMake zval_ptr_dtor / _zval_dtor_func more robust
Nikita Popov [Fri, 22 Apr 2016 15:48:35 +0000 (17:48 +0200)]
Make zval_ptr_dtor / _zval_dtor_func more robust

In particular, allow arrays with refcount>1, like we already allow
for all other types. _zval_dtor_func is now the same as
_zval_dtor_func_for_ptr with an extra refcount decrement check at
the start. At this point we might as well drop it...

Cherry-pick of ded69ee6e6039d56ee7b65b1a578ed1e3d1859da from
PHP-7.1.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 16 Sep 2016 21:49:10 +0000 (23:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 16 Sep 2016 21:42:48 +0000 (23:42 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0