]>
granicus.if.org Git - php/log
Nikita Popov [Tue, 3 Mar 2020 14:00:15 +0000 (15:00 +0100)]
Small code cleanup
I found what the modifier code does with XOR pretty confusing.
It's just removing the PPP bits...
Also remove an outdated reference to OVERLOADED_FUNCTION.
Nikita Popov [Tue, 3 Mar 2020 13:21:33 +0000 (14:21 +0100)]
Resolve trait alias refers to earlier
Make sure all trait method references are converted to absolute
method references in advance. This regresses one error message
that I don't think is particularly valuable.
Remi Collet [Tue, 3 Mar 2020 12:06:46 +0000 (13:06 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
this test needs json
Remi Collet [Tue, 3 Mar 2020 12:06:31 +0000 (13:06 +0100)]
this test needs json
Derick Rethans [Tue, 3 Mar 2020 11:29:48 +0000 (11:29 +0000)]
Merge branch 'PHP-7.4'
Derick Rethans [Tue, 3 Mar 2020 11:29:10 +0000 (11:29 +0000)]
PHP-7.4 is now 7.4.5-dev
Cameron Porter [Tue, 3 Mar 2020 04:11:55 +0000 (22:11 -0600)]
oci8: Fix two tests that fail with stricter internal checks
Closes GH-5230
Nikita Popov [Tue, 3 Mar 2020 11:10:18 +0000 (12:10 +0100)]
Add test for bug #69084
This is another bug fixed by the precending commit.
Nikita Popov [Mon, 2 Mar 2020 10:07:57 +0000 (11:07 +0100)]
Store aliased name of trait method
Currently, trait methods are aliased will continue to use the
original function name. In a few places in the codebase, we will
try to look up the actual method name instead. However, this does
not work if an aliased method is used indirectly
(https://bugs.php.net/bug.php?id=69180).
I think it would be better to instead actually change the method
name to the alias. This is in principle easy: We have to allow
function_name to be changed even if op array is otherwise shared
(similar to static_variables). This means we need to addref/release
the function_name separately, but I don't think there is a
performance concern here (especially as everything is usually
interned).
There is a bit of complication in opcache, where we need to make
sure that the function name is released the correct number of times
(interning may overwrite the name in the original op_array, but we
need to release it as many times as the op_array is shared).
Fixes bug #69180.
Fixes bug #74939.
Closes GH-5226.
Nikita Popov [Tue, 3 Mar 2020 09:35:42 +0000 (10:35 +0100)]
Fix memory leak in dom_zvals_to_fragment
Christoph M. Becker [Tue, 3 Mar 2020 09:22:52 +0000 (10:22 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Next is 7.3.17
Christoph M. Becker [Tue, 3 Mar 2020 09:20:42 +0000 (10:20 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Next is 7.3.17
Christoph M. Becker [Tue, 3 Mar 2020 09:19:31 +0000 (10:19 +0100)]
Next is 7.3.17
Xinchen Hui [Tue, 3 Mar 2020 06:26:42 +0000 (14:26 +0800)]
Updated maintainer ranges
Christoph M. Becker [Mon, 2 Mar 2020 18:12:49 +0000 (19:12 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79013: Content-Length missing when posting a curlFile with curl
Christoph M. Becker [Mon, 2 Mar 2020 17:45:12 +0000 (18:45 +0100)]
Fix #79013: Content-Length missing when posting a curlFile with curl
Unfortunately, some Webservers (e.g. IIS) do not implement the (F)CGI
specifications correctly wrt. chunked uploads (i.e. Transfer-encoding:
chunked), but instead pass -1 as CONTENT_LENGTH to the CGI
application. However, our (F)CFI SAPIs (i.e. cgi and cgi-fcgi) do not
support this.
Therefore we try to retrieve the stream size in advance and pass it to
`curl_mime_data_cb()` to prevent libcurl from doing chunked uploads.
This is basically the same approach that `curl_mime_filedata()`
implements, except that we are keeping already opened streams open for
the `read_cb()`.
Remi Collet [Mon, 2 Mar 2020 15:51:55 +0000 (16:51 +0100)]
bump zip version + NEWS
Remi Collet [Fri, 28 Feb 2020 14:51:33 +0000 (15:51 +0100)]
- add ZipArchive::FL_RECOMPRESS, FL_ENCRYPTED, FL_OVERWRITE, FL_LOCAL, FL_CENTRAL constants
- add optional "flags" parameter to ZipArchive::addEmptyDir, addFile and addFromString methods
- add "flags" options to ZipArchive::addGlob and addPattern methods
keeping previous behavior having FL_OVERWRITE by default
- add ZipArchive::replaceFile() method
Remi Collet [Mon, 2 Mar 2020 15:47:47 +0000 (16:47 +0100)]
add myself as zip maintainer
Christoph M. Becker [Mon, 2 Mar 2020 15:33:40 +0000 (16:33 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Native Windows support for mysqlnd sha256 authentification
Abstract over crypto operations
Christoph M. Becker [Wed, 26 Feb 2020 16:01:37 +0000 (17:01 +0100)]
Native Windows support for mysqlnd sha256 authentification
We implement that on top of Cryptography API: Next Generation (CNG).
Christoph M. Becker [Wed, 26 Feb 2020 15:56:57 +0000 (16:56 +0100)]
Abstract over crypto operations
Nikita Popov [Thu, 6 Feb 2020 09:27:30 +0000 (10:27 +0100)]
Automatically implement Stringable interface
Nicolas Grekas [Mon, 13 Jan 2020 16:06:26 +0000 (17:06 +0100)]
Define Stringable with __toString():string method
Christoph M. Becker [Mon, 2 Mar 2020 14:10:15 +0000 (15:10 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update libmagic.patch
Christoph M. Becker [Mon, 2 Mar 2020 14:06:14 +0000 (15:06 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update libmagic.patch
Christoph M. Becker [Wed, 26 Feb 2020 08:59:44 +0000 (09:59 +0100)]
Update libmagic.patch
Some commits missed to update the patch file, so we're catching up on
this.
To generally make this easier, we back-port generate_patch.sh from
PHP-7.4, where we now also generate magic.h from magic.h.in.
Christoph M. Becker [Mon, 2 Mar 2020 10:38:50 +0000 (11:38 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79333: com_print_typeinfo() leaks memory
Christoph M. Becker [Mon, 2 Mar 2020 10:37:14 +0000 (11:37 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79333: com_print_typeinfo() leaks memory
Christoph M. Becker [Mon, 2 Mar 2020 10:36:30 +0000 (11:36 +0100)]
Fix #79333: com_print_typeinfo() leaks memory
We have to free the `ansiname`s, regardless of whether they have been
put into the hashtable or not.
Since bug79299.phpt already shows the leak when run with a leak
checker, there is no need for another regression test.
Christoph M. Becker [Mon, 2 Mar 2020 09:48:14 +0000 (10:48 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79332: php_istreams are never freed
Christoph M. Becker [Mon, 2 Mar 2020 09:46:31 +0000 (10:46 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79332: php_istreams are never freed
Christoph M. Becker [Mon, 2 Mar 2020 09:45:37 +0000 (10:45 +0100)]
Fix #79332: php_istreams are never freed
Releasing the `com_dotnet_istream_wrapper` in `istream_destructor()` is
pointless, since `istream_destructor()` is only called when the
resource is going to be released. This recursion is not a real issue,
though, since the resource is never exposed to userland, and has at
most refcount 1, so due to well defined unsigned integer underflow, it
never is released twice. However, returning early in this case causes
a memory leak which needs to be fixed.
Máté Kocsis [Fri, 28 Feb 2020 17:10:48 +0000 (18:10 +0100)]
Add stubs for IntlChar
Closes GH-5217
Máté Kocsis [Sat, 22 Feb 2020 10:06:17 +0000 (11:06 +0100)]
Improve argument error messages in ext/sodium
Closes GH-5197
Benjamin Eberlei [Fri, 28 Feb 2020 16:35:54 +0000 (17:35 +0100)]
Add upgrading note regarding merge of RFC for new DOMParentNode/DOMChildNode APIs.
Nikita Popov [Fri, 28 Feb 2020 16:26:06 +0000 (17:26 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove generated lexer
Nikita Popov [Fri, 28 Feb 2020 16:25:47 +0000 (17:25 +0100)]
Remove generated lexer
Accidentially committed this when merging from 7.3.
Nikita Popov [Fri, 28 Feb 2020 16:19:37 +0000 (17:19 +0100)]
Fixed bug #77325
Make ReflectionClassConstant->class the declaring class, not the
class on which the constant was fetched. This matches the behavior
for properties and methods.
Nikita Popov [Fri, 28 Feb 2020 16:08:15 +0000 (17:08 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79062
Nikita Popov [Fri, 28 Feb 2020 16:07:36 +0000 (17:07 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79062
Nikita Popov [Fri, 28 Feb 2020 16:06:05 +0000 (17:06 +0100)]
Fixed bug #79062
Back up the doc comment when performing heredoc scanahead.
Benjamin Eberlei [Fri, 28 Feb 2020 15:13:39 +0000 (16:13 +0100)]
[RFC] Implement new DOM Living Standard APIs in ext/dom
Nikita Popov [Fri, 28 Feb 2020 14:53:04 +0000 (15:53 +0100)]
Fixed bug #64592
Make ReflectionClass::getMethods() behave the same ways as
ReflectionClass::getProperties() by not including private methods
from parent classes.
Nikita Popov [Fri, 28 Feb 2020 14:49:00 +0000 (15:49 +0100)]
Update ext maintenance ranges
Also add myself as reflection maintainer.
Christoph M. Becker [Fri, 28 Feb 2020 14:46:17 +0000 (15:46 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79311: enchant_dict_suggest() fails on big endian architecture
Christoph M. Becker [Fri, 28 Feb 2020 14:44:34 +0000 (15:44 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79311: enchant_dict_suggest() fails on big endian architecture
Christoph M. Becker [Fri, 28 Feb 2020 12:18:00 +0000 (13:18 +0100)]
Fix #79311: enchant_dict_suggest() fails on big endian architecture
For obvious reasons, we must not assign a `size_t` value to an `int`
variable using memcpy(). However, there is actually no need for the
intermediate `n_sugg_st` here, if we use the proper types in the first
place.
A regression test is not necessary, because dict_suggest.phpt already
exhibits the erroneous behavior on big endian architectures.
Nikita Popov [Fri, 28 Feb 2020 13:49:03 +0000 (14:49 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Try to fix msvc build
Nikita Popov [Fri, 28 Feb 2020 13:48:02 +0000 (14:48 +0100)]
Try to fix msvc build
Nikita Popov [Fri, 28 Feb 2020 13:41:32 +0000 (14:41 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix another flaky FPM test
Nikita Popov [Fri, 28 Feb 2020 13:40:21 +0000 (14:40 +0100)]
Fix another flaky FPM test
Máté Kocsis [Thu, 27 Feb 2020 18:59:32 +0000 (19:59 +0100)]
Add stubs for UConverter
Closes GH-5218
Máté Kocsis [Wed, 26 Feb 2020 19:30:40 +0000 (20:30 +0100)]
Update MySQLi function info
Closes GH-5214
Nikita Popov [Fri, 28 Feb 2020 12:19:53 +0000 (13:19 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Try to fix intermittent FPM failures
Nikita Popov [Fri, 28 Feb 2020 12:19:10 +0000 (13:19 +0100)]
Try to fix intermittent FPM failures
Terminate only after expecting the log lines to avoid race
condition.
Nikita Popov [Fri, 28 Feb 2020 11:49:45 +0000 (12:49 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79252
Nikita Popov [Fri, 28 Feb 2020 11:47:56 +0000 (12:47 +0100)]
Fixed bug #79252
Nikita Popov [Fri, 28 Feb 2020 11:16:41 +0000 (12:16 +0100)]
Avoid duplicate calls to interface implementation handler
Remi Collet [Fri, 28 Feb 2020 09:39:43 +0000 (10:39 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix test
Remi Collet [Fri, 28 Feb 2020 09:39:08 +0000 (10:39 +0100)]
fix test
Remi Collet [Fri, 28 Feb 2020 09:36:34 +0000 (10:36 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
NEWS
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
Remi Collet [Fri, 28 Feb 2020 09:36:12 +0000 (10:36 +0100)]
NEWS
Remi Collet [Fri, 28 Feb 2020 09:35:39 +0000 (10:35 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
Remi Collet [Fri, 28 Feb 2020 09:21:19 +0000 (10:21 +0100)]
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
Remi Collet [Fri, 28 Feb 2020 09:29:30 +0000 (10:29 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
NEWS
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
Remi Collet [Fri, 28 Feb 2020 09:24:52 +0000 (10:24 +0100)]
NEWS
Remi Collet [Fri, 28 Feb 2020 09:23:19 +0000 (10:23 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
Nikita Popov [Fri, 28 Feb 2020 09:22:11 +0000 (10:22 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use type-checked ref assignment in UConverter
Nikita Popov [Fri, 28 Feb 2020 09:21:50 +0000 (10:21 +0100)]
Use type-checked ref assignment in UConverter
Remi Collet [Fri, 28 Feb 2020 09:21:19 +0000 (10:21 +0100)]
Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
George Peter Banyard [Thu, 27 Feb 2020 22:32:36 +0000 (23:32 +0100)]
Use {0} to initialize instead of {NULL}
Clang emits a [-Wmissing-field-initializers] when using {NULL} instead of {0}
Dmitry Stogov [Thu, 27 Feb 2020 20:38:19 +0000 (23:38 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed incorrect overflow detection
Dmitry Stogov [Thu, 27 Feb 2020 20:38:09 +0000 (23:38 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed incorrect overflow detection
Dmitry Stogov [Thu, 27 Feb 2020 20:37:41 +0000 (23:37 +0300)]
Fixed incorrect overflow detection
Nikita Popov [Thu, 27 Feb 2020 13:48:43 +0000 (14:48 +0100)]
Avoid more null arithmetic
Nikita Popov [Thu, 27 Feb 2020 12:13:01 +0000 (13:13 +0100)]
Use EX_NUM_TO_VAR() in more places
Not sure why I missed these before.
Nikita Popov [Thu, 27 Feb 2020 11:53:55 +0000 (12:53 +0100)]
Remove more null arithmetic UB
Introduce an EX_NUM_TO_VAR macro to mirror EX_VAR_TO_NUM and
replace usages of the ZEND_CALL_VAR_NUM(NULL) pattern.
Christoph M. Becker [Thu, 27 Feb 2020 09:39:07 +0000 (10:39 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add upgrading node regarding fix for bug #79271
Christoph M. Becker [Thu, 27 Feb 2020 09:36:59 +0000 (10:36 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add upgrading node regarding fix for bug #79271
Nikita Popov [Thu, 27 Feb 2020 09:33:35 +0000 (10:33 +0100)]
Remove mergesort implementation
php_mergesort() isn't being used for anything, and hasn't been for
a long time. Even if we wanted to use a stable sort, this isn't
the implementation we'd use...
Christoph M. Becker [Thu, 27 Feb 2020 09:32:24 +0000 (10:32 +0100)]
Add upgrading node regarding fix for bug #79271
Cf. <https://github.com/php/php-src/pull/5180#issuecomment-
590259750 >ff.
Nikita Popov [Thu, 27 Feb 2020 09:29:44 +0000 (10:29 +0100)]
Avoid null arithmetic UB in EX_VAR_TO_NUM
Dmitry Stogov [Thu, 27 Feb 2020 09:28:09 +0000 (12:28 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed incorrect behavior of internal memory debugger
Dmitry Stogov [Thu, 27 Feb 2020 09:27:58 +0000 (12:27 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed incorrect behavior of internal memory debugger
Dmitry Stogov [Thu, 27 Feb 2020 09:27:22 +0000 (12:27 +0300)]
Fixed incorrect behavior of internal memory debugger
Christoph M. Becker [Thu, 27 Feb 2020 08:40:31 +0000 (09:40 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #64032: mysqli reports different client_version
Christoph M. Becker [Thu, 27 Feb 2020 08:38:55 +0000 (09:38 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #64032: mysqli reports different client_version
Christoph M. Becker [Wed, 26 Feb 2020 17:33:25 +0000 (18:33 +0100)]
Fix #64032: mysqli reports different client_version
While `mysqli_get_client_version()` calls `mysql_get_client_version()`
to retrieve the client version, `mysql::$client_version` is initialized
to `MYSQL_VERSION_ID`. Both should match though, and since the former
is the more useful information, we fix `mysql::$client_version`.
We do not add a regression test, because it would usually succeed
anyway, and we already have several tests with respective `assert()`s.
Nikita Popov [Wed, 26 Feb 2020 15:48:41 +0000 (16:48 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add test for bug #60161
Nikita Popov [Wed, 26 Feb 2020 15:48:03 +0000 (16:48 +0100)]
Add test for bug #60161
This has been fixed in PHP 7.4, let's make sure it stays fixed.
Máté Kocsis [Tue, 25 Feb 2020 19:58:33 +0000 (20:58 +0100)]
Change argument error message format
Closes GH-5211
George Peter Banyard [Sat, 22 Feb 2020 01:16:38 +0000 (02:16 +0100)]
Fix mbstring regex variable types to correspond to Oniguruma
The beginning and ending of a Oniguruma Regex are stored in a OnigRegion (which is a typedef to the Oniguruma re_registers struct) as as int* therefore change the type from size_t to int
Closes GH-5196
Nikita Popov [Thu, 13 Feb 2020 15:38:51 +0000 (16:38 +0100)]
Require all internal functions to have arginfo
Nikita Popov [Tue, 25 Feb 2020 11:31:51 +0000 (12:31 +0100)]
Add stubs for COMPersistHelper
George Peter Banyard [Sun, 23 Feb 2020 23:04:12 +0000 (00:04 +0100)]
Remove deprecated capture_session_meta OpenSSL stream context
Closes GH-5200
Máté Kocsis [Tue, 25 Feb 2020 18:57:23 +0000 (19:57 +0100)]
Get rid of method mapping of BreakIterator classes
Máté Kocsis [Mon, 24 Feb 2020 22:54:49 +0000 (23:54 +0100)]
Add stubs for Intl BreakIterator
Closes GH-5207
Nikita Popov [Tue, 25 Feb 2020 16:23:46 +0000 (17:23 +0100)]
Reorder checks in object ref assignment
First check for IS_INDIRECT and de-indirect it directly there.
Handle the error cases later.
Nikita Popov [Tue, 25 Feb 2020 11:44:26 +0000 (12:44 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #63206: Fully support error/exception_handler stacking, even with null or inside the handler