granicus.if.org Git

Xinchen Hui [Mon, 16 Oct 2017 11:09:13 +0000 (19:09 +0800)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Fixed bug #75378 ([REGRESSION] IntlDateFormatter::parse() does not change $position argument)

commit | commitdiff | tree

Xinchen Hui [Mon, 16 Oct 2017 11:07:55 +0000 (19:07 +0800)]

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

* 'PHP-7.2' of git.php.net:/php-src:
[ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")
Properly fix #75363 and address some other leaks with cert

commit | commitdiff | tree

Xinchen Hui [Mon, 16 Oct 2017 11:07:34 +0000 (19:07 +0800)]

Fixed bug #75378 ([REGRESSION] IntlDateFormatter::parse() does not change $position argument)

commit | commitdiff | tree

Christoph M. Becker [Mon, 16 Oct 2017 09:13:05 +0000 (11:13 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
[ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")

commit | commitdiff | tree

Christoph M. Becker [Mon, 16 Oct 2017 09:12:17 +0000 (11:12 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
[ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")

commit | commitdiff | tree

Christoph M. Becker [Mon, 16 Oct 2017 09:11:34 +0000 (11:11 +0200)]

[ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")

commit | commitdiff | tree

Jakub Zelenka [Mon, 16 Oct 2017 08:55:18 +0000 (09:55 +0100)]

Merge branch 'PHP-7.2'

commit | commitdiff | tree

Jakub Zelenka [Mon, 16 Oct 2017 08:54:03 +0000 (09:54 +0100)]

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

commit | commitdiff | tree

Xinchen Hui [Mon, 16 Oct 2017 07:23:02 +0000 (15:23 +0800)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Fixed bug (Phi sources removel)

commit | commitdiff | tree

Xinchen Hui [Mon, 16 Oct 2017 06:19:37 +0000 (14:19 +0800)]

Fixed bug (Phi sources removel)

commit | commitdiff | tree

Jakub Zelenka [Sun, 15 Oct 2017 19:33:49 +0000 (20:33 +0100)]

Merge branch 'PHP-7.2'

commit | commitdiff | tree

Jakub Zelenka [Sun, 15 Oct 2017 19:33:22 +0000 (20:33 +0100)]

Merge branch 'PHP-7.1' into PHP-7.2

commit | commitdiff | tree

Jakub Zelenka [Sun, 15 Oct 2017 19:31:25 +0000 (20:31 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Jakub Zelenka [Sun, 15 Oct 2017 19:25:58 +0000 (20:25 +0100)]

Properly fix #75363 and address some other leaks with cert

commit | commitdiff | tree

Jakub Zelenka [Sun, 15 Oct 2017 18:37:22 +0000 (19:37 +0100)]

Merge branch 'PHP-7.2'

commit | commitdiff | tree

Jakub Zelenka [Sun, 15 Oct 2017 18:36:15 +0000 (19:36 +0100)]

Fix bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key)

commit | commitdiff | tree

Peter Kokot [Sun, 8 Oct 2017 22:44:56 +0000 (00:44 +0200)]

Remove PHP code examples from xmlwriter extension

PHP documentation can present PHP code examples better instead.

commit | commitdiff | tree

Christoph M. Becker [Sun, 15 Oct 2017 12:08:03 +0000 (14:08 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)

commit | commitdiff | tree

Christoph M. Becker [Sun, 15 Oct 2017 12:03:24 +0000 (14:03 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)

commit | commitdiff | tree

Christoph M. Becker [Sun, 15 Oct 2017 11:58:20 +0000 (13:58 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)

commit | commitdiff | tree

Jelle van der Waa [Mon, 9 Oct 2017 18:35:53 +0000 (20:35 +0200)]

Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)

enchant_broker_get_dict_path segfaults when the dict path is not setup,
instead of segfaulting return false instead.

commit | commitdiff | tree

Christoph M. Becker [Sun, 15 Oct 2017 11:36:25 +0000 (13:36 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Fixed bug #75365 (Enchant still reports version 1.1.0)

commit | commitdiff | tree

Christoph M. Becker [Sun, 15 Oct 2017 11:31:30 +0000 (13:31 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Fixed bug #75365 (Enchant still reports version 1.1.0)

commit | commitdiff | tree

Christoph M. Becker [Sun, 15 Oct 2017 11:21:37 +0000 (13:21 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #75365 (Enchant still reports version 1.1.0)

commit | commitdiff | tree

Christoph M. Becker [Thu, 12 Oct 2017 13:37:47 +0000 (15:37 +0200)]

Fixed bug #75365 (Enchant still reports version 1.1.0)

Since Enchant is bundled, we make `PHP_ENCHANT_VERSION` an alias of
`PHP_VERSION` and also drop the rather meaningless revision hash from
the PHP info.

commit | commitdiff | tree

Xinchen Hui [Sun, 15 Oct 2017 02:29:56 +0000 (10:29 +0800)]

Merge branch 'PHP-7.2'

* PHP-7.2:
  Update NEWS
  Update NEWS
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)

commit | commitdiff | tree

Xinchen Hui [Sun, 15 Oct 2017 02:29:40 +0000 (10:29 +0800)]

commit | commitdiff | tree

Xinchen Hui [Sun, 15 Oct 2017 02:29:28 +0000 (10:29 +0800)]

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Update NEWS
Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)

commit | commitdiff | tree

Xinchen Hui [Sun, 15 Oct 2017 02:29:10 +0000 (10:29 +0800)]

commit | commitdiff | tree

Xinchen Hui [Sun, 15 Oct 2017 02:28:46 +0000 (10:28 +0800)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)

commit | commitdiff | tree

Xinchen Hui [Sun, 15 Oct 2017 02:28:28 +0000 (10:28 +0800)]

Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)

commit | commitdiff | tree

Xinchen Hui [Sat, 14 Oct 2017 15:12:48 +0000 (23:12 +0800)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Fixed bug #75357 (segfault loading WordPress wp-admin)

commit | commitdiff | tree

Xinchen Hui [Sat, 14 Oct 2017 15:12:29 +0000 (23:12 +0800)]

Fixed bug #75357 (segfault loading WordPress wp-admin)

commit | commitdiff | tree

Dmitry Stogov [Fri, 13 Oct 2017 12:53:11 +0000 (15:53 +0300)]

Fixed unzserialize(), to disable creation of unsupported data structures through manually crafted strings. (Dmitry)

commit | commitdiff | tree

Dmitry Stogov [Fri, 13 Oct 2017 11:02:16 +0000 (14:02 +0300)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)

commit | commitdiff | tree

Dmitry Stogov [Fri, 13 Oct 2017 11:00:21 +0000 (14:00 +0300)]

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)

commit | commitdiff | tree

Dmitry Stogov [Fri, 13 Oct 2017 10:56:23 +0000 (13:56 +0300)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)

commit | commitdiff | tree

Dmitry Stogov [Fri, 13 Oct 2017 10:56:06 +0000 (13:56 +0300)]

Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)

commit | commitdiff | tree

Xinchen Hui [Fri, 13 Oct 2017 10:24:27 +0000 (18:24 +0800)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Prevent from being affected by local php.ini
Added skipf

commit | commitdiff | tree

Xinchen Hui [Fri, 13 Oct 2017 10:23:56 +0000 (18:23 +0800)]

Prevent from being affected by local php.ini

commit | commitdiff | tree

Xinchen Hui [Fri, 13 Oct 2017 10:21:41 +0000 (18:21 +0800)]

commit | commitdiff | tree

Xinchen Hui [Fri, 13 Oct 2017 10:19:19 +0000 (18:19 +0800)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Fixed bug #75370 (Webserver hangs on valid PHP text)
Fixed typo

commit | commitdiff | tree

Xinchen Hui [Fri, 13 Oct 2017 10:18:10 +0000 (18:18 +0800)]

Fixed bug #75370 (Webserver hangs on valid PHP text)

commit | commitdiff | tree

Nikita Popov [Fri, 13 Oct 2017 09:59:28 +0000 (11:59 +0200)]

Fix gc_032.phpt

Use var_dump instead of debug_zval_dump. The refcounts are not
important for this test and change depending on whether opcache
is loaded or not.

commit | commitdiff | tree

Xinchen Hui [Fri, 13 Oct 2017 09:35:02 +0000 (17:35 +0800)]

commit | commitdiff | tree

Dmitry Stogov [Fri, 13 Oct 2017 08:39:42 +0000 (11:39 +0300)]

Merge branch 'develop_operators' of github.com:tianhe1986/php-src

* 'develop_operators' of github.com:tianhe1986/php-src:
`memcmp` begins from the second char.

commit | commitdiff | tree

tianhe1986 [Thu, 12 Oct 2017 14:46:26 +0000 (22:46 +0800)]

`memcmp` begins from the second char.

Signed-off-by: tianhe1986 <w1s2j3229@163.com>

commit | commitdiff | tree

Dmitry Stogov [Thu, 12 Oct 2017 13:23:45 +0000 (16:23 +0300)]

PHP must not create circular arrays when element is assigned by value.

commit | commitdiff | tree

Christoph M. Becker [Thu, 12 Oct 2017 10:52:58 +0000 (12:52 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Fixed bug #75221 (Argon2i always throws NUL at the end)

commit | commitdiff | tree

Christoph M. Becker [Mon, 18 Sep 2017 16:09:53 +0000 (18:09 +0200)]

Fixed bug #75221 (Argon2i always throws NUL at the end)

Apparently, `argon2_encodedlen()` also counts the terminating NUL byte;
that doesn't appear to be documented somewhere, but from looking at the
implementation[1] it is pretty obvious. Therefore, the respective
`zend_string` has to be one byte shorter.

[1] <https://github.com/P-H-C/phc-winner-argon2/blob/20161029/src/argon2.c#L431-L436>

commit | commitdiff | tree

Bob Weinand [Thu, 12 Oct 2017 10:32:49 +0000 (12:32 +0200)]

Merge branch 'PHP-7.2'

commit | commitdiff | tree

Bob Weinand [Thu, 12 Oct 2017 10:32:30 +0000 (12:32 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

commit | commitdiff | tree

Bob Weinand [Thu, 12 Oct 2017 10:31:20 +0000 (12:31 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Bob Weinand [Thu, 12 Oct 2017 10:30:20 +0000 (12:30 +0200)]

Fixed bug #75363 (openssl_x509_parse leaks memory)

commit | commitdiff | tree

Dmitry Stogov [Thu, 12 Oct 2017 08:54:40 +0000 (11:54 +0300)]

Small improvement with zend_memnstr (tianhe1986)

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 20:26:09 +0000 (22:26 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
It looks like i should've taken joint response on ext/fileinfo long ago

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 20:25:27 +0000 (22:25 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
It looks like i should've taken joint response on ext/fileinfo long ago

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 20:24:52 +0000 (22:24 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
It looks like i should've taken joint response on ext/fileinfo long ago

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 20:21:34 +0000 (22:21 +0200)]

It looks like i should've taken joint response on ext/fileinfo long ago

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 18:32:28 +0000 (20:32 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Put php-sdk-2.0.12beta1 for AppVeyor

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 18:31:58 +0000 (20:31 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Put php-sdk-2.0.12beta1 for AppVeyor

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 18:30:40 +0000 (20:30 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Put php-sdk-2.0.12beta1 for AppVeyor

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 18:27:27 +0000 (20:27 +0200)]

Put php-sdk-2.0.12beta1 for AppVeyor

Quite some tool upgrades there, especially re2c 1.0.2

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 17:03:24 +0000 (19:03 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
[ci skip] update NEWS

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 17:02:51 +0000 (19:02 +0200)]

[ci skip] update NEWS

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 17:00:41 +0000 (19:00 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Cleanup irrelevant info

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 16:40:16 +0000 (18:40 +0200)]

Cleanup irrelevant info

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 16:24:29 +0000 (18:24 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Upgrade bundled libmagic to 5.31

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 16:18:55 +0000 (18:18 +0200)]

Upgrade bundled libmagic to 5.31

commit | commitdiff | tree

Christoph M. Becker [Wed, 11 Oct 2017 15:40:12 +0000 (17:40 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Fix Bug #75299 Wrong reflection on inflate_init and inflate_add

commit | commitdiff | tree

Christoph M. Becker [Wed, 11 Oct 2017 15:30:17 +0000 (17:30 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Fix Bug #75299 Wrong reflection on inflate_init and inflate_add

commit | commitdiff | tree

Christoph M. Becker [Wed, 11 Oct 2017 15:29:02 +0000 (17:29 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fix Bug #75299 Wrong reflection on inflate_init and inflate_add

commit | commitdiff | tree

Christoph M. Becker [Wed, 11 Oct 2017 15:05:53 +0000 (17:05 +0200)]

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

* pull-request/2798:
Fix Bug #75299 Wrong reflection on inflate_init and inflate_add

commit | commitdiff | tree

Christoph M. Becker [Wed, 11 Oct 2017 13:27:56 +0000 (15:27 +0200)]

Test requires mbstring – skip if not available

commit | commitdiff | tree

Christoph M. Becker [Wed, 11 Oct 2017 13:01:23 +0000 (15:01 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Use PHP_VERSION for exif

commit | commitdiff | tree

Christoph M. Becker [Wed, 11 Oct 2017 12:44:19 +0000 (14:44 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Use PHP_VERSION for exif

commit | commitdiff | tree

Christoph M. Becker [Wed, 11 Oct 2017 12:43:30 +0000 (14:43 +0200)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Use PHP_VERSION for exif

commit | commitdiff | tree

Christoph M. Becker [Wed, 11 Oct 2017 12:42:02 +0000 (14:42 +0200)]

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

* pull-request/2799:
Use PHP_VERSION for exif

commit | commitdiff | tree

Christoph M. Becker [Wed, 11 Oct 2017 12:38:59 +0000 (14:38 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
bump version

commit | commitdiff | tree

Christoph M. Becker [Wed, 11 Oct 2017 12:38:12 +0000 (14:38 +0200)]

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
bump version

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 07:00:32 +0000 (09:00 +0200)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Fix datatype

commit | commitdiff | tree

Anatol Belski [Wed, 11 Oct 2017 06:58:59 +0000 (08:58 +0200)]

commit | commitdiff | tree

Dmitry Stogov [Tue, 10 Oct 2017 16:37:46 +0000 (19:37 +0300)]

Fixed file_cache broken by recent AST related changes.

commit | commitdiff | tree

Dmitry Stogov [Tue, 10 Oct 2017 16:37:40 +0000 (19:37 +0300)]

Merge branch 'PHP-7.2'

* PHP-7.2:
Fixed cleanup after optimization passes

commit | commitdiff | tree

Dmitry Stogov [Tue, 10 Oct 2017 16:25:51 +0000 (19:25 +0300)]

Fixed cleanup after optimization passes

commit | commitdiff | tree

Sara Golemon [Tue, 10 Oct 2017 15:58:01 +0000 (11:58 -0400)]

Merge branch 'PHP-7.2'

* PHP-7.2:
  Revert "Update NEWS for PHP 7.2.0RC4"
  Revert "Update NEWS for 7.2.0RC5"
  Update NEWS for 7.2.0RC5
  Update NEWS for PHP 7.2.0RC4

commit | commitdiff | tree

Sara Golemon [Tue, 10 Oct 2017 15:55:50 +0000 (11:55 -0400)]

Revert "Update NEWS for PHP 7.2.0RC4"

This reverts commit 1ea657c65e64d8338e47ead04cfe64c88bf47f2c.

commit | commitdiff | tree

Sara Golemon [Tue, 10 Oct 2017 15:55:41 +0000 (11:55 -0400)]

Revert "Update NEWS for 7.2.0RC5"

This reverts commit ef25e56ae6a9df1d8fe409707c208d71c067f285.

commit | commitdiff | tree

Sara Golemon [Tue, 10 Oct 2017 15:49:16 +0000 (15:49 +0000)]

Update NEWS for 7.2.0RC5

commit | commitdiff | tree

Sara Golemon [Tue, 10 Oct 2017 15:27:31 +0000 (15:27 +0000)]

Update NEWS for PHP 7.2.0RC4