granicus.if.org Git

Merge branch 'PHP-7.2'

* PHP-7.2:
Fixed attempt to free invalid structure (result of ROPE_INIT is not a zval)
Revert "Fixed live_range removing (bug can be triggred by JIT)"

commit | commitdiff | tree

Dmitry Stogov [Mon, 14 Aug 2017 09:11:25 +0000 (12:11 +0300)]

Fixed attempt to free invalid structure (result of ROPE_INIT is not a zval)

commit | commitdiff | tree

Dmitry Stogov [Mon, 14 Aug 2017 09:00:30 +0000 (12:00 +0300)]

Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2

* 'PHP-7.2' of git.php.net:php-src:
Revert "Fixed live_range removing (bug can be triggred by JIT)"

commit | commitdiff | tree

Dmitry Stogov [Mon, 14 Aug 2017 09:00:02 +0000 (12:00 +0300)]

Revert "Fixed live_range removing (bug can be triggred by JIT)"

This reverts commit aecf9965100e704339ccc33da6a31eca84c2d926.

commit | commitdiff | tree

Xinchen Hui [Mon, 14 Aug 2017 08:59:14 +0000 (16:59 +0800)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Revert "Fixed live_range removing (bug can be triggred by JIT)"

commit | commitdiff | tree

Xinchen Hui [Mon, 14 Aug 2017 08:59:01 +0000 (16:59 +0800)]

Revert "Fixed live_range removing (bug can be triggred by JIT)"

This reverts commit aecf9965100e704339ccc33da6a31eca84c2d926.

commit | commitdiff | tree

Tianfang Yang [Mon, 14 Aug 2017 04:37:43 +0000 (00:37 -0400)]

Merge branch 'PHP-7.2'

commit | commitdiff | tree

Tianfang Yang [Mon, 14 Aug 2017 04:36:33 +0000 (00:36 -0400)]

Merge branch 'PHP-7.1' into PHP-7.2

commit | commitdiff | tree

Tianfang Yang [Mon, 14 Aug 2017 04:23:41 +0000 (00:23 -0400)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Tianfang Yang [Mon, 14 Aug 2017 03:44:24 +0000 (23:44 -0400)]

Sync OCI8 on PHP 7.x branches

commit | commitdiff | tree

Anatol Belski [Sun, 13 Aug 2017 22:53:33 +0000 (00:53 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Fixed bug #75063

commit | commitdiff | tree

Anatol Belski [Sun, 13 Aug 2017 22:51:47 +0000 (00:51 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Fixed bug #75063

commit | commitdiff | tree

Anatol Belski [Sun, 13 Aug 2017 22:44:19 +0000 (00:44 +0200)]

Fixed bug #75063

commit | commitdiff | tree

Christoph M. Becker [Sun, 13 Aug 2017 19:17:05 +0000 (21:17 +0200)]

Merge branch 'pull-request/2670'

* pull-request/2670:
Change getimagesize() and friends to report image/bmp

commit | commitdiff | tree

Christoph M. Becker [Sun, 13 Aug 2017 19:10:37 +0000 (21:10 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Fixed bug #73793 (WDDX uses wrong decimal seperator)

commit | commitdiff | tree

Christoph M. Becker [Sun, 13 Aug 2017 19:05:18 +0000 (21:05 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Fixed bug #73793 (WDDX uses wrong decimal seperator)

commit | commitdiff | tree

Christoph M. Becker [Sun, 13 Aug 2017 18:53:32 +0000 (20:53 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #73793 (WDDX uses wrong decimal seperator)

commit | commitdiff | tree

Christoph M. Becker [Sun, 13 Aug 2017 18:51:53 +0000 (20:51 +0200)]

Fixed bug #73793 (WDDX uses wrong decimal seperator)

The WDDX specification[1] requires to serialize floats with a decimal
point, but `snprintf()` is locale-dependent and may use a decimal
comma. We fix that afterwards by replacing an eventual comma with a
point.

[1] <http://xml.coverpages.org/wddx0090-dtd-19980928.txt>

commit | commitdiff | tree

Christoph M. Becker [Sun, 13 Aug 2017 16:12:37 +0000 (18:12 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Skip this test if ext/session is not available

commit | commitdiff | tree

Christoph M. Becker [Sun, 13 Aug 2017 16:10:37 +0000 (18:10 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Skip this test if ext/session is not available

commit | commitdiff | tree

Christoph M. Becker [Sun, 13 Aug 2017 16:07:42 +0000 (18:07 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Skip this test if ext/session is not available

commit | commitdiff | tree

Christoph M. Becker [Sun, 13 Aug 2017 16:05:45 +0000 (18:05 +0200)]

Skip this test if ext/session is not available

commit | commitdiff | tree

Nikita Popov [Sat, 12 Aug 2017 18:34:59 +0000 (20:34 +0200)]

Merge branch 'PHP-7.2'

commit | commitdiff | tree

Nikita Popov [Sat, 12 Aug 2017 18:34:44 +0000 (20:34 +0200)]

Note deprecation of $errcontext

commit | commitdiff | tree

Nikita Popov [Sat, 12 Aug 2017 11:17:39 +0000 (13:17 +0200)]

Merge branch 'PHP-7.2'

commit | commitdiff | tree

Nikita Popov [Sat, 12 Aug 2017 11:17:24 +0000 (13:17 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

commit | commitdiff | tree

Nikita Popov [Sat, 12 Aug 2017 11:15:48 +0000 (13:15 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Nikita Popov [Sat, 12 Aug 2017 11:00:39 +0000 (13:00 +0200)]

Fixed bug #74103 and bug #75054

Directly fail unserialization when trying to acquire an r/R
reference to an UNDEF HT slot. Previously this left an UNDEF and
later deleted the index/key from the HT.

What actually caused the issue here is a combination of two
factors: First, the key deletion was performed using the hash API,
rather than the symtable API, such that the element was not actually
removed if it used an integral string key. Second, a subsequent
deletion operation, while collecting trailing UNDEF ranges, would
mark the element as available for reuse (leaving a corrupted HT
state with nNumOfElemnts > nNumUsed).

Fix this by failing early and dropping the deletion code.

commit | commitdiff | tree

Andrea Faulds [Sat, 12 Aug 2017 00:39:27 +0000 (01:39 +0100)]

Merge branch 'PHP-7.2'

commit | commitdiff | tree

Andrea Faulds [Sat, 12 Aug 2017 00:38:21 +0000 (01:38 +0100)]

Merge branch 'PHP-7.1' into PHP-7.2

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

RSS Atom