]>
granicus.if.org Git - php/log
twosee [Sat, 11 Jul 2020 19:08:42 +0000 (03:08 +0800)]
debug_zval_dump(): Don't skip recursion detection on first level
A complement to
ae6f45ad45e072260d93f828d81fee9548123044
Closes GH-5843.
Máté Kocsis [Sat, 11 Jul 2020 18:04:40 +0000 (20:04 +0200)]
Addd upgrading notes about OCI8
Jens de Nies [Sun, 5 Jul 2020 07:35:44 +0000 (09:35 +0200)]
Removed the "oci_internal_debug" function and its alias. Also deprecated the "ocifetchinto" function.
Closes GH-5810
Chuck Adams [Sat, 11 Jul 2020 15:47:33 +0000 (09:47 -0600)]
(ffi) fix ifdefs for non-windows systems without long double
Closes GH-5840
Christoph M. Becker [Sat, 11 Jul 2020 13:41:15 +0000 (15:41 +0200)]
Export php_gd_libgdimageptr_from_zval_p()
Some extension may need to retrieve the `gdImagePtr` from an `GdImage`
object; thus, we export the respective function. To not being forced
to include gd.h in php_gd.h, we use the opaque `struct gdImageStruct *`
as return type.
We also rename php_gd2.dll to php_gd.dll, since there's not really much
point in giving the DLL a version number, since there is no php_gd.dll
for years (if there ever has been). Renaming, on the other hand,
matches the name on other systems (gd.so), and allows to actually use
`ADD_EXTENSION_DEP()`.
Ilija Tovilo [Sat, 11 Jul 2020 14:43:56 +0000 (16:43 +0200)]
[skip ci] Consistent match test closing tags
twosee [Sat, 11 Jul 2020 10:32:18 +0000 (18:32 +0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed BC break of php_debug_zval_dump
twosee [Sat, 11 Jul 2020 10:31:30 +0000 (18:31 +0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed BC break of php_debug_zval_dump
twosee [Sat, 11 Jul 2020 10:30:28 +0000 (18:30 +0800)]
Fixed BC break of php_debug_zval_dump
It introduced by fixing bug #79830
twosee [Sat, 11 Jul 2020 06:40:17 +0000 (14:40 +0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79830 introduced by fixing bug #79821
# Conflicts:
# ext/standard/var.c
twosee [Sat, 11 Jul 2020 06:38:27 +0000 (14:38 +0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79830 introduced by fixing bug #79821
twosee [Sat, 11 Jul 2020 06:37:25 +0000 (14:37 +0800)]
Fixed bug #79830 introduced by fixing bug #79821
This also fixes memory error in debug_zval_dump and var_export.
twosee [Fri, 10 Jul 2020 22:19:41 +0000 (06:19 +0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79821
twosee [Fri, 10 Jul 2020 22:15:28 +0000 (06:15 +0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79821
twosee [Fri, 10 Jul 2020 22:14:22 +0000 (06:14 +0800)]
Fixed bug #79821
HashTable was reallocated (zend_hash_packed_grow) during php_var_dump, so we should call GC_ADDREF to make SEPARATE_ARRAY work.
Closes GH-5837.
codinghuang [Fri, 10 Jul 2020 09:13:16 +0000 (11:13 +0200)]
Don't generate JSON scanner and parser during configure
Máté Kocsis [Fri, 10 Jul 2020 21:15:08 +0000 (23:15 +0200)]
Retain the original formatting character in test
Máté Kocsis [Tue, 26 May 2020 12:10:57 +0000 (14:10 +0200)]
Review the usage of apostrophes in error messages
Closes GH-5590
Christoph M. Becker [Fri, 10 Jul 2020 16:14:42 +0000 (18:14 +0200)]
Fix test cases
These tests are not supposed to check the result of `fclose(false)`.
George Peter Banyard [Thu, 2 Jul 2020 00:29:47 +0000 (02:29 +0200)]
Use dedicated function for illegal offset type error
Nikita Popov [Fri, 10 Jul 2020 13:58:04 +0000 (15:58 +0200)]
Add missing addref for MATCH_ERROR operand
George Peter Banyard [Wed, 8 Jul 2020 16:13:23 +0000 (18:13 +0200)]
Promote Notice to Warning in libmagic
The current behaviour makes little to no sense, having a notice which starts with 'Warning:' should just be a warning
Closes GH-5824
Nikita Popov [Fri, 10 Jul 2020 12:36:50 +0000 (14:36 +0200)]
Fixed bug #79818
Only destroy the variable directly before reassigning it. The
value could be read in the meantime.
Máté Kocsis [Wed, 25 Mar 2020 10:53:06 +0000 (11:53 +0100)]
Add stubs for SAPIs
Closes GH-5295.
Nikita Popov [Fri, 10 Jul 2020 12:10:02 +0000 (14:10 +0200)]
Fix warning in embed sapi
Nikita Popov [Fri, 10 Jul 2020 12:07:59 +0000 (14:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79817
Nikita Popov [Fri, 10 Jul 2020 12:07:17 +0000 (14:07 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79817
Nikita Popov [Fri, 10 Jul 2020 12:06:41 +0000 (14:06 +0200)]
Fixed bug #79817
Use *_IND macros in a few places in string.c.
Christoph M. Becker [Fri, 10 Jul 2020 11:42:13 +0000 (13:42 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Enable further ext/standard/tests/file tests on Windows
Christoph M. Becker [Fri, 10 Jul 2020 09:19:01 +0000 (11:19 +0200)]
Enable further ext/standard/tests/file tests on Windows
Dmitry Stogov [Fri, 10 Jul 2020 11:13:53 +0000 (14:13 +0300)]
Fixed tracing JIT miss-compilation
Dmitry Stogov [Fri, 10 Jul 2020 09:51:19 +0000 (12:51 +0300)]
Restore registers
Christoph M. Becker [Fri, 10 Jul 2020 09:28:28 +0000 (11:28 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix skip reasons
Christoph M. Becker [Fri, 10 Jul 2020 09:22:07 +0000 (11:22 +0200)]
Fix skip reasons
These tests fail on Windows for different reasons, but not because
symlinks, links, or lstat() would not be supported on Windows
generally.
Nikita Popov [Fri, 10 Jul 2020 08:23:19 +0000 (10:23 +0200)]
Drop dead prototype
twosee [Fri, 10 Jul 2020 05:18:00 +0000 (13:18 +0800)]
Add zend_wrong_parameter_error to reduce the size of ZPP macro
Closes GH-5831.
Christoph M. Becker [Fri, 10 Jul 2020 08:10:30 +0000 (10:10 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Enable symlink_link_linkinfo_is_link_* tests on Windows
Christoph M. Becker [Thu, 9 Jul 2020 08:43:20 +0000 (10:43 +0200)]
Enable symlink_link_linkinfo_is_link_* tests on Windows
We mark symlink_link_linkinfo_is_link_error2.phpt as XFAIL on Windows
ZTS. Several Windows API file system functions ignore trailing spaces
in absolute filenames after the final directory separator, which causes
`link(' ', $link)` to actually call `CreateHardLink()` which then
fails, because linking folders is not supported. However, with NTS
builds (as well as on other systems), the $target is found to not
exist, so the function fails without actually attempting to create the
link. This needs further investigation.
Nikita Popov [Fri, 10 Jul 2020 07:57:13 +0000 (09:57 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
enable ext/ldap/tests on azure
fix some ext/ldap/tests
Paweł Tomulik [Fri, 3 Jul 2020 10:49:25 +0000 (12:49 +0200)]
enable ext/ldap/tests on azure
Paweł Tomulik [Fri, 3 Jul 2020 10:50:40 +0000 (12:50 +0200)]
fix some ext/ldap/tests
Nikita Popov [Fri, 10 Jul 2020 07:50:12 +0000 (09:50 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix some memory bugs in ldap.c
Nikita Popov [Fri, 10 Jul 2020 07:47:59 +0000 (09:47 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix some memory bugs in ldap.c
Christoph M. Becker [Fri, 10 Jul 2020 07:29:41 +0000 (09:29 +0200)]
Mark test as XFAIL for Windows/JIT/Release builds
Ilija Tovilo [Thu, 9 Apr 2020 20:36:37 +0000 (22:36 +0200)]
Implement match expression
RFC: https://wiki.php.net/rfc/match_expression_v2
Closes GH-5371.
Dmitry Stogov [Thu, 9 Jul 2020 16:39:12 +0000 (19:39 +0300)]
Make tracing JIT to support operator overloading independently from opcache.optimization_level ini directive.
Paweł Tomulik [Fri, 3 Jul 2020 00:11:44 +0000 (02:11 +0200)]
Fix some memory bugs in ldap.c
Dmitry Stogov [Thu, 9 Jul 2020 15:54:36 +0000 (18:54 +0300)]
Fixed register allocation for tests/lang/operators/preinc_basiclong_64bit.phpt
Dmitry Stogov [Thu, 9 Jul 2020 14:24:35 +0000 (17:24 +0300)]
Bad function detection
Dmitry Stogov [Thu, 9 Jul 2020 14:24:06 +0000 (17:24 +0300)]
Fixed mysqli_fetch_row() function info
Dmitry Stogov [Thu, 9 Jul 2020 13:33:11 +0000 (16:33 +0300)]
Prevent trace recorder reenterancing
Dmitry Stogov [Thu, 9 Jul 2020 12:56:24 +0000 (15:56 +0300)]
Move assert() to right place
Dmitry Stogov [Thu, 9 Jul 2020 12:36:25 +0000 (15:36 +0300)]
Fixed tracing JIT support for extract()
George Peter Banyard [Mon, 22 Jun 2020 14:29:59 +0000 (16:29 +0200)]
Use ZPP string|array union check in PCRE extension
George Peter Banyard [Fri, 3 Jul 2020 15:43:06 +0000 (17:43 +0200)]
Voidify some ZEND_API functions
Closes GH-5805
Dmitry Stogov [Thu, 9 Jul 2020 10:40:19 +0000 (13:40 +0300)]
Merge branch 'jit-jumptable-x64'
* jit-jumptable-x64:
Use RIP-relative addressing
Align jumptables
Fix jumtable index calculation
Support JIT jumptables on x64
Christoph M. Becker [Thu, 9 Jul 2020 10:36:57 +0000 (12:36 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent parallel test conflicts
Christoph M. Becker [Thu, 9 Jul 2020 10:35:31 +0000 (12:35 +0200)]
Prevent parallel test conflicts
Both tests used the same folder, which could clash in case the tests
are run simultaneously.
Nikita Popov [Thu, 9 Jul 2020 09:58:33 +0000 (11:58 +0200)]
Remove FREE_UNFETCHED concept
In master normal FREE_OPs work like FREE_UNFETCHED_OP used to, so
there is no point in keeping this distinction anymore, it's just
confusing.
Nikita Popov [Thu, 9 Jul 2020 09:54:44 +0000 (11:54 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Switch back to FREE_UNFETCHED_OP_DATA
Nikita Popov [Thu, 9 Jul 2020 09:54:08 +0000 (11:54 +0200)]
Switch back to FREE_UNFETCHED_OP_DATA
Some of the code paths leading to this do not fetch op data.
Hopefully this fixes the release build failure.
Dmitry Stogov [Thu, 9 Jul 2020 09:40:56 +0000 (12:40 +0300)]
Use RIP-relative addressing
Nikita Popov [Thu, 9 Jul 2020 09:13:50 +0000 (11:13 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #79599 in a different way
Revert "Fixed bug #97599 (coredump in set_error_handler)"
Nikita Popov [Thu, 9 Jul 2020 09:11:24 +0000 (11:11 +0200)]
Fix bug #79599 in a different way
Move the emission of the undefined variable notice before the
array separation.
Nikita Popov [Thu, 9 Jul 2020 08:51:30 +0000 (10:51 +0200)]
Revert "Fixed bug #97599 (coredump in set_error_handler)"
This reverts commit
ccd41e083359cf6dd264f88806dce4cc49d9358e .
This causes a large performance regression when notices are thrown
and large arrays are in scope, see bug #79794.
Derick Rethans [Thu, 9 Jul 2020 08:51:15 +0000 (09:51 +0100)]
Merge branch 'PHP-7.4'
Derick Rethans [Thu, 9 Jul 2020 08:48:35 +0000 (09:48 +0100)]
Revert "Partial fixed bug #79649 (Altering disable_functions from module init corrupts memory)"
This reverts commit
a297c09da5ad355d53a8e8ea72655a06d15b7bc7 .
Dmitry Stogov [Thu, 9 Jul 2020 08:31:53 +0000 (11:31 +0300)]
Align jumptables
Dmitry Stogov [Thu, 9 Jul 2020 08:28:48 +0000 (11:28 +0300)]
Fix jumtable index calculation
Nikita Popov [Wed, 8 Jul 2020 13:24:32 +0000 (15:24 +0200)]
Support JIT jumptables on x64
George Peter Banyard [Wed, 8 Jul 2020 16:36:46 +0000 (18:36 +0200)]
Use ZPP callable check in zend built in functions
George Peter Banyard [Wed, 8 Jul 2020 17:33:29 +0000 (19:33 +0200)]
[skip ci] Add info on how to check for PHP NULL when using the ZPP callable check
Ondřej Mirtes [Wed, 8 Jul 2020 13:26:36 +0000 (15:26 +0200)]
UPGRADING - note about ReflectionType::isBuiltin()
Closes GH-5822.
Dmitry Stogov [Wed, 8 Jul 2020 15:14:11 +0000 (18:14 +0300)]
JIT support for opcache restart
George Peter Banyard [Wed, 8 Jul 2020 13:04:41 +0000 (15:04 +0200)]
Use HashTable directly instead of zval
Dmitry Stogov [Wed, 8 Jul 2020 13:49:51 +0000 (16:49 +0300)]
Use small counter values for testing
Dmitry Stogov [Wed, 8 Jul 2020 13:33:46 +0000 (16:33 +0300)]
Fixed tracing JIT support for $http_response_header
Dmitry Stogov [Wed, 8 Jul 2020 11:09:28 +0000 (14:09 +0300)]
Use information about recorded classes for speculative FETCH_OBJ optimization
Nikita Popov [Wed, 8 Jul 2020 09:22:47 +0000 (11:22 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #79787
Nikita Popov [Wed, 8 Jul 2020 09:21:48 +0000 (11:21 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #79787
XXiang [Sat, 4 Jul 2020 14:12:57 +0000 (22:12 +0800)]
Fix bug #79787
Closes GH-5807.
Dmitry Stogov [Wed, 8 Jul 2020 09:02:37 +0000 (12:02 +0300)]
Change zend_get_known_property_offset() into zend_get_known_property_info() and cleanup
Christoph M. Becker [Wed, 8 Jul 2020 08:43:02 +0000 (10:43 +0200)]
[ci skip] Merge branch 'PHP-7.4'
* PHP-7.4:
Report len as -1 instead of INT_MAX
Nikita Popov [Wed, 8 Jul 2020 08:41:00 +0000 (10:41 +0200)]
Add declared properties to LibXMLError
Partially addresses bug #79804.
Christoph M. Becker [Wed, 8 Jul 2020 08:39:47 +0000 (10:39 +0200)]
[ci skip] Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Report len as -1 instead of INT_MAX
Nikita Popov [Wed, 3 Jun 2020 08:15:54 +0000 (10:15 +0200)]
Report len as -1 instead of INT_MAX
Per docs it should be -1. And would be on 32-bit systems, but
not on 64-bit systems.
(cherry picked from commit
39111585a2f8e40e72bdc662eb8b2e3c19e93615 )
Nikita Popov [Wed, 8 Jul 2020 08:10:32 +0000 (10:10 +0200)]
Skip special function optimization for redeclared disabled functions
As pointed out on GH-5817.
Sara Golemon [Tue, 7 Jul 2020 19:35:17 +0000 (19:35 +0000)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prep for 7.2.33
Prep NEWS for 7.2.32 release
Sara Golemon [Tue, 7 Jul 2020 19:34:08 +0000 (19:34 +0000)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Prep for 7.2.33
Prep NEWS for 7.2.32 release
Sara Golemon [Tue, 7 Jul 2020 19:33:11 +0000 (19:33 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Prep for 7.2.33
Prep NEWS for 7.2.32 release
Sara Golemon [Tue, 7 Jul 2020 19:31:32 +0000 (19:31 +0000)]
Prep for 7.2.33
Sara Golemon [Tue, 7 Jul 2020 19:31:05 +0000 (19:31 +0000)]
Prep NEWS for 7.2.32 release
Dmitry Stogov [Tue, 7 Jul 2020 16:11:27 +0000 (19:11 +0300)]
More accurate reference-counter inference (with support for ext/intl/tests/bug72241.phpt)
Nikita Popov [Tue, 7 Jul 2020 14:53:00 +0000 (16:53 +0200)]
Revert "More accurate reference-counter inference"
This reverts commit
b35255ad21a4e441f2304d944014c0649e37d712 .
Temporarily revert this, because it causes a memory leak on the
ext/intl/tests/bug72241.phpt test case, because temporary arrays
are not handled correctly.
Nikita Popov [Tue, 7 Jul 2020 14:30:08 +0000 (16:30 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79793
Nikita Popov [Tue, 7 Jul 2020 14:24:13 +0000 (16:24 +0200)]
Fixed bug #79793
Make sure the string key is not released while throwing the
undefined index warning.
Nikita Popov [Tue, 7 Jul 2020 14:00:50 +0000 (16:00 +0200)]
Fixed bug #79791
First throw the undefined variable warning, and then set the
variable to null. Otherwise we're not guaranteed that it's
actually null afterwards.
Nikita Popov [Tue, 7 Jul 2020 13:30:43 +0000 (15:30 +0200)]
Handle dim_w undefined variable notice in JIT as well
Nikita Popov [Tue, 7 Jul 2020 13:22:46 +0000 (15:22 +0200)]
Check for undef variable exception in SEND_VAR JIT
Add a return value to zend_jit_undefined_op_helper(), so we can
check for exception based on the return value, instead of fetching
EG(exception).
Nikita Popov [Tue, 7 Jul 2020 13:09:12 +0000 (15:09 +0200)]
JIT support for undefined index/offset handling