]>
granicus.if.org Git - php/log
Dmitry Stogov [Wed, 14 Mar 2018 06:14:32 +0000 (09:14 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed use-after-free
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:40 +0000 (05:59 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
bump versions
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 23:01:46 +0000 (00:01 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]
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.
Dmitry Stogov [Tue, 13 Mar 2018 22:48:17 +0000 (01:48 +0300)]
PHP scanner optimization
Dmitry Stogov [Tue, 13 Mar 2018 22:08:03 +0000 (01:08 +0300)]
Revert "Handle scanner error in first place (don't hide them from ext/tokenizer) and cheaper whitespace handlig."
This reverts commit
0d6da03f5c3e49b92cf6817ba8a7f8d6f60ee1aa .
Dmitry Stogov [Tue, 13 Mar 2018 15:42:09 +0000 (18:42 +0300)]
Handle scanner error in first place (don't hide them from ext/tokenizer) and cheaper whitespace handlig.
Christoph M. Becker [Tue, 13 Mar 2018 13:34:26 +0000 (14:34 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix #76088: ODBC functions are not available by default on Windows
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
Christoph M. Becker [Tue, 13 Mar 2018 13:28:45 +0000 (14:28 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
next is 7.2.5
Dmitry Stogov [Tue, 13 Mar 2018 13:07:18 +0000 (16:07 +0300)]
Avoid useless iterations
Remi Collet [Tue, 13 Mar 2018 11:49:25 +0000 (12:49 +0100)]
next is 7.2.5
Dmitry Stogov [Tue, 13 Mar 2018 11:34:48 +0000 (14:34 +0300)]
Get rid of useless SET_UNUSED()
Dmitry Stogov [Tue, 13 Mar 2018 10:49:58 +0000 (13:49 +0300)]
Moved compiler helper functions from zend_opcode.c to zend_compile.c
Dmitry Stogov [Tue, 13 Mar 2018 08:04:03 +0000 (11:04 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Revert "More accurate symbolic constraints oferflow/unserflow handling (better fix for bug #76074)."
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:47:11 +0000 (10:47 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
More accurate symbolic constraints oferflow/unserflow handling (better fix for bug #76074).
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:45 +0000 (13:01 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Forgot NEWs
Forgot NEWS
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:56:27 +0000 (12:56 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #76085 (Segmentation fault in buildFromIterator when directory name contains a \n)
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:03:36 +0000 (21:03 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix heap use after free
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:02:14 +0000 (16:02 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Use literal as format
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:51 +0000 (15:18 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Use string 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:59 +0000 (14:16 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Provide core includes for the resource compiler by default
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:21:46 +0000 (11:21 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Replaced usafe reference from SHM to process memory with SHM to SHM reference
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
Dmitry Stogov [Mon, 12 Mar 2018 08:07:26 +0000 (11:07 +0300)]
Added NEWS entry
Dmitry Stogov [Mon, 12 Mar 2018 08:04:54 +0000 (11:04 +0300)]
Fixed bug #75683 (Memory leak in zend_register_functions() in ZTS mode)
Anatol Belski [Sun, 11 Mar 2018 22:07:56 +0000 (23:07 +0100)]
Enable more asan checks
Anatol Belski [Sun, 11 Mar 2018 21:54:10 +0000 (22:54 +0100)]
Disable function call under address sanitizer
AddressSanitizer seems not to function properly with suppressions. The
default value is still sufficient for test, thus unblock testing by
disabling the function call under AddressSanitizer.
Anatol Belski [Sun, 11 Mar 2018 19:21:23 +0000 (20:21 +0100)]
Fix clang build and analyze with SIMD enabled
Christoph M. Becker [Sun, 11 Mar 2018 17:05:08 +0000 (18:05 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix #62545: wrong unicode mapping in some charsets
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.
Gabriel Caruso [Fri, 19 Jan 2018 22:01:40 +0000 (20:01 -0200)]
Add is_countable function
RFC: https://wiki.php.net/rfc/is-countable
Gabriel Caruso [Fri, 2 Mar 2018 01:39:23 +0000 (22:39 -0300)]
Make some skipped tests run, and fix some skip messages
Gabriel Caruso [Sun, 25 Feb 2018 20:17:51 +0000 (17:17 -0300)]
Fix link for phpdbg documentation
Nikita Popov [Sun, 11 Mar 2018 15:37:08 +0000 (16:37 +0100)]
Merge branch 'PHP-7.2'
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:09:23 +0000 (20:09 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
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:21 +0000 (15:29 +0100)]
Merge branch 'PHP-7.2'
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:21:01 +0000 (11:21 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault
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
Joe Watkins [Sat, 10 Mar 2018 09:55:12 +0000 (10:55 +0100)]
Merge branch 'master' of git://github.com/php/php-src
Anatol Belski [Sat, 10 Mar 2018 08:41:53 +0000 (09:41 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] Update link
Anatol Belski [Sat, 10 Mar 2018 08:40:50 +0000 (09:40 +0100)]
[ci skip] Update link
Christoph M. Becker [Tue, 6 Mar 2018 13:15:14 +0000 (14:15 +0100)]
Update to Oniguruma 6.7.1
We also apply the still relevant parts of `oniguruma.patch` and update
the patch accordingly.
Christoph M. Becker [Fri, 9 Mar 2018 23:26:25 +0000 (00:26 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix #73957: signed integer conversion in imagescale()
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.
Dmitry Stogov [Mon, 5 Mar 2018 08:51:58 +0000 (11:51 +0300)]
Test ReflectionZendExtension class
Jonathan Torres [Tue, 6 Mar 2018 01:36:58 +0000 (20:36 -0500)]
Fix typo in upgrade notes
Gabriel Caruso [Sun, 25 Feb 2018 22:51:39 +0000 (19:51 -0300)]
Remove return types from some magic method in protos
__construct, __destruct, __wakeup does not have return types defined.
Anatol Belski [Thu, 8 Mar 2018 11:14:48 +0000 (12:14 +0100)]
Document new configurue options
Anatol Belski [Thu, 8 Mar 2018 10:57:55 +0000 (11:57 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Disable PGO for phpdbg
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 17:09:58 +0000 (18:09 +0100)]
Remove unused assignment
Anatol Belski [Wed, 7 Mar 2018 16:12:27 +0000 (17:12 +0100)]
Remove unused assignment
Anatol Belski [Wed, 7 Mar 2018 14:23:39 +0000 (15:23 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Exclude /Qspectre for clang analyzer
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:56 +0000 (12:29 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Guard platform dependent code
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
Nikita Popov [Tue, 6 Mar 2018 22:09:31 +0000 (23:09 +0100)]
Fix garbage marking in gc_collect_roots()
gc_collect_white() will mark white nodes as black and add them as
garbage, but only if it's not buffered yet. The already buffered
roots are instead marked as garbage in gc_collect_roots() directly.
However, if gc_collect_white() marked a (buffered) root as black
through recursion, it would not subsequently be marked as garbage.
Dmitry Stogov [Wed, 7 Mar 2018 07:21:51 +0000 (10:21 +0300)]
Fixed use-after-free.
Dmitry Stogov [Tue, 6 Mar 2018 21:53:50 +0000 (00:53 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Tue, 6 Mar 2018 21:08:49 +0000 (22:08 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
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