]>
granicus.if.org Git - php/log
Anatol Belski [Wed, 21 Mar 2018 12:17:44 +0000 (13:17 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update SDK version for AppVeyor
Anatol Belski [Wed, 21 Mar 2018 12:15:29 +0000 (13:15 +0100)]
Update SDK version for AppVeyor
Christoph M. Becker [Tue, 20 Mar 2018 15:52:42 +0000 (16:52 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #76113: mbstring does not build with Oniguruma 6.8.1
Christoph M. Becker [Tue, 20 Mar 2018 15:35:39 +0000 (16:35 +0100)]
Fix #76113: mbstring does not build with Oniguruma 6.8.1
As of Oniguruma 6.8.1, the regex structure has been moved from the
public `oniguruma.h` to the private `regint.h`. Thus, it is no longer
possible to directly access the struct's members, and actually, there
is no need to, since there are respective accessor functions available
at least of 2.3.1.
Christoph M. Becker [Mon, 19 Mar 2018 13:25:44 +0000 (14:25 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #75944: Wrong cp1251 detection
Christoph M. Becker [Mon, 19 Mar 2018 12:51:40 +0000 (13:51 +0100)]
Fix #75944: Wrong cp1251 detection
`\xFF` is a valid character of CP-1251.
Stanislav Malyshev [Mon, 19 Mar 2018 08:17:36 +0000 (01:17 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Set tests exit status by defaul - also in other instance.
Stanislav Malyshev [Mon, 19 Mar 2018 08:17:14 +0000 (01:17 -0700)]
Set tests exit status by defaul - also in other instance.
Stanislav Malyshev [Sun, 18 Mar 2018 22:06:08 +0000 (15:06 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Set tests exit status by default.
Stanislav Malyshev [Sun, 18 Mar 2018 22:04:50 +0000 (15:04 -0700)]
Set tests exit status by default.
Use REPORT_EXIT_STATUS=0 or REPORT_EXIT_STATUS=no to prevent it.
Based on discussion in https://www.mail-archive.com/internals@lists.php.net/msg94141.html
Anatol Belski [Fri, 16 Mar 2018 17:56:08 +0000 (18:56 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync test with newer output
Anatol Belski [Fri, 16 Mar 2018 17:54:55 +0000 (18:54 +0100)]
Sync test with newer output
Czech Republic vs. newer Czechia
Xinchen Hui [Thu, 15 Mar 2018 03:17:00 +0000 (11:17 +0800)]
Fixed bug #76094 (Access violation when using opcache)
Anatol Belski [Wed, 14 Mar 2018 22:10:24 +0000 (23:10 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Reduce var scope
Anatol Belski [Wed, 14 Mar 2018 21:59:54 +0000 (22:59 +0100)]
Reduce var scope
Anatol Belski [Wed, 14 Mar 2018 21:23:04 +0000 (22:23 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix stack use after scope
Anatol Belski [Wed, 14 Mar 2018 21:21:43 +0000 (22:21 +0100)]
Fix stack use after scope
Anatol Belski [Wed, 14 Mar 2018 11:01:01 +0000 (12:01 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Upgrade binary SDK version for AppVeyor
Anatol Belski [Wed, 14 Mar 2018 10:59:37 +0000 (11:59 +0100)]
Upgrade binary SDK version for AppVeyor
Dmitry Stogov [Wed, 14 Mar 2018 06:41:25 +0000 (09:41 +0300)]
Fixed user-opcode support
Dmitry Stogov [Wed, 14 Mar 2018 06:14:16 +0000 (09:14 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed use-after-free
Dmitry Stogov [Wed, 14 Mar 2018 06:11:48 +0000 (09:11 +0300)]
Fixed use-after-free
Joe Watkins [Wed, 14 Mar 2018 04:59:18 +0000 (05:59 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
bump versions
Joe Watkins [Wed, 14 Mar 2018 04:58:42 +0000 (05:58 +0100)]
bump versions
Christoph M. Becker [Tue, 13 Mar 2018 22:55:26 +0000 (23:55 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]
Christoph M. Becker [Tue, 13 Mar 2018 22:54:42 +0000 (23:54 +0100)]
Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]
mail.add_x_header actually defaults to `Off`, so we should use this
default in the provided `php.ini`s.
Christoph M. Becker [Tue, 13 Mar 2018 13:33:20 +0000 (14:33 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #76088: ODBC functions are not available by default on Windows
Christoph M. Becker [Tue, 13 Mar 2018 13:16:20 +0000 (14:16 +0100)]
Fix #76088: ODBC functions are not available by default on Windows
Remi Collet [Tue, 13 Mar 2018 11:49:25 +0000 (12:49 +0100)]
next is 7.2.5
Dmitry Stogov [Tue, 13 Mar 2018 08:03:57 +0000 (11:03 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Revert "More accurate symbolic constraints oferflow/unserflow handling (better fix for bug #76074)."
Dmitry Stogov [Tue, 13 Mar 2018 08:03:45 +0000 (11:03 +0300)]
Revert "More accurate symbolic constraints oferflow/unserflow handling (better fix for bug #76074)."
This reverts commit
44ba557de5c0d767ff6ccfcc2c8bde7d7c0746fe .
Dmitry Stogov [Tue, 13 Mar 2018 07:45:53 +0000 (10:45 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
More accurate symbolic constraints oferflow/unserflow handling (better fix for bug #76074).
Dmitry Stogov [Tue, 13 Mar 2018 07:44:53 +0000 (10:44 +0300)]
More accurate symbolic constraints oferflow/unserflow handling (better fix for bug #76074).
Xinchen Hui [Tue, 13 Mar 2018 05:01:33 +0000 (13:01 +0800)]
Forgot NEWs
Xinchen Hui [Tue, 13 Mar 2018 05:00:59 +0000 (13:00 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Forgot NEWS
Xinchen Hui [Tue, 13 Mar 2018 05:00:47 +0000 (13:00 +0800)]
Forgot NEWS
Xinchen Hui [Tue, 13 Mar 2018 04:52:07 +0000 (12:52 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76085 (Segmentation fault in buildFromIterator when directory name contains a \n)
Xinchen Hui [Tue, 13 Mar 2018 04:51:26 +0000 (12:51 +0800)]
Fixed bug #76085 (Segmentation fault in buildFromIterator when directory name contains a \n)
Anatol Belski [Mon, 12 Mar 2018 20:02:40 +0000 (21:02 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix heap use after free
Anatol Belski [Mon, 12 Mar 2018 19:57:21 +0000 (20:57 +0100)]
Fix heap use after free
The value may only be used until PGresult was destroyed, thus it needs
to be copied.
Anatol Belski [Mon, 12 Mar 2018 15:00:24 +0000 (16:00 +0100)]
Use literal as format
Anatol Belski [Mon, 12 Mar 2018 14:18:11 +0000 (15:18 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Use string literal as format
Anatol Belski [Mon, 12 Mar 2018 14:17:08 +0000 (15:17 +0100)]
Use string literal as format
Anatol Belski [Mon, 12 Mar 2018 13:16:08 +0000 (14:16 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Provide core includes for the resource compiler by default
Anatol Belski [Mon, 12 Mar 2018 13:14:34 +0000 (14:14 +0100)]
Provide core includes for the resource compiler by default
Dmitry Stogov [Mon, 12 Mar 2018 08:18:33 +0000 (11:18 +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, 12 Mar 2018 08:18:12 +0000 (11:18 +0300)]
Replaced usafe reference from SHM to process memory with SHM to SHM reference
Christoph M. Becker [Sun, 11 Mar 2018 16:53:48 +0000 (17:53 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #62545: wrong unicode mapping in some charsets
Christoph M. Becker [Sat, 24 Feb 2018 21:34:32 +0000 (22:34 +0100)]
Fix #62545: wrong unicode mapping in some charsets
Undefined characters are best mapped to Unicode REPLACEMENT characters.
Thomas Petazzoni [Mon, 26 Feb 2018 18:06:40 +0000 (19:06 +0100)]
ext/sockets: make AI_IDN usage optional
AI_IDN is not supported by all C libraries (uClibc, musl), so make it
optional, like AI_ALL.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Anatol Belski [Sat, 10 Mar 2018 19:08:43 +0000 (20:08 +0100)]
[ci skip] Update NEWS
Anatol Belski [Sat, 10 Mar 2018 19:08:03 +0000 (20:08 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Sat, 10 Mar 2018 19:07:23 +0000 (20:07 +0100)]
[ci skip] Update NEWS
Bob Weinand [Sat, 10 Mar 2018 14:29:07 +0000 (15:29 +0100)]
Fixup mess in NEWS file (mixed 7.2.3 and 7.2.4 NEWS)
Bob Weinand [Sat, 10 Mar 2018 14:21:16 +0000 (15:21 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Bob Weinand [Fri, 9 Mar 2018 14:08:14 +0000 (15:08 +0100)]
Fix bug #76074 (opcache corrupts variable in for-loop)
Anatol Belski [Sat, 10 Mar 2018 10:20:11 +0000 (11:20 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault
Anatol Belski [Sat, 10 Mar 2018 10:18:21 +0000 (11:18 +0100)]
Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault
Anatol Belski [Sat, 10 Mar 2018 08:40:50 +0000 (09:40 +0100)]
[ci skip] Update link
Christoph M. Becker [Fri, 9 Mar 2018 23:18:14 +0000 (00:18 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #73957: signed integer conversion in imagescale()
Christoph M. Becker [Fri, 9 Mar 2018 23:17:09 +0000 (00:17 +0100)]
Fix #73957: signed integer conversion in imagescale()
We must not pass values to `gdImageScale()` which cannot be represented
by an `unsigned int`. Instead we return FALSE, according to what we
already did for negative integers.
Anatol Belski [Thu, 8 Mar 2018 10:49:25 +0000 (11:49 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Disable PGO for phpdbg
Anatol Belski [Thu, 8 Mar 2018 10:38:02 +0000 (11:38 +0100)]
Disable PGO for phpdbg
For executable files, the linker seems to have issues dealing with the
empty profiling database. As PGO is unlikely to bring any benefit in
this case, the easiest is to disable it.
Anatol Belski [Wed, 7 Mar 2018 14:23:03 +0000 (15:23 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Exclude /Qspectre for clang analyzer
Anatol Belski [Wed, 7 Mar 2018 11:34:16 +0000 (12:34 +0100)]
Exclude /Qspectre for clang analyzer
Anatol Belski [Wed, 7 Mar 2018 11:29:22 +0000 (12:29 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Guard platform dependent code
Anatol Belski [Wed, 7 Mar 2018 11:28:29 +0000 (12:28 +0100)]
Guard platform dependent code
Anatol Belski [Tue, 6 Mar 2018 21:07:58 +0000 (22:07 +0100)]
[ci skip] Update NEWS
Anatol Belski [Tue, 6 Mar 2018 21:07:31 +0000 (22:07 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Tue, 6 Mar 2018 21:06:52 +0000 (22:06 +0100)]
[ci skip] Update NEWS
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