]>
granicus.if.org Git - php/log
Nikita Popov [Mon, 26 Aug 2019 08:28:14 +0000 (10:28 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 26 Aug 2019 08:27:08 +0000 (10:27 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 26 Aug 2019 08:26:49 +0000 (10:26 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 26 Aug 2019 08:23:23 +0000 (10:23 +0200)]
Fix overflow in memory limit checks
Due to overflows in the memory limit checks, we were missing cases
where the allocation size was close to the address space size, and
caused an OOM condition rather than a memory limit error.
Stanislav Malyshev [Mon, 26 Aug 2019 03:06:50 +0000 (20:06 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test
Stanislav Malyshev [Mon, 26 Aug 2019 03:06:43 +0000 (20:06 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test
Stanislav Malyshev [Mon, 26 Aug 2019 03:06:02 +0000 (20:06 -0700)]
Fix test
Not sure why offset changed... probably different PCRE version calculates
them in different way.
Stanislav Malyshev [Mon, 26 Aug 2019 02:21:13 +0000 (19:21 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #75457: heap-use-after-free in php7.0.25
Stanislav Malyshev [Mon, 26 Aug 2019 02:21:08 +0000 (19:21 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #75457: heap-use-after-free in php7.0.25
Stanislav Malyshev [Mon, 26 Aug 2019 02:21:04 +0000 (19:21 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #75457: heap-use-after-free in php7.0.25
Stanislav Malyshev [Mon, 26 Aug 2019 02:20:59 +0000 (19:20 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #75457: heap-use-after-free in php7.0.25
Christoph M. Becker [Fri, 16 Aug 2019 12:29:19 +0000 (14:29 +0200)]
Fix #75457: heap-use-after-free in php7.0.25
Backport <https://vcs.pcre.org/pcre?view=revision&revision=1638>.
Christoph M. Becker [Sun, 25 Aug 2019 20:46:55 +0000 (22:46 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78454: Consecutive numeric separators cause OOM error
Theodore Brown [Sun, 25 Aug 2019 05:33:51 +0000 (00:33 -0500)]
Fix #78454: Consecutive numeric separators cause OOM error
Resolves out of memory error when consecutive numeric separators follow a binary/hex literal.
George Peter Banyard [Thu, 22 Aug 2019 10:03:22 +0000 (12:03 +0200)]
Promote warnings to errors in str_pad()
Christoph M. Becker [Sun, 25 Aug 2019 16:28:15 +0000 (18:28 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't modify arrays passed by value
Christoph M. Becker [Sat, 24 Aug 2019 08:28:43 +0000 (10:28 +0200)]
Don't modify arrays passed by value
Christoph M. Becker [Sun, 25 Aug 2019 15:55:40 +0000 (17:55 +0200)]
Add ext/gmp stubs
Nikita Popov [Sun, 25 Aug 2019 14:31:15 +0000 (16:31 +0200)]
Remove unnecessary haystack length check in stripos()
This falls out naturally from the following condition, because
either the needle length will be zero as well, or the needle
will be longer than the (empty) haystack.
Nikita Popov [Sun, 25 Aug 2019 14:09:20 +0000 (16:09 +0200)]
Remove unnecessary NULL check
needle_dup cannot be NULL here.
Nikita Popov [Sun, 25 Aug 2019 13:32:33 +0000 (15:32 +0200)]
Make string size calculation in chunk_split more precise
The +1 on the string length is unnecessary, as we need the string
length without trailing NUL byte here.
The +1 on the chunks is only necessary if there is a rest. If the
string devides into chunks exactly, we don't need an extra chunk.
This makes the allocations exactly as large as it needs to be.
Olumide Samson [Sun, 25 Aug 2019 13:24:46 +0000 (15:24 +0200)]
Add some header and html function stub
Christoph M. Becker [Sun, 25 Aug 2019 12:50:01 +0000 (14:50 +0200)]
Add stubs for ext/ftp
Nikita Popov [Sun, 25 Aug 2019 07:38:49 +0000 (09:38 +0200)]
Skip memory_limit test without ZMM
Stanislav Malyshev [Sun, 25 Aug 2019 07:21:23 +0000 (00:21 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update Oniguruma to 6.9.1
Stanislav Malyshev [Sun, 25 Aug 2019 07:20:40 +0000 (00:20 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update Oniguruma to 6.9.1
Stanislav Malyshev [Sun, 25 Aug 2019 06:53:35 +0000 (23:53 -0700)]
Update Oniguruma to 6.9.1
Stanislav Malyshev [Sun, 25 Aug 2019 06:17:44 +0000 (23:17 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe()
set version for release
Stanislav Malyshev [Sun, 25 Aug 2019 06:17:12 +0000 (23:17 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe()
set version for release
Stanislav Malyshev [Sun, 25 Aug 2019 06:16:09 +0000 (23:16 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe()
set version for release
Stanislav Malyshev [Sun, 25 Aug 2019 06:15:36 +0000 (23:15 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe()
set version for release
Stanislav Malyshev [Sun, 25 Aug 2019 06:11:45 +0000 (23:11 -0700)]
Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe()
Backport from https://github.com/kkos/oniguruma/commit/
0f7f61ed1b7b697e283e37bd2d731d0bd57adb55
George Peter Banyard [Fri, 23 Aug 2019 18:27:50 +0000 (20:27 +0200)]
Remove 'bogus' error condition in str_pad()
George Peter Banyard [Wed, 21 Aug 2019 17:35:35 +0000 (19:35 +0200)]
Promote warning to error in zend_forbid_dynamic_call()
George Peter Banyard [Thu, 22 Aug 2019 09:28:22 +0000 (11:28 +0200)]
Promote warnings to errors in str_repeat()
Christoph M. Becker [Fri, 23 Aug 2019 16:11:48 +0000 (18:11 +0200)]
Don't explicitly set return value on ZPP failure in ext/iconv
Failing ZPP throws as of PHP 8.0.0, so explicitly setting a return
value is useless, and also slightly confusing.
Christoph M. Becker [Fri, 23 Aug 2019 16:10:01 +0000 (18:10 +0200)]
Add ext/iconv stubs
Nikita Popov [Fri, 23 Aug 2019 15:23:31 +0000 (17:23 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 16 Aug 2019 10:55:28 +0000 (12:55 +0200)]
Relax closure $this unbinding deprecation
Only deprecate unbinding of $this from a closure if $this is
syntactically used within the closure.
This is desired to support Laravel's macro system, see laravel/framework#29482.
This should still allow us to implement the performance improvements
we're interested in for PHP 8, without breaking existing use-cases.
Nikita Popov [Fri, 23 Aug 2019 15:01:49 +0000 (17:01 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 23 Aug 2019 14:58:34 +0000 (16:58 +0200)]
Fix arginfo leak when using disabled_classes
Also remove the hack where scope is set to NULL in order to make
free_internal_arg_info work. Instead explicitly call it for class
methods.
This fixes the asan build for Zend/tests/bug77494.phpt.
Nikita Popov [Fri, 23 Aug 2019 14:18:15 +0000 (16:18 +0200)]
Fix noalias violation in select call
Nikita Popov [Fri, 23 Aug 2019 14:14:19 +0000 (16:14 +0200)]
Avoid strncat use in proc_open
Instead manually manage the insertion position.
Nikita Popov [Fri, 23 Aug 2019 13:51:57 +0000 (15:51 +0200)]
Replace strncat in filter implementation
In this case we already know exactly where we need to write, no
need to use strncat at all.
Nikita Popov [Fri, 23 Aug 2019 13:37:07 +0000 (15:37 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 21 Aug 2019 14:19:58 +0000 (16:19 +0200)]
Support variable element size in spl heap implementation
This allows us to drop the intermediate allocation for
spl_pqueue_elem.
This fixes GC for SplPriorityQueue, because we can now directly
return a well-formed GC child buffer.
Nikita Popov [Fri, 23 Aug 2019 13:27:55 +0000 (15:27 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 23 Aug 2019 13:27:28 +0000 (15:27 +0200)]
Fixed bug #78436
Christoph M. Becker [Fri, 23 Aug 2019 12:49:50 +0000 (14:49 +0200)]
Fix bug77812-*.phpt
Undefined constants error as of PHP 8.0.0.
Christoph M. Becker [Fri, 23 Aug 2019 12:04:52 +0000 (14:04 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #77812: Interactive mode does not support PHP 7.3-style heredoc
Christoph M. Becker [Fri, 23 Aug 2019 12:02:48 +0000 (14:02 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77812: Interactive mode does not support PHP 7.3-style heredoc
Christoph M. Becker [Fri, 23 Aug 2019 11:59:10 +0000 (13:59 +0200)]
Fix #77812: Interactive mode does not support PHP 7.3-style heredoc
As of PHP 7.3.0, the rules regarding the heredoc and nowdoc closing
identifier have been relaxed. While formerly, the closing identifier
was required to be placed at the beginning of a line and to be
immediately followed by (a semicolon and) a line break, it may now be
preceeded by whitespace, and may be followed by any non-word character.
We adjust the recognition logic respectively.
Tyson Andre [Fri, 23 Aug 2019 01:14:00 +0000 (21:14 -0400)]
Fix escapes for namespaced classes in gen_stub.php
Fix the string generated when the `ns\class` is passed to a macro
#define ESCAPE(x) #x
// puts(ESCAPE(ns\class)); // warning: unknown escape sequence: \c
puts(ESCAPE(ns\\class)); // Properly prints ns\class to stdout.
Christoph M. Becker [Fri, 23 Aug 2019 10:23:16 +0000 (12:23 +0200)]
Empty merge
Christoph M. Becker [Fri, 23 Aug 2019 10:22:28 +0000 (12:22 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Suppress deprecation warning on IDNA2003 ICU methods for clang
Christoph M. Becker [Fri, 23 Aug 2019 10:21:57 +0000 (12:21 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Suppress deprecation warning on IDNA2003 ICU methods for clang
Christoph M. Becker [Fri, 23 Aug 2019 09:14:18 +0000 (11:14 +0200)]
Suppress deprecation warning on IDNA2003 ICU methods for clang
Christoph M. Becker [Fri, 23 Aug 2019 09:41:38 +0000 (11:41 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78438: Corruption when __unserializing deeply nested structures
Christoph M. Becker [Fri, 23 Aug 2019 09:30:31 +0000 (11:30 +0200)]
Fix #78438: Corruption when __unserializing deeply nested structures
When storing two temporary variables for delayed __unserialize() calls,
we have to make sure that both fit into the same linked list element.
To that end we introduce the internal API `tmp_var` which allows to
reserve `num` slots in the same list element.
We also fix the `var_dtor_entries` struct definition to use the proper
size, namely `VAR_DTOR_ENTRIES_MAX`.
George Peter Banyard [Thu, 22 Aug 2019 10:14:02 +0000 (12:14 +0200)]
Promote warnings to errors in chunk_split()
George Peter Banyard [Thu, 22 Aug 2019 10:18:12 +0000 (12:18 +0200)]
Promote warnings to errors in str_word_count()
George Peter Banyard [Thu, 22 Aug 2019 09:45:10 +0000 (11:45 +0200)]
Promote warnings to errors in wordwrap()
George Peter Banyard [Thu, 22 Aug 2019 09:58:57 +0000 (11:58 +0200)]
Promote warnings to errors in dirname()
George Peter Banyard [Thu, 22 Aug 2019 09:33:48 +0000 (11:33 +0200)]
Promote warnings to errors in str_split()
George Peter Banyard [Thu, 22 Aug 2019 10:33:46 +0000 (12:33 +0200)]
Promote warnings to errors in strtr()
George Peter Banyard [Wed, 21 Aug 2019 00:12:45 +0000 (02:12 +0200)]
Promote warnings to errors in array_pad()
George Peter Banyard [Tue, 20 Aug 2019 23:52:17 +0000 (01:52 +0200)]
Promote warnings to errors in array_column()
Christoph M. Becker [Thu, 22 Aug 2019 13:59:34 +0000 (15:59 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix var_unserializer debug code
Christoph M. Becker [Thu, 22 Aug 2019 13:58:25 +0000 (15:58 +0200)]
Fix var_unserializer debug code
At least it now compiles and should be free of warnings.
George Peter Banyard [Thu, 22 Aug 2019 09:09:44 +0000 (11:09 +0200)]
Normalise strr(i)pos offset messages with str(i)pos ones.
Thomas Gerbet [Wed, 21 Aug 2019 19:32:57 +0000 (21:32 +0200)]
Add stub for ext zlib
Christoph M. Becker [Wed, 21 Aug 2019 20:55:25 +0000 (22:55 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78441: Parse error due to heredoc identifier followed by digit
Christoph M. Becker [Wed, 21 Aug 2019 20:54:05 +0000 (22:54 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78441: Parse error due to heredoc identifier followed by digit
Christoph M. Becker [Wed, 21 Aug 2019 20:51:51 +0000 (22:51 +0200)]
Fix #78441: Parse error due to heredoc identifier followed by digit
Since digits are allowed for identifiers, we have to cater to them as
well.
George Peter Banyard [Wed, 21 Aug 2019 00:18:00 +0000 (02:18 +0200)]
Promote warnings to errors in array_combine()
George Peter Banyard [Tue, 20 Aug 2019 21:35:01 +0000 (23:35 +0200)]
Promote warnings to errors in array_multisort()
George Peter Banyard [Tue, 20 Aug 2019 21:30:20 +0000 (23:30 +0200)]
Promote warning to error in array_chunk()
George Peter Banyard [Tue, 20 Aug 2019 21:11:11 +0000 (23:11 +0200)]
Promote warnings to errors in range()
George Peter Banyard [Tue, 20 Aug 2019 19:46:51 +0000 (21:46 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove dead code in base64.c
George Peter Banyard [Tue, 20 Aug 2019 18:15:22 +0000 (20:15 +0200)]
Remove dead code in base64.c
Nikita Popov [Tue, 20 Aug 2019 15:07:39 +0000 (17:07 +0200)]
Remove some unnecessary RETURN_FALSE
Remi Collet [Tue, 20 Aug 2019 14:31:24 +0000 (16:31 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
ensure proper settings for test
Update NEWS for 7.4.0RC1
Update NEWS for PHP 7.4.0beta4
Remi Collet [Tue, 20 Aug 2019 14:31:11 +0000 (16:31 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
ensure proper settings for test
Remi Collet [Tue, 20 Aug 2019 14:30:52 +0000 (16:30 +0200)]
ensure proper settings for test
Tyson Andre [Tue, 20 Aug 2019 02:48:10 +0000 (22:48 -0400)]
Fix opcache type info for stream_bucket_make_writable()
Closes GH-4567.
Derick Rethans [Tue, 20 Aug 2019 14:10:36 +0000 (14:10 +0000)]
Update NEWS for 7.4.0RC1
Derick Rethans [Tue, 20 Aug 2019 14:09:17 +0000 (14:09 +0000)]
Update NEWS for PHP 7.4.0beta4
Christoph M. Becker [Tue, 20 Aug 2019 14:04:50 +0000 (16:04 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78386: fstat mode has unexpected value on PHP 7.4
Christoph M. Becker [Tue, 20 Aug 2019 14:04:14 +0000 (16:04 +0200)]
Fix #78386: fstat mode has unexpected value on PHP 7.4
We must not assume that any file which is not a directory is a regular
file. Therefore we employ `GetFileType()` in this case to properly
distinguish between character special, FIFO special and regular files.
Simon Podlipsky [Sun, 18 Aug 2019 12:48:23 +0000 (14:48 +0200)]
Add Curl ext PHP stubs
Closes GH-4557.
Simon Podlipsky [Sat, 17 Aug 2019 10:28:49 +0000 (12:28 +0200)]
Add Calendar ext PHP stubs
Closes GH-4552.
Christoph M. Becker [Tue, 20 Aug 2019 11:59:20 +0000 (13:59 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't use C++ style comments
Christoph M. Becker [Tue, 20 Aug 2019 11:58:54 +0000 (13:58 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Don't use C++ style comments
Christoph M. Becker [Tue, 20 Aug 2019 11:58:22 +0000 (13:58 +0200)]
Don't use C++ style comments
Cf. <https://github.com/php/php-src/blob/
f45b61b8988b5b2d80dd4a1df7edd04282cf319a /CODING_STANDARDS.md#syntax-and-indentation>
cc @mcmic
Christoph M. Becker [Tue, 20 Aug 2019 11:35:53 +0000 (13:35 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix the problem for connect_attr, set db condition, and add a new attribute _server_host
Christoph M. Becker [Tue, 20 Aug 2019 11:34:42 +0000 (13:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
fix the problem for connect_attr, set db condition, and add a new attribute _server_host
Christoph M. Becker [Tue, 20 Aug 2019 11:32:53 +0000 (13:32 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix the problem for connect_attr, set db condition, and add a new attribute _server_host
Qianqian Bu [Mon, 12 Aug 2019 02:00:31 +0000 (04:00 +0200)]
fix the problem for connect_attr, set db condition, and add a new attribute _server_host
Henrique Duarte [Thu, 15 Aug 2019 17:45:22 +0000 (14:45 -0300)]
Add stubs for filter extension
Closes GH-4542.
Nikita Popov [Tue, 20 Aug 2019 08:35:27 +0000 (10:35 +0200)]
Remove some unnecessary RETURN_FALSE uses