]>
granicus.if.org Git - php/log
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
Dmitry Stogov [Tue, 6 Mar 2018 21:03:13 +0000 (00:03 +0300)]
Eliminate conditional branches
Dmitry Stogov [Tue, 6 Mar 2018 20:22:01 +0000 (23:22 +0300)]
Added expectation
Dmitry Stogov [Tue, 6 Mar 2018 18:59:02 +0000 (21:59 +0300)]
Avoid double copying
Dmitry Stogov [Tue, 6 Mar 2018 18:58:40 +0000 (21:58 +0300)]
Avoid double copying
Dmitry Stogov [Tue, 6 Mar 2018 18:20:19 +0000 (21:20 +0300)]
Use reference counting instead of duplication
Dmitry Stogov [Tue, 6 Mar 2018 18:19:18 +0000 (21:19 +0300)]
Avoid double copying and string length recalculation
Christoph M. Becker [Tue, 6 Mar 2018 12:22:39 +0000 (13:22 +0100)]
[ci skip] Fix reference notation in protos
Gabriel Caruso [Mon, 26 Feb 2018 01:24:45 +0000 (22:24 -0300)]
[ci skip] Use float instead of double in proto
Dmitry Stogov [Tue, 6 Mar 2018 11:59:30 +0000 (14:59 +0300)]
Memory leak fix, for arg_info of internal functions with type hints (ZTS build only).
Dmitry Stogov [Tue, 6 Mar 2018 00:31:06 +0000 (03:31 +0300)]
Fixed bug #76050
Dmitry Stogov [Tue, 6 Mar 2018 00:00:46 +0000 (03:00 +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, 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:02:31 +0000 (01:02 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
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 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:47:05 +0000 (00:47 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed invalid destructor
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:39:06 +0000 (22:39 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD
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 21:30:25 +0000 (00:30 +0300)]
AST is not COPYABLE anymore and its reference-counter doesn't have to be initialized by 2.
Dmitry Stogov [Mon, 5 Mar 2018 21:00:13 +0000 (00:00 +0300)]
Set and keep HASH_FLAG_STATIC_KEYS for all HashTables stored in SHM (or file cache).
Dmitry Stogov [Mon, 5 Mar 2018 20:38:15 +0000 (23:38 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed invalid destructor
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
Dmitry Stogov [Mon, 5 Mar 2018 17:45:26 +0000 (20:45 +0300)]
Typo
Dmitry Stogov [Mon, 5 Mar 2018 17:20:58 +0000 (20:20 +0300)]
Reverted
e6d6fcedf71a658c49b7c2eb55305cf5970ec681 and overdesign introduced in
ae64dd6d566de448d20232436e1aba25c611357c .
Now we have just indexex, pointers and linked list od unused buffers.
Nikita Popov [Mon, 5 Mar 2018 15:29:46 +0000 (16:29 +0100)]
Fix incorrect GC_NUM2ADDR usage
Both first_unused and GC_MAX_UNCOMPRESSED are addresses, so we
should compare them directly.
Nikita Popov [Mon, 5 Mar 2018 14:33:34 +0000 (15:33 +0100)]
Merge branch 'PHP-7.2'
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:22:11 +0000 (15:22 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Include username into the file cache path
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:21:20 +0000 (16:21 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed "opcache.file_cache_fallback" mode.
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.
Dmitry Stogov [Mon, 5 Mar 2018 08:51:58 +0000 (11:51 +0300)]
Separate duplicated code into a zend_ini_parse_bool() function.