]>
granicus.if.org Git - php/log
Anatol Belski [Tue, 17 Oct 2017 13:38:01 +0000 (15:38 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
One more folder to delete in AppVeyor image
Anatol Belski [Tue, 17 Oct 2017 13:37:23 +0000 (15:37 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
One more folder to delete in AppVeyor image
Anatol Belski [Tue, 17 Oct 2017 13:34:42 +0000 (15:34 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
One more folder to delete in AppVeyor image
Anatol Belski [Tue, 17 Oct 2017 13:32:47 +0000 (15:32 +0200)]
One more folder to delete in AppVeyor image
Xinchen Hui [Tue, 17 Oct 2017 11:47:40 +0000 (19:47 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug (assertion fails with extended info generated)
Xinchen Hui [Tue, 17 Oct 2017 11:47:29 +0000 (19:47 +0800)]
Fixed bug (assertion fails with extended info generated)
Dmitry Stogov [Tue, 17 Oct 2017 10:45:46 +0000 (13:45 +0300)]
Added test
Dmitry Stogov [Tue, 17 Oct 2017 10:35:59 +0000 (13:35 +0300)]
Make assertions in DO_ICALL and CALL_TRAMPOLINE to be consistent with DO_FCALL.
Dmitry Stogov [Tue, 17 Oct 2017 10:25:19 +0000 (13:25 +0300)]
Revert "Allow internal functions to return values by reference (this was disabled in implementation of DO_ICALL, but enabled in DO_FCALL)."
This reverts commit
da781a5ac2cb9d2f983ef9fe070900664db12c67 .
Dmitry Stogov [Tue, 17 Oct 2017 08:50:34 +0000 (11:50 +0300)]
Allow internal functions to return values by reference (this was disabled in implementation of DO_ICALL, but enabled in DO_FCALL).
However, don't require internal functions returning by reference to return a reference.
Mark unserialize() as returning by reference and remove unwrap_reference hack, to allow proper returning of self referenced arrays using a reference.
Currently unserialize() is the only internal function that may return a reference.
Xinchen Hui [Tue, 17 Oct 2017 04:20:48 +0000 (12:20 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed test
Xinchen Hui [Tue, 17 Oct 2017 04:20:25 +0000 (12:20 +0800)]
Fixed test
Xinchen Hui [Tue, 17 Oct 2017 03:35:57 +0000 (11:35 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Try to fix test
Xinchen Hui [Tue, 17 Oct 2017 03:35:40 +0000 (11:35 +0800)]
Try to fix test
Tianfang Yang [Mon, 16 Oct 2017 23:28:50 +0000 (19:28 -0400)]
Merge branch 'PHP-7.2'
Tianfang Yang [Mon, 16 Oct 2017 23:25:53 +0000 (19:25 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
Tianfang Yang [Mon, 16 Oct 2017 23:21:44 +0000 (19:21 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
Tianfang Yang [Mon, 16 Oct 2017 23:20:24 +0000 (19:20 -0400)]
Fixed valgrind issue
Tianfang Yang [Mon, 16 Oct 2017 23:16:30 +0000 (19:16 -0400)]
Fixed valgrind issue
Dmitry Stogov [Mon, 16 Oct 2017 16:20:16 +0000 (19:20 +0300)]
Reuse interned strings from opcache SHM, if possible.
Anatol Belski [Mon, 16 Oct 2017 16:08:09 +0000 (18:08 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Move to next binary SDK version for AppVeyor
Anatol Belski [Mon, 16 Oct 2017 16:07:41 +0000 (18:07 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Move to next binary SDK version for AppVeyor
Anatol Belski [Mon, 16 Oct 2017 16:06:38 +0000 (18:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Move to next binary SDK version for AppVeyor
Anatol Belski [Mon, 16 Oct 2017 16:05:56 +0000 (18:05 +0200)]
Move to next binary SDK version for AppVeyor
Dmitry Stogov [Mon, 16 Oct 2017 16:02:46 +0000 (19:02 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
Dmitry Stogov [Mon, 16 Oct 2017 16:02:22 +0000 (19:02 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
Dmitry Stogov [Mon, 16 Oct 2017 16:02:07 +0000 (19:02 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
Dmitry Stogov [Mon, 16 Oct 2017 16:00:12 +0000 (19:00 +0300)]
Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
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)
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
Xinchen Hui [Mon, 16 Oct 2017 11:07:34 +0000 (19:07 +0800)]
Fixed bug #75378 ([REGRESSION] IntlDateFormatter::parse() does not change $position argument)
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")
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")
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")
Jakub Zelenka [Mon, 16 Oct 2017 08:55:18 +0000 (09:55 +0100)]
Merge branch 'PHP-7.2'
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
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)
Xinchen Hui [Mon, 16 Oct 2017 06:19:37 +0000 (14:19 +0800)]
Fixed bug (Phi sources removel)
Jakub Zelenka [Sun, 15 Oct 2017 19:33:49 +0000 (20:33 +0100)]
Merge branch 'PHP-7.2'
Jakub Zelenka [Sun, 15 Oct 2017 19:33:22 +0000 (20:33 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Sun, 15 Oct 2017 19:31:25 +0000 (20:31 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Sun, 15 Oct 2017 19:25:58 +0000 (20:25 +0100)]
Properly fix #75363 and address some other leaks with cert
Jakub Zelenka [Sun, 15 Oct 2017 18:37:22 +0000 (19:37 +0100)]
Merge branch 'PHP-7.2'
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)
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.
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)
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)
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)
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.
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)
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)
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)
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.
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)
Xinchen Hui [Sun, 15 Oct 2017 02:29:40 +0000 (10:29 +0800)]
Update NEWS
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)
Xinchen Hui [Sun, 15 Oct 2017 02:29:10 +0000 (10:29 +0800)]
Update NEWS
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)
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)
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)
Xinchen Hui [Sat, 14 Oct 2017 15:12:29 +0000 (23:12 +0800)]
Fixed bug #75357 (segfault loading WordPress wp-admin)
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)
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)
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)
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)
Dmitry Stogov [Fri, 13 Oct 2017 10:56:06 +0000 (13:56 +0300)]
Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)
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
Xinchen Hui [Fri, 13 Oct 2017 10:23:56 +0000 (18:23 +0800)]
Prevent from being affected by local php.ini
Xinchen Hui [Fri, 13 Oct 2017 10:21:41 +0000 (18:21 +0800)]
Added skipf
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
Xinchen Hui [Fri, 13 Oct 2017 10:18:10 +0000 (18:18 +0800)]
Fixed bug #75370 (Webserver hangs on valid PHP text)
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.
Xinchen Hui [Fri, 13 Oct 2017 09:35:02 +0000 (17:35 +0800)]
Fixed typo
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.
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>
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.
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)
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>
Bob Weinand [Thu, 12 Oct 2017 10:32:49 +0000 (12:32 +0200)]
Merge branch 'PHP-7.2'
Bob Weinand [Thu, 12 Oct 2017 10:32:30 +0000 (12:32 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Bob Weinand [Thu, 12 Oct 2017 10:31:20 +0000 (12:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Thu, 12 Oct 2017 10:30:20 +0000 (12:30 +0200)]
Fixed bug #75363 (openssl_x509_parse leaks memory)
Dmitry Stogov [Thu, 12 Oct 2017 08:54:40 +0000 (11:54 +0300)]
Small improvement with zend_memnstr (tianhe1986)
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
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
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
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
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
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
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
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
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
Anatol Belski [Wed, 11 Oct 2017 17:02:51 +0000 (19:02 +0200)]
[ci skip] update NEWS
Anatol Belski [Wed, 11 Oct 2017 17:00:41 +0000 (19:00 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Cleanup irrelevant info
Anatol Belski [Wed, 11 Oct 2017 16:40:16 +0000 (18:40 +0200)]
Cleanup irrelevant info
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
Anatol Belski [Wed, 11 Oct 2017 16:18:55 +0000 (18:18 +0200)]
Upgrade bundled libmagic to 5.31
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
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
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