]>
granicus.if.org Git - php/log
Côme Chilliet [Tue, 28 Jul 2020 08:29:14 +0000 (10:29 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Updated NEWS
fix memory leaks in ext/ldap/ldap.c
fix memory leaks in ext/ldap/ldap.c
Côme Chilliet [Tue, 28 Jul 2020 08:28:31 +0000 (10:28 +0200)]
Updated NEWS
Côme Chilliet [Tue, 28 Jul 2020 08:27:52 +0000 (10:27 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
fix memory leaks in ext/ldap/ldap.c
Paweł Tomulik [Mon, 13 Jul 2020 04:19:34 +0000 (06:19 +0200)]
fix memory leaks in ext/ldap/ldap.c
Paweł Tomulik [Fri, 10 Jul 2020 19:55:42 +0000 (21:55 +0200)]
fix memory leaks in ext/ldap/ldap.c
Dmitry Stogov [Tue, 28 Jul 2020 01:16:16 +0000 (04:16 +0300)]
Avoid redundand EX(opline) initialization
Dmitry Stogov [Tue, 28 Jul 2020 00:23:28 +0000 (03:23 +0300)]
Always record ZEND_JIT_TRACE_START and ZEND_JIT_TRACE_END
Dmitry Stogov [Mon, 27 Jul 2020 21:14:28 +0000 (00:14 +0300)]
Update abstarct stack before guard to keep proper type in side trace
Dmitry Stogov [Mon, 27 Jul 2020 20:27:07 +0000 (23:27 +0300)]
Fixed incorrect side exit opline of "fake" init_fcall guard
Benjamin Eberlei [Mon, 27 Jul 2020 17:32:00 +0000 (19:32 +0200)]
Consolidate Parameter Names For ext/simplexml
Co-authored-by: Thomas Weinert <thomas@weinert.info>
Benjamin Eberlei [Mon, 27 Jul 2020 17:31:25 +0000 (19:31 +0200)]
Consolidate Parameter Names For ext/dom
Co-authored-by: Thomas Weinert <thomas@weinert.info>
Dmitry Stogov [Mon, 27 Jul 2020 18:53:58 +0000 (21:53 +0300)]
Correct assertion
Dmitry Stogov [Mon, 27 Jul 2020 18:11:07 +0000 (21:11 +0300)]
Fixed incorrect abstract stack size calculation
Nikita Popov [Mon, 27 Jul 2020 16:40:51 +0000 (18:40 +0200)]
Remove unused func_info variable
Nikita Popov [Mon, 27 Jul 2020 13:56:49 +0000 (15:56 +0200)]
Automatically enable DASM_CHECKS in debug mode
Christoph M. Becker [Mon, 27 Jul 2020 15:53:23 +0000 (17:53 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "Fix #79806: realpath() erroneously resolves link to link"
Christoph M. Becker [Mon, 27 Jul 2020 15:51:39 +0000 (17:51 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Revert "Fix #79806: realpath() erroneously resolves link to link"
Christoph M. Becker [Mon, 27 Jul 2020 15:50:41 +0000 (17:50 +0200)]
Revert "Fix #79806: realpath() erroneously resolves link to link"
This reverts commit
d5b59b4303642adac91df2c93969a72bc0f5fa7d .
Dmitry Stogov [Mon, 27 Jul 2020 14:31:02 +0000 (17:31 +0300)]
Remove unused fields
Dmitry Stogov [Mon, 27 Jul 2020 14:22:03 +0000 (17:22 +0300)]
More accurate checks to eliminate reloading
Nikita Popov [Mon, 27 Jul 2020 13:52:43 +0000 (15:52 +0200)]
Fix verify type jit for complex type masks
We should not try to check things like MAY_BE_CALLABLE in the fast
path, because those aren't real types. This is only actively wrong
for the concrete_type case, for the mask case it just uses an
unnecessarily large immediate.
Nikita Popov [Mon, 27 Jul 2020 13:26:11 +0000 (15:26 +0200)]
Emit diagnostic on dasm_link() failure
Tyson Andre [Mon, 27 Jul 2020 13:39:24 +0000 (09:39 -0400)]
[skip ci] Add zend.exception_string_param_max_len to UPGRADING
For GH-5769 (mentioned in
07db64156e180c30daa5ab5d41ed72f9bba77e6d )
Dmitry Stogov [Mon, 27 Jul 2020 13:37:15 +0000 (16:37 +0300)]
Properly cleanup in case of abort because too many functions in single trace.
Derick Rethans [Mon, 27 Jul 2020 13:15:06 +0000 (14:15 +0100)]
Mention that an API bump must be done with RC1
It's okay to change the API change up until the first release candidate only,
and it may not be changed afterwards.
There is a discussion at https://github.com/php/php-src/pull/4470/files that
never resulted in a fix.
/cc @sgolemon @carusogabriel
Christoph M. Becker [Mon, 27 Jul 2020 13:11:39 +0000 (15:11 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79806: realpath() erroneously resolves link to link
Christoph M. Becker [Mon, 27 Jul 2020 13:10:11 +0000 (15:10 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79806: realpath() erroneously resolves link to link
Christoph M. Becker [Wed, 15 Jul 2020 16:37:27 +0000 (18:37 +0200)]
Fix #79806: realpath() erroneously resolves link to link
After resolving reparse points, the path still may be a reparse point;
in that case we have to resolve that reparse point as well.
Nikita Popov [Mon, 27 Jul 2020 13:01:29 +0000 (15:01 +0200)]
JIT internal functions with return type in debug mode
The return type check is just a debug assertion, it's okay if it
is not performed in JIT mode. We already don't perform all the
argument validation in that case. Just disable the one test that
checks for this.
This removes an annoying discrepancy between debug&release mode.
Dmitry Stogov [Mon, 27 Jul 2020 11:45:02 +0000 (14:45 +0300)]
Prevent setting of incorrect continuation counters
Máté Kocsis [Mon, 27 Jul 2020 11:14:21 +0000 (13:14 +0200)]
Fix microtime() test
Derick Rethans [Mon, 27 Jul 2020 10:42:13 +0000 (11:42 +0100)]
Last pass of 'More consistent parameter names for date/time functions'
Dmitry Stogov [Mon, 27 Jul 2020 10:18:34 +0000 (13:18 +0300)]
Fixed incorrect reference counting (we shouldn't skip ADDREF for IS_CV result)
Christoph M. Becker [Mon, 27 Jul 2020 09:56:52 +0000 (11:56 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #77932: File extensions are case-sensitive
Christoph M. Becker [Mon, 27 Jul 2020 09:54:38 +0000 (11:54 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77932: File extensions are case-sensitive
Christoph M. Becker [Mon, 27 Jul 2020 08:13:52 +0000 (10:13 +0200)]
Fix #77932: File extensions are case-sensitive
The file extension to mime type mapping *must* not depend on the file
extension's case for case-insensitive file systems, and *should* not
for case-sensitive file systems.
Nikita Popov [Mon, 27 Jul 2020 08:27:26 +0000 (10:27 +0200)]
Fix null pointer deref in compile_return()
Fixes oss-fuzz #24387.
Nikita Popov [Mon, 27 Jul 2020 08:17:19 +0000 (10:17 +0200)]
Add AST export support for nullsafe operator
Fixes oss-fuzz #24403 and variants.
Dmitry Stogov [Mon, 27 Jul 2020 08:13:23 +0000 (11:13 +0300)]
type in comment
Dmitry Stogov [Mon, 27 Jul 2020 07:46:58 +0000 (10:46 +0300)]
Fixed memory leaks
Derick Rethans [Sun, 26 Jul 2020 09:38:53 +0000 (10:38 +0100)]
Another pass of improving ext/date argument names
Derick Rethans [Sun, 26 Jul 2020 09:09:27 +0000 (10:09 +0100)]
Merge branch 'PHP-7.4'
Derick Rethans [Sun, 26 Jul 2020 09:08:52 +0000 (10:08 +0100)]
PHP-7.4 is 7.4.10-dev now
Tyson Andre [Thu, 25 Jun 2020 13:44:12 +0000 (09:44 -0400)]
[RFC] Make string length for getTraceAsString() configurable
Add a `zend.exception_string_param_max_len` ini setting.
(same suffix as `log_errors_max_len`)
Allow values between 0 and
1000000 bytes.
For example, with zend.exception_string_param_max_len=0,
"" would represent the empty string, and "..." would represent something
longer than the empty string.
Previously, this was hardcoded as exactly 15 bytes.
Discussion: https://externals.io/message/110717
Closes GH-5769
Máté Kocsis [Fri, 24 Jul 2020 08:46:37 +0000 (10:46 +0200)]
Cleanup argument handling in ext/reflection
Closes GH-5850
Nikita Popov [Fri, 24 Jul 2020 14:39:16 +0000 (16:39 +0200)]
Support class+mask union for internal argument
Derick Rethans [Fri, 24 Jul 2020 10:39:46 +0000 (11:39 +0100)]
More consistent parameter names for date/time functions
Dmitry Stogov [Fri, 24 Jul 2020 10:26:03 +0000 (13:26 +0300)]
Result of branching opcode in side trace is unknown
Nikita Popov [Fri, 24 Jul 2020 08:16:38 +0000 (10:16 +0200)]
Fix bug #79108
Don't expose references in debug_backtrace() or exception traces.
This is regardless of whether the argument is by-reference or not.
As a side-effect of this change, exception traces may now acquire
the interior value of a reference, which may be unexpected for
some internal functions. This is what necessitated the change in
the spl_array sort implementation.
Nikita Popov [Fri, 24 Jul 2020 09:58:10 +0000 (11:58 +0200)]
Validate collator earlier during sort
Check this once before the sort, instead of on every compare.
Also directly store the UCollator to make things more obvious.
Nikita Popov [Fri, 24 Jul 2020 09:43:27 +0000 (11:43 +0200)]
Avoid UNKNOWN default in PDO::query()
Máté Kocsis [Fri, 24 Jul 2020 08:06:45 +0000 (10:06 +0200)]
Add the Z_PARAM_PATH_OR_NULL() and Z_PARAM_ZVAL_OR_NULL() macros
Nikita Popov [Fri, 24 Jul 2020 08:35:03 +0000 (10:35 +0200)]
Make nested ternary without parentheses a compile error
This was deprecated in PHP 7.4.
Ilija Tovilo [Sun, 24 May 2020 10:42:48 +0000 (12:42 +0200)]
Implement nullsafe ?-> operator
RFC: https://wiki.php.net/rfc/nullsafe_operator
Closes GH-5619.
Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>
George Wang [Thu, 23 Jul 2020 21:21:24 +0000 (17:21 -0400)]
Address some compiler warnings.
George Wang [Thu, 23 Jul 2020 20:08:54 +0000 (16:08 -0400)]
Merge branch 'PHP-7.4'
George Wang [Thu, 23 Jul 2020 19:54:48 +0000 (15:54 -0400)]
Merge branch 'PHP-7.3' into PHP-7.4
George Wang [Thu, 23 Jul 2020 19:36:35 +0000 (15:36 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
George Wang [Thu, 23 Jul 2020 19:35:32 +0000 (15:35 -0400)]
Security: update to LiteSpeed SAPI v7.7 to address an buffer overflow, and some log message tunings.
Dmitry Stogov [Thu, 23 Jul 2020 18:38:34 +0000 (21:38 +0300)]
Cleanup abstract test usage
Nikita Popov [Thu, 23 Jul 2020 14:45:53 +0000 (16:45 +0200)]
Use zend_call_method in SoapFault::__toString()
Nikita Popov [Thu, 23 Jul 2020 14:20:09 +0000 (16:20 +0200)]
Simplify user_stream_create_object
Dmitry Stogov [Thu, 23 Jul 2020 14:08:28 +0000 (17:08 +0300)]
Allow keeping result of FETCH_DIM_R in CPU register
Nikita Popov [Thu, 23 Jul 2020 13:53:15 +0000 (15:53 +0200)]
Cleanup SPL instantiation code
Christoph M. Becker [Thu, 23 Jul 2020 09:10:11 +0000 (11:10 +0200)]
Fix #78236: convert error on receiving variables when duplicate [
When an input variable name contains a non matched open bracket, we not
only have to replace that with an underscore, but also all following
forbidden characters.
Christoph M. Becker [Thu, 23 Jul 2020 13:43:02 +0000 (15:43 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79884: PHP_CONFIG_FILE_PATH is meaningless
Christoph M. Becker [Thu, 23 Jul 2020 13:40:48 +0000 (15:40 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79884: PHP_CONFIG_FILE_PATH is meaningless
Christoph M. Becker [Wed, 22 Jul 2020 08:48:15 +0000 (10:48 +0200)]
Fix #79884: PHP_CONFIG_FILE_PATH is meaningless
It does not make sense to make assumptions about `PHP_CONFIG_FILE_PATH`
during build time, since that value is never used during run time on
Windows. Since there is no `--with-config-file-path` on Windows
either, we define `PHP_CONFIG_FILE_PATH` as `""`.
Dmitry Stogov [Thu, 23 Jul 2020 12:18:28 +0000 (15:18 +0300)]
Don't record "fake" closures
Nikita Popov [Wed, 22 Jul 2020 14:03:06 +0000 (16:03 +0200)]
Remove no longer needed stdint compatibility defines
Closes GH-5886.
Dmitry Stogov [Thu, 23 Jul 2020 10:39:49 +0000 (13:39 +0300)]
We track only arguments of user functions on abstract stack
Dmitry Stogov [Thu, 23 Jul 2020 09:26:34 +0000 (12:26 +0300)]
Fixed 32-bit build
Dmitry Stogov [Thu, 23 Jul 2020 09:16:58 +0000 (12:16 +0300)]
Revert "Fixed DynASM failure"
This reverts commit
62ca6b567cdae0f8f7e02e6e2ebe6bb64ee1dd3c .
Dmitry Stogov [Thu, 23 Jul 2020 09:13:33 +0000 (12:13 +0300)]
Fixed DynASM failure
Dmitry Stogov [Thu, 23 Jul 2020 09:08:07 +0000 (12:08 +0300)]
Avoid register reloading
Nikita Popov [Thu, 23 Jul 2020 08:35:40 +0000 (10:35 +0200)]
Fix some clang warnings
Nikita Popov [Thu, 23 Jul 2020 07:58:17 +0000 (09:58 +0200)]
Try to fix 32-bit NTS build
Christopher Jones [Thu, 23 Jul 2020 06:31:33 +0000 (16:31 +1000)]
Make test decimal to binary conversion expectation more tolerant
Christopher Jones [Thu, 23 Jul 2020 06:29:51 +0000 (16:29 +1000)]
Fix cut/paste error in expected test output
Christoph M. Becker [Wed, 22 Jul 2020 20:57:05 +0000 (22:57 +0200)]
Fix build
MSVC is pretty picky there, so we add the `ZEND_VOIDP` cast.
Christoph M. Becker [Wed, 22 Jul 2020 18:47:16 +0000 (20:47 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix brittle test
Christoph M. Becker [Wed, 22 Jul 2020 18:46:28 +0000 (20:46 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix brittle test
Christoph M. Becker [Wed, 22 Jul 2020 18:45:55 +0000 (20:45 +0200)]
Fix brittle test
This test fails occasionally due to timing issues, because the session
file may have been unlinked by the first `session_start()`'s GC. We
adapt the test expectation to this reality.
Christoph M. Becker [Wed, 22 Jul 2020 18:34:21 +0000 (20:34 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix minor memory leak of CG(script_encoding_list)
Christoph M. Becker [Wed, 15 Jul 2020 15:17:22 +0000 (17:17 +0200)]
Fix minor memory leak of CG(script_encoding_list)
This only leaks at the end of the process, so per se not an issue, but
the leak is caught by MSVC's CRT leak checker, so we better properly
clean up to avoid false positives.
Dmitry Stogov [Wed, 22 Jul 2020 17:03:50 +0000 (20:03 +0300)]
Revert "Disable tracing JIT on AppVeyor"
This reverts commit
a986933ddeff664367d11bebaca2ea6977dbce62 .
Tracing JIT for Windows is already fixed.
twosee [Wed, 22 Jul 2020 16:59:00 +0000 (00:59 +0800)]
Fix warnings of strict-prototypes
Closes GH-5887.
twosee [Wed, 22 Jul 2020 14:29:30 +0000 (22:29 +0800)]
Change type of max_num_args to uint32_t
Closes GH-5885.
twosee [Wed, 22 Jul 2020 16:34:52 +0000 (00:34 +0800)]
Export zend_register_error_notify_callback() with ZEND_API
Nikita Popov [Wed, 22 Jul 2020 16:26:40 +0000 (18:26 +0200)]
Accept unsigned instead of enum pdo_attribute_type
Driver-specific options get passed to these functions, which are
not part of the pdo_attribute_type enum. Newer GCC versions don't
like that. Accept a simple integr type instead.
Dmitry Stogov [Wed, 22 Jul 2020 14:49:51 +0000 (17:49 +0300)]
Reserve WIN64 shadow space
Nikita Popov [Wed, 22 Jul 2020 13:45:31 +0000 (15:45 +0200)]
php.ini cleanup
[ci skip]
Dmitry Stogov [Wed, 22 Jul 2020 12:04:17 +0000 (15:04 +0300)]
Separate and fix deoptimization code generator
Nikita Popov [Mon, 15 Jun 2020 09:50:55 +0000 (11:50 +0200)]
Treat namespaced names as single token
Namespace names are now lexed as single tokens of type
T_NAME_QUALIFIED, T_NAME_FULLY_QUALIFIED or T_NAME_RELATIVE.
RFC: https://wiki.php.net/rfc/namespaced_names_as_token
Closes GH-5827.
Nikita Popov [Thu, 21 Feb 2019 16:38:25 +0000 (17:38 +0100)]
Improved number to string comparison semantics
RFC: https://wiki.php.net/rfc/string_to_number_comparison
Closes GH-3886.
Dmitry Stogov [Wed, 22 Jul 2020 10:01:11 +0000 (13:01 +0300)]
Prevent incorrect trasing JIT TSSA usage for range() result type inference
Nikita Popov [Wed, 22 Jul 2020 09:31:15 +0000 (11:31 +0200)]
Check dual_it validity in CallbackFilterIterator::accept()
Avoid accessing intern->u.cbfilter null pointer, though it's
harmless here.
Nikita Popov [Wed, 22 Jul 2020 09:10:42 +0000 (11:10 +0200)]
Drop no-op dasm_growpc() call
This doesn't do anything, as maxpc=0 is passed. However, ubsan
complains about the memset of a null pointer, so avoid it.
Nikita Popov [Wed, 22 Jul 2020 09:01:35 +0000 (11:01 +0200)]
Mark zend_jit_patch memory accesses as unaligned
This prevents ubsan from complaining.
Nikita Popov [Wed, 22 Jul 2020 08:52:34 +0000 (10:52 +0200)]
Move checks after zpp in opcache_is_script_cached()