]>
granicus.if.org Git - php/log
Dmitry Stogov [Mon, 5 Mar 2018 23:47:01 +0000 (02:47 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Replaced usafe reference from SHM to process memory with SHM to SHM reference.
Dmitry Stogov [Mon, 5 Mar 2018 23:43:26 +0000 (02:43 +0300)]
Replaced usafe reference from SHM to process memory with SHM to SHM reference.
Dmitry Stogov [Mon, 5 Mar 2018 22:00:14 +0000 (01:00 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup(). Keeping pointer to a function in SHM is not safe because of ASLR.
Dmitry Stogov [Mon, 5 Mar 2018 21:56:16 +0000 (00:56 +0300)]
Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup().
Keeping pointer to a function in SHM is not safe because of ASLR.
Dmitry Stogov [Mon, 5 Mar 2018 21:47:40 +0000 (00:47 +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:
Fixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD
Dmitry Stogov [Mon, 5 Mar 2018 21:46:40 +0000 (00:46 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed invalid destructor
Dmitry Stogov [Mon, 5 Mar 2018 21:46:19 +0000 (00:46 +0300)]
Fixed invalid destructor
Anatol Belski [Mon, 5 Mar 2018 21:38:03 +0000 (22:38 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD
Anatol Belski [Mon, 5 Mar 2018 21:35:58 +0000 (22:35 +0100)]
Fixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD
Dmitry Stogov [Mon, 5 Mar 2018 20:33:53 +0000 (23:33 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed invalid destructor
Dmitry Stogov [Mon, 5 Mar 2018 20:33:08 +0000 (23:33 +0300)]
Fixed invalid destructor
Nikita Popov [Mon, 5 Mar 2018 14:32:39 +0000 (15:32 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Mon, 5 Mar 2018 14:28:58 +0000 (15:28 +0100)]
Revert "Fixed bug #75961 (Strange references behavior)"
This reverts commit
94e9d0a2ae76bad712495d820d3962e401085fef .
This code needs to be mindful about modifications to the array
happening during callback execution. It was written in a way that
only accessed the reference, which is guaranteed not to move. The
changed implementation instead accesses the array slot, leading to
use-after-free.
Run ext/standard/tests/array/bug61967.phpt under valgrind to see
the issue.
Anatol Belski [Mon, 5 Mar 2018 14:21:31 +0000 (15:21 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Include username into the file cache path
Anatol Belski [Mon, 5 Mar 2018 14:16:55 +0000 (15:16 +0100)]
Include username into the file cache path
Dmitry Stogov [Mon, 5 Mar 2018 13:15:38 +0000 (16:15 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed "opcache.file_cache_fallback" mode.
Dmitry Stogov [Mon, 5 Mar 2018 13:01:43 +0000 (16:01 +0300)]
Fixed "opcache.file_cache_fallback" mode.
It's not safe to change value of ZCG(accel_directives).file_cache_only, becuse it might be altered by INI subsystem.
Use global variable instead.
Christoph M. Becker [Fri, 2 Mar 2018 16:18:45 +0000 (17:18 +0100)]
Fix #76041: null pointer access crashed php
We must not draw anti-aliased lines on palette images, because that is
not supported by `gdImageSetAAPixelColor()` and it wouldn't make much
sense to support it, due to the limitation to at most 256 colors.
Anatol Belski [Thu, 1 Mar 2018 11:12:11 +0000 (12:12 +0100)]
Remove TSRMLS_*
Joe Watkins [Wed, 28 Feb 2018 11:23:08 +0000 (12:23 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
fix news date
Joe Watkins [Wed, 28 Feb 2018 11:10:58 +0000 (12:10 +0100)]
fix news date
Xinchen Hui [Wed, 28 Feb 2018 10:07:05 +0000 (18:07 +0800)]
Update NEWS
Xinchen Hui [Wed, 28 Feb 2018 10:06:49 +0000 (18:06 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76025 (Segfault while throwing exception in error_handler).
Xinchen Hui [Wed, 28 Feb 2018 10:06:37 +0000 (18:06 +0800)]
Fixed bug #76025 (Segfault while throwing exception in error_handler).
George Wang [Wed, 28 Feb 2018 04:33:36 +0000 (23:33 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2
George Wang [Wed, 28 Feb 2018 04:31:43 +0000 (23:31 -0500)]
revert last change, for PHP7 no need to do strlen() + 1 for hash look up.
George Wang [Wed, 28 Feb 2018 04:21:04 +0000 (23:21 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2
George Wang [Wed, 28 Feb 2018 04:18:51 +0000 (23:18 -0500)]
[BUGFIX] calling php_ini_activate_per_host_config() with correct name length.
Bob Weinand [Wed, 28 Feb 2018 01:35:44 +0000 (02:35 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Bob Weinand [Wed, 28 Feb 2018 01:13:28 +0000 (02:13 +0100)]
Fix pcntl build on mac
Apparently on mac WIF*(x) macros resolve to (*(int*)&x) (_W_INT macro in sys/wait.h), forcing the value to be a lvalue
Ferenc Kovacs [Tue, 27 Feb 2018 23:05:10 +0000 (00:05 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Ferenc Kovacs [Tue, 27 Feb 2018 23:02:48 +0000 (00:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Tue, 27 Feb 2018 23:00:12 +0000 (00:00 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Tue, 27 Feb 2018 22:57:06 +0000 (23:57 +0100)]
5.6.35 is next
George Wang [Tue, 27 Feb 2018 18:56:19 +0000 (13:56 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2
George Wang [Tue, 27 Feb 2018 18:54:28 +0000 (13:54 -0500)]
release LiteSpeed SAPI 7.0.
add CRIU support.
add support for [PATH=] and [HOST=] sections in php.ini
Anatol Belski [Tue, 27 Feb 2018 10:51:10 +0000 (11:51 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
7.0.29 next
Anatol Belski [Tue, 27 Feb 2018 10:50:22 +0000 (11:50 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
7.0.29 next
Anatol Belski [Tue, 27 Feb 2018 10:48:49 +0000 (11:48 +0100)]
7.0.29 next
Anatol Belski [Tue, 27 Feb 2018 10:39:19 +0000 (11:39 +0100)]
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Feb 2018 10:38:23 +0000 (11:38 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Feb 2018 10:37:24 +0000 (11:37 +0100)]
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Feb 2018 10:34:13 +0000 (11:34 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Feb 2018 10:33:40 +0000 (11:33 +0100)]
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Feb 2018 10:32:26 +0000 (11:32 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Feb 2018 10:31:37 +0000 (11:31 +0100)]
[ci skip] Update NEWS
Stanislav Malyshev [Tue, 27 Feb 2018 06:26:55 +0000 (22:26 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 27 Feb 2018 06:26:50 +0000 (22:26 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 27 Feb 2018 06:26:26 +0000 (22:26 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 20 Feb 2018 23:34:43 +0000 (15:34 -0800)]
Fix bug #75981: prevent reading beyond buffer start
Christoph M. Becker [Sat, 24 Feb 2018 22:38:37 +0000 (23:38 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Christoph M. Becker [Sat, 24 Feb 2018 22:37:43 +0000 (23:37 +0100)]
[ci skip] Update NEWS
Christoph M. Becker [Sat, 24 Feb 2018 10:31:22 +0000 (11:31 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix imagesetinterpolation arginfo
Gabriel Caruso [Sat, 24 Feb 2018 00:33:03 +0000 (21:33 -0300)]
Fix imagesetinterpolation arginfo
imagesetinterpolation only requires one parameter.
Stanislav Malyshev [Sat, 24 Feb 2018 01:57:57 +0000 (17:57 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Set FPM maintainership
Stanislav Malyshev [Sat, 24 Feb 2018 01:57:50 +0000 (17:57 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] Set FPM maintainership
Stanislav Malyshev [Sat, 24 Feb 2018 01:57:26 +0000 (17:57 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
[ci skip] Set FPM maintainership
Stanislav Malyshev [Sat, 24 Feb 2018 00:43:10 +0000 (16:43 -0800)]
[ci skip] Set FPM maintainership
As per http://news.php.net/php.internals/101897, Jakub is officially
annointed as new FPM maintainer.
Christoph M. Becker [Fri, 23 Feb 2018 22:51:15 +0000 (23:51 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #75873: pcntl_wexitstatus returns incorrect on Big_Endian platform (s390x)
Sam Ding [Fri, 23 Feb 2018 15:11:18 +0000 (10:11 -0500)]
Fix #75873: pcntl_wexitstatus returns incorrect on Big_Endian platform (s390x)
Cf. https://github.com/php/php-src/pull/3141.
Christoph M. Becker [Fri, 23 Feb 2018 10:28:16 +0000 (11:28 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix some arginfos
Gabriel Caruso [Wed, 21 Feb 2018 04:04:41 +0000 (01:04 -0300)]
Fix some arginfos
* all arguments for ftp_pasv are required
* $varname for getenv function isn't required anymore
* fsockopen and pfsockopen only require $hostname
* strtok can work with only one parameter
* strpbrk needs two parameters to work
* required parameters and add some parameters in openssl_* functions
Johannes Schlüter [Tue, 20 Feb 2018 22:32:25 +0000 (23:32 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Johannes Schlüter [Tue, 20 Feb 2018 22:32:05 +0000 (23:32 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Johannes Schlüter [Tue, 20 Feb 2018 22:31:30 +0000 (23:31 +0100)]
Fix NEWS
Johannes Schlüter [Tue, 20 Feb 2018 22:28:23 +0000 (23:28 +0100)]
Fix a memleak with mysqlnd and SSL
Johannes Schlüter [Tue, 20 Feb 2018 22:20:28 +0000 (23:20 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Johannes Schlüter [Tue, 20 Feb 2018 22:20:02 +0000 (23:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Johannes Schlüter [Tue, 20 Feb 2018 22:13:03 +0000 (23:13 +0100)]
Fix negotiaton of MySQL auth plugin
Christoph M. Becker [Tue, 20 Feb 2018 15:32:27 +0000 (16:32 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Sort recent NEWS entries alphabetically
Christoph M. Becker [Tue, 20 Feb 2018 15:31:56 +0000 (16:31 +0100)]
[ci skip] Sort recent NEWS entries alphabetically
Christoph M. Becker [Tue, 20 Feb 2018 15:24:29 +0000 (16:24 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix openssl_* arginfos
Gabriel Caruso [Sat, 17 Feb 2018 00:31:29 +0000 (22:31 -0200)]
Fix openssl_* arginfos
openssl_pkcs12_export and openssl_x509_parse had wrong arginfos
Anatol Belski [Tue, 20 Feb 2018 14:52:42 +0000 (15:52 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update binary tools SDK branch for AppVeyor
Anatol Belski [Tue, 20 Feb 2018 14:40:10 +0000 (15:40 +0100)]
Update binary tools SDK branch for AppVeyor
Anatol Belski [Tue, 20 Feb 2018 07:00:08 +0000 (08:00 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
dos2unix
Anatol Belski [Tue, 20 Feb 2018 06:59:34 +0000 (07:59 +0100)]
dos2unix
Nikita Popov [Mon, 19 Feb 2018 20:46:11 +0000 (21:46 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Mon, 19 Feb 2018 20:44:36 +0000 (21:44 +0100)]
Fix incorrect printf modifiers
Anatol Belski [Mon, 19 Feb 2018 10:27:42 +0000 (11:27 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Use more jobs with cppcheck
Anatol Belski [Mon, 19 Feb 2018 10:27:03 +0000 (11:27 +0100)]
Use more jobs with cppcheck
Nikita Popov [Sun, 18 Feb 2018 16:39:18 +0000 (17:39 +0100)]
Fix pfsockopen() func info
Nikita Popov [Sun, 18 Feb 2018 16:20:32 +0000 (17:20 +0100)]
Fix ZEND_SL range inference
This is a bit tricker than right shifts because shifting in the
sign bit flips the sign. The computed bounds are not tight.
Nikita Popov [Sun, 18 Feb 2018 16:03:20 +0000 (17:03 +0100)]
Fix ZEND_SR range inference
Handle out-of-range RHS correctly.
Nikita Popov [Sun, 18 Feb 2018 15:41:53 +0000 (16:41 +0100)]
Fix constant() func info
Since PHP 5.6 this can also be an array.
Nikita Popov [Sun, 18 Feb 2018 14:27:53 +0000 (15:27 +0100)]
Handle overloaded GMP operators in type inference
Nikita Popov [Sun, 18 Feb 2018 14:13:14 +0000 (15:13 +0100)]
Disable negative range inference
The negative range inference implementation does not work correctly,
and it's not clear right now how it can be fixed. As such, disable
it entirely for now.
Nikita Popov [Sat, 17 Feb 2018 22:04:31 +0000 (23:04 +0100)]
Fix COUNT range inference
count() on objects may return a negative number :(
Nikita Popov [Sat, 17 Feb 2018 21:53:14 +0000 (22:53 +0100)]
Fix hash_init() and hash_copy() func info
These functions were switched to use objects instead of resources.
Nikita Popov [Sat, 17 Feb 2018 21:50:17 +0000 (22:50 +0100)]
Fix curl_multi_close() func info
Returns false on failure
Nikita Popov [Sat, 17 Feb 2018 17:44:48 +0000 (18:44 +0100)]
Fix get_object_vars() func info
Numeric keys will be converted to integer nowadays.
Nikita Popov [Sat, 17 Feb 2018 17:42:08 +0000 (18:42 +0100)]
Add RC flags in init_func_return_info
Nikita Popov [Sat, 17 Feb 2018 17:36:17 +0000 (18:36 +0100)]
Fix array_values() and array_keys() func info
Can return RCN for empty/packed arrays
Anatol Belski [Sat, 17 Feb 2018 12:12:29 +0000 (13:12 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Remove duplicated assignment
Anatol Belski [Sat, 17 Feb 2018 12:10:59 +0000 (13:10 +0100)]
Remove duplicated assignment
Xinchen Hui [Sat, 17 Feb 2018 08:35:42 +0000 (16:35 +0800)]
Update NEWS
Xinchen Hui [Sat, 17 Feb 2018 08:33:39 +0000 (16:33 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75961 (Strange references behavior)
Xinchen Hui [Sat, 17 Feb 2018 08:31:59 +0000 (16:31 +0800)]
Fixed bug #75961 (Strange references behavior)
Nikita Popov [Fri, 16 Feb 2018 19:30:23 +0000 (20:30 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 16 Feb 2018 19:27:13 +0000 (20:27 +0100)]
Fixed bug #75969
Move NOP stripping out of zend_optimize_block: NOP stripping may
move instructions, which may invalidate a Tsource shared across
an extended basic block.