]>
granicus.if.org Git - php/log
Christoph M. Becker [Mon, 3 Aug 2020 09:18:45 +0000 (11:18 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
[ci skip] Add missing NEWS entries
Christoph M. Becker [Mon, 3 Aug 2020 09:08:31 +0000 (11:08 +0200)]
[ci skip] Add missing NEWS entries
Christoph M. Becker [Mon, 3 Aug 2020 09:13:49 +0000 (11:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79877: getimagesize function silently truncates after a null byte
Fix #79797: Use of freed hash key in the phar_parse_zipfile function
Christoph M. Becker [Tue, 21 Jul 2020 09:07:43 +0000 (11:07 +0200)]
Fix #79877: getimagesize function silently truncates after a null byte
We have to check for NUL bytes if `getimagesize()` has been called.
Christoph M. Becker [Tue, 14 Jul 2020 15:04:24 +0000 (17:04 +0200)]
Fix #79797: Use of freed hash key in the phar_parse_zipfile function
We must not use heap memory after we freed it.
Christoph M. Becker [Mon, 3 Aug 2020 07:12:46 +0000 (09:12 +0200)]
Enable libxml entity loader test case on Windows
Stanislav Malyshev [Mon, 3 Aug 2020 06:56:37 +0000 (23:56 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #79877: getimagesize function silently truncates after a null byte
Fix #79797: Use of freed hash key in the phar_parse_zipfile function
Christoph M. Becker [Tue, 21 Jul 2020 09:07:43 +0000 (11:07 +0200)]
Fix #79877: getimagesize function silently truncates after a null byte
We have to check for NUL bytes if `getimagesize()` has been called.
Christoph M. Becker [Tue, 14 Jul 2020 15:04:24 +0000 (17:04 +0200)]
Fix #79797: Use of freed hash key in the phar_parse_zipfile function
We must not use heap memory after we freed it.
Christoph M. Becker [Fri, 31 Jul 2020 08:56:29 +0000 (10:56 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79919: Stack use-after-scope in define()
Christoph M. Becker [Fri, 31 Jul 2020 07:12:22 +0000 (09:12 +0200)]
Fix #79919: Stack use-after-scope in define()
Instead of the temporary `rv`, we use the `val_free` which is there for
this purpose.
Christoph M. Becker [Wed, 29 Jul 2020 16:44:35 +0000 (18:44 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Amendment to OPcache base file removal
Christoph M. Becker [Wed, 29 Jul 2020 16:06:42 +0000 (18:06 +0200)]
Amendment to OPcache base file removal
We fix the erroneous segment size. We also keep the segment pointer at
the allocated address, but increase the position instead.
Christoph M. Becker [Wed, 29 Jul 2020 13:11:04 +0000 (15:11 +0200)]
Fix #73060: php failed with error after temp folder cleaned up
Instead of storing the mapping base address and the address of
`execute_ex()` in a separate file in the temporary folder, we store
them right at the beginning of the memory mapping.
Nikita Popov [Wed, 29 Jul 2020 15:05:35 +0000 (17:05 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Consider op1 literal of FETCH_OBJ_R
Nikita Popov [Wed, 29 Jul 2020 15:04:23 +0000 (17:04 +0200)]
Consider op1 literal of FETCH_OBJ_R
FETCH_OBJ_R may have an op1 CONST operand, even though it will
always error. We should take this into account when compacting
literals.
Nikita Popov [Wed, 29 Jul 2020 13:04:23 +0000 (15:04 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test
Nikita Popov [Wed, 29 Jul 2020 13:04:05 +0000 (15:04 +0200)]
Fix test
Christoph M. Becker [Wed, 29 Jul 2020 11:32:59 +0000 (13:32 +0200)]
Revert "Merge branch 'PHP-7.3' into PHP-7.4"
This reverts commit
e1f6ab3388f509782857557ee1e40a66b2bb6455 , reversing
changes made to
e0ebe56ebfc80bae3875b23eca4cbe0803f41e79 .
There are obviously issues with running tests in parallel, maybe
related to the cache ID. This needs to be investigated. Revert for
now.
Christoph M. Becker [Wed, 29 Jul 2020 10:33:46 +0000 (12:33 +0200)]
Prevent test case from stalling
If the CTRL-C event can't be sent to the child for whatever reason, the
test will never terminate, because `proc_close()` waits for an infinite
amount of time. Therefore, we `proc_terminate()` the child instead,
after explicitly closing the pipes.
Nikita Popov [Wed, 29 Jul 2020 10:38:35 +0000 (12:38 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79895: support = in PHP_CHECK_GCC_ARG m4 macro
Santiago M. Mola [Fri, 24 Jul 2020 20:46:11 +0000 (22:46 +0200)]
Fix #79895: support = in PHP_CHECK_GCC_ARG m4 macro
Closes GH-5890.
twosee [Wed, 29 Jul 2020 09:46:57 +0000 (17:46 +0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Handle bindto error
twosee [Wed, 29 Jul 2020 04:59:44 +0000 (12:59 +0800)]
Handle bindto error
Closes GH-5903.
Christoph M. Becker [Wed, 29 Jul 2020 08:11:11 +0000 (10:11 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #73060: php failed with error after temp folder cleaned up
Christoph M. Becker [Tue, 28 Jul 2020 12:40:04 +0000 (14:40 +0200)]
Fix #73060: php failed with error after temp folder cleaned up
Instead of storing the mapping base address and the address of
`execute_ex()` in a separate file in the temporary folder, we store
them right at the beginning of the memory mapping.
Christoph M. Becker [Tue, 28 Jul 2020 12:00:08 +0000 (14:00 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79806: realpath() erroneously resolves link to link
Christoph M. Becker [Tue, 28 Jul 2020 09:22:57 +0000 (11:22 +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.
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
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 .
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.
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.
Derick Rethans [Sun, 26 Jul 2020 09:08:52 +0000 (10:08 +0100)]
PHP-7.4 is 7.4.10-dev now
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.
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 `""`.
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, 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.
Nikita Popov [Wed, 22 Jul 2020 08:20:37 +0000 (10:20 +0200)]
Fixed bug #79881
Derick Rethans [Tue, 21 Jul 2020 08:23:51 +0000 (09:23 +0100)]
Prepare for 7.4.10
Christoph M. Becker [Tue, 21 Jul 2020 07:52:04 +0000 (09:52 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
7.3 is now 7.3.22-dev
Christoph M. Becker [Tue, 21 Jul 2020 07:18:07 +0000 (09:18 +0200)]
7.3 is now 7.3.22-dev
Christoph M. Becker [Mon, 20 Jul 2020 12:43:59 +0000 (14:43 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #63527: DCOM does not work with Username, Password parameter
Christoph M. Becker [Fri, 10 Jul 2020 13:43:32 +0000 (15:43 +0200)]
Fix #63527: DCOM does not work with Username, Password parameter
We must not mix multibyte and wide character strings in the
`COAUTHIDENTITY` structure. Using wide character strings throughout
would have the advantage that the remote connection can be established
regardless of the code page of the server, but that would more likely
break BC, so we just drop the wide character string conversion of the
username.
Nikita Popov [Fri, 17 Jul 2020 12:50:22 +0000 (14:50 +0200)]
Fixed bug #79839
Add reference type sources in array_walk.
Nikita Popov [Thu, 16 Jul 2020 19:17:21 +0000 (21:17 +0200)]
Revert "Drop freetype from i386"
This reverts commit
8641d76f62273f3a73449fd720c93c63992f3b5a .
This appears to work again now...
Nikita Popov [Thu, 16 Jul 2020 14:09:41 +0000 (16:09 +0200)]
Fix azure i386 build
Purge libsqlite3-0 to make sure we get the i386 library lateron.
Christoph M. Becker [Thu, 16 Jul 2020 11:09:50 +0000 (13:09 +0200)]
Enable further tests on Windows
Remi Collet [Thu, 16 Jul 2020 10:05:45 +0000 (12:05 +0200)]
#79657 was cherry-picked in 7.4.7
Christoph M. Becker [Wed, 15 Jul 2020 15:28:24 +0000 (17:28 +0200)]
Fix readlink related memory leak
Christoph M. Becker [Wed, 15 Jul 2020 11:19:27 +0000 (13:19 +0200)]
Fix tests regarding negative fileinode()
The results of `fileinode()` may be negative due to wrap-around
behavior (at least on Windows as of PHP 7.4.0).
Nikita Popov [Wed, 15 Jul 2020 13:10:28 +0000 (15:10 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #78008: dns_check_record() always return true on Alpine
Andy Postnikov [Tue, 14 Jul 2020 01:14:05 +0000 (04:14 +0300)]
Fix bug #78008: dns_check_record() always return true on Alpine
- free handle before return result
- cleaned up remaining usage of MAXPACKET
- update dns_get_mx() to use the same approach
Closes GH-5854.
Nikita Popov [Wed, 15 Jul 2020 12:59:55 +0000 (14:59 +0200)]
Fixed bug #79862
While normally a private property in the active scope would take
priority, we should not use this if it has the wrong "staticness".
Christopher Broadbent [Wed, 15 Jul 2020 04:47:21 +0000 (14:47 +1000)]
Fixed bug #79820
Similar to what is done for ReflectionType itself, copy the
type name stored inside ReflectionProperty. Also make sure the
type field is always initialized for dynamic properties.
This is a non-issue in PHP 8, because we store a pointer to the
property_info there, rather than a copy.
Nikita Popov [Tue, 14 Jul 2020 10:43:58 +0000 (12:43 +0200)]
Merge remote-tracking branch 'upstream/PHP-7.4' into PHP-7.4
* upstream/PHP-7.4:
Fix test for x86 Windows
Nikita Popov [Tue, 14 Jul 2020 10:42:46 +0000 (12:42 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #79849
Evgeny Stepanischev [Mon, 13 Jul 2020 12:16:39 +0000 (15:16 +0300)]
Fixed bug #79849
Closes GH-5853.
Christoph M. Becker [Mon, 13 Jul 2020 08:45:47 +0000 (10:45 +0200)]
Fix test for x86 Windows
`st_dev` deliberately overflows on such systems, cf.
<http://svn.php.net/viewvc?view=revision&revision=350100>.
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: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: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.
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 09:19:01 +0000 (11:19 +0200)]
Enable further ext/standard/tests/file tests on Windows
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.
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.
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: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
Paweł Tomulik [Fri, 3 Jul 2020 00:11:44 +0000 (02:11 +0200)]
Fix some memory bugs in ldap.c
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: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.
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:48:35 +0000 (09:48 +0100)]
Revert "Partial fixed bug #79649 (Altering disable_functions from module init corrupts memory)"
This reverts commit
a297c09da5ad355d53a8e8ea72655a06d15b7bc7 .
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.
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 )
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
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 12:22:58 +0000 (14:22 +0200)]
Fixed bug #79784
The fix here is essentially the same as for bug #78598, just for
the undefined variable notice, rather than the undefined index one.
Christoph M. Becker [Tue, 7 Jul 2020 11:56:22 +0000 (13:56 +0200)]
[ci skip] Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Don't use deprecated curly brace offset syntax
Christoph M. Becker [Tue, 7 Jul 2020 11:21:26 +0000 (13:21 +0200)]
Don't use deprecated curly brace offset syntax
(cherry picked from commit
7ec3aa1871074f5de25865af42c984a7668eb85f )
Better safe than sorry in case someone ever builds PHP 7.3 with a
future version of PHP SDK with bundled PHP 8.