]>
granicus.if.org Git - php/log
Nikita Popov [Mon, 6 Jan 2020 13:43:05 +0000 (14:43 +0100)]
Rename skeleton stub file
Add the .php suffix
Christoph M. Becker [Mon, 6 Jan 2020 12:24:07 +0000 (13:24 +0100)]
Fix hypothetical segfault in gdTransformAffineCopy()
This has been reported to upstream[1], but since ext/gd never calls
`gdTransformAffineCopy()` for a palette image, it is not a bug for PHP.
Therefore we apply the fix to master only.
[1] <https://github.com/libgd/libgd/issues/586>
Nikita Popov [Mon, 6 Jan 2020 09:43:05 +0000 (10:43 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't link against openssl 1.1 in curl
Nikita Popov [Mon, 6 Jan 2020 09:40:43 +0000 (10:40 +0100)]
Don't link against openssl 1.1 in curl
OpenSSL 1.1 does not need crypto locking callbacks, so avoid
detecting and linking against it in the first place.
Christoph M. Becker [Mon, 6 Jan 2020 09:39:00 +0000 (10:39 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79068: gdTransformAffineCopy() changes interpolation method
Christoph M. Becker [Mon, 6 Jan 2020 09:38:08 +0000 (10:38 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79068: gdTransformAffineCopy() changes interpolation method
Christoph M. Becker [Mon, 6 Jan 2020 09:33:47 +0000 (10:33 +0100)]
Fix #79068: gdTransformAffineCopy() changes interpolation method
We port
<https://github.com/libgd/libgd/commit/
9088591eae437358ee5b929adf82865e37e3001e >.
Nikita Popov [Mon, 6 Jan 2020 09:31:34 +0000 (10:31 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #79063: Curl openssl does not respect PKG_CONFIG_PATH
Clean up curl openssl check
Nikita Popov [Mon, 6 Jan 2020 09:29:41 +0000 (10:29 +0100)]
Fix bug #79063: Curl openssl does not respect PKG_CONFIG_PATH
Nikita Popov [Mon, 6 Jan 2020 09:16:42 +0000 (10:16 +0100)]
Clean up curl openssl check
Only set HAVE_CURL_OPENSSL flag, and remove Windows specific code,
as all of this is only relevant for OpenSSL < 1.1, which is not
used on Windows.
Christoph M. Becker [Mon, 6 Jan 2020 08:38:19 +0000 (09:38 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79067: gdTransformAffineCopy() may use unitialized values
Christoph M. Becker [Mon, 6 Jan 2020 08:36:49 +0000 (09:36 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79067: gdTransformAffineCopy() may use unitialized values
Christoph M. Becker [Mon, 6 Jan 2020 08:35:13 +0000 (09:35 +0100)]
Fix #79067: gdTransformAffineCopy() may use unitialized values
We port
<https://github.com/libgd/libgd/commit/
7a06c1669c563917bc48c464521e3de962ddb4e8 >.
Christoph M. Becker [Mon, 6 Jan 2020 07:53:50 +0000 (08:53 +0100)]
Remove useless else branch
Passing `NULL` as `gdTransformAffineGetImage()`'s `src_area` is fine,
but in this case there's no need to calculate the `rect`, and since
`pRect` has already been initialized to `NULL`, we can remove the whole
else branch.
Máté Kocsis [Sat, 4 Jan 2020 10:01:59 +0000 (11:01 +0100)]
Throw exception for unconstructed intl objects
Closes GH-5052
Christoph M. Becker [Sun, 5 Jan 2020 19:08:39 +0000 (20:08 +0100)]
Remove duplicate test cases
These had originally used other exit codes as mail_basic5.phpt, but
that was changed later with commit
d1b12c9 [1].
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
d1b12c9a3031841302722d6f6706e4598a639d7a >
Gabriel Caruso [Sat, 2 Nov 2019 15:29:42 +0000 (16:29 +0100)]
Fix slowest tests
Matteo Beccati [Sat, 4 Jan 2020 09:27:43 +0000 (10:27 +0100)]
Fix build if SQLITE_RECURSIVE is not supported
Tyson Andre [Sat, 4 Jan 2020 00:04:20 +0000 (19:04 -0500)]
Merge branch 'identical-handler' into HEAD
Máté Kocsis [Fri, 3 Jan 2020 21:40:16 +0000 (22:40 +0100)]
Fix usage of RETURN_THROWS() in LDAP extension
Máté Kocsis [Fri, 3 Jan 2020 19:44:29 +0000 (20:44 +0100)]
Use RETURN_THROWS() in various places
Máté Kocsis [Fri, 3 Jan 2020 18:16:51 +0000 (19:16 +0100)]
Use RETURN_THROWS() after zend_fetch_resource*()
Máté Kocsis [Sat, 12 Oct 2019 19:53:15 +0000 (21:53 +0200)]
Add stubs for various intl functions
Closes GH-4819
- Add stubs for idn functions
- Add stubs for grapheme functions
- Add stubs for Spoofchecker
- Add stubs for Normalizer
- Add stubs for ResourceBundle
- Fix arginfos
- Add support for union return types
- Fix arginfo for resourcebundle_create()
Christoph M. Becker [Fri, 3 Jan 2020 17:51:25 +0000 (18:51 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78808: [LMDB] MDB_MAP_FULL: Environment mapsize limit reached
Christoph M. Becker [Fri, 3 Jan 2020 17:49:36 +0000 (18:49 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78808: [LMDB] MDB_MAP_FULL: Environment mapsize limit reached
Christoph M. Becker [Thu, 14 Nov 2019 10:21:41 +0000 (11:21 +0100)]
Fix #78808: [LMDB] MDB_MAP_FULL: Environment mapsize limit reached
We implement support for a fifth parameter, which allows to specify the
mapsize. The parameter defaults to zero, in which case the compiled in
default mapsize (usually
1048576 ) will be used. The mapsize should be
a multiple of the page size of the OS.
Christoph M. Becker [Fri, 3 Jan 2020 17:13:44 +0000 (18:13 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78538: shmop memory leak
Christoph M. Becker [Fri, 3 Jan 2020 17:12:41 +0000 (18:12 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78538: shmop memory leak
Christoph M. Becker [Mon, 25 Nov 2019 13:05:15 +0000 (14:05 +0100)]
Fix #78538: shmop memory leak
If the descriptor's refcount drops to zero, we have to unmap the
respective file view, to avoid leaking memory.
Máté Kocsis [Fri, 3 Jan 2020 16:04:06 +0000 (17:04 +0100)]
Use RETURN_THROWS() after try_convert_to_string()
mike [Mon, 16 Dec 2019 13:31:14 +0000 (14:31 +0100)]
Adding DateTime(Immutable)::createFromInterface()
These are like
DateTime::createFromImmutable()
DateTimeImmutable::createFromMutable()
but accept any DateTimeInterface instead.
Closes GH-5016.
Nikita Popov [Fri, 3 Jan 2020 15:49:42 +0000 (16:49 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Slightly increase tolerance in time_sleep_until() test
Nikita Popov [Fri, 3 Jan 2020 15:48:06 +0000 (16:48 +0100)]
Slightly increase tolerance in time_sleep_until() test
With the 1ms tolerance this still occasionally fails on macos.
I love macos. It always works and causes no problems at all.
Christoph M. Becker [Fri, 3 Jan 2020 15:45:23 +0000 (16:45 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Try to fix intermittently failing test case
Christoph M. Becker [Fri, 3 Jan 2020 15:44:53 +0000 (16:44 +0100)]
Try to fix intermittently failing test case
This test fails intermittently due to taskill reporting failure to kill
the process (because it already has been terminated). We increase the
sleep time, to hopefully prevent that from happening again.
Christoph M. Becker [Fri, 3 Jan 2020 13:32:56 +0000 (14:32 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #79015: undefined-behavior in php_date.c
Christoph M. Becker [Fri, 3 Jan 2020 13:32:04 +0000 (14:32 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79015: undefined-behavior in php_date.c
Christoph M. Becker [Mon, 23 Dec 2019 13:42:54 +0000 (14:42 +0100)]
Fix #79015: undefined-behavior in php_date.c
We check that the given microsecond fraction is in the valid range
[0,
1000000 [, and otherwise mark it as invalid. We also drop the
useless do loop; a plain block is sufficient here.
Christoph M. Becker [Fri, 27 Dec 2019 13:04:31 +0000 (14:04 +0100)]
Don't enable sanitizer by default for Windows snapshot builds
Snapshot builds are release builds, and therefore enabling sanitizers
is undesireable.
Máté Kocsis [Fri, 3 Jan 2020 11:11:45 +0000 (12:11 +0100)]
Convert zend_parse_parameters_none() to fast ZPP
I've done the conversion in those extensions where fast ZPP is predominant.
Máté Kocsis [Fri, 3 Jan 2020 12:22:16 +0000 (13:22 +0100)]
Use zend_parse_parameters_none() instead of zend_parse_parameters_none_throw()
Nikita Popov [Fri, 3 Jan 2020 11:03:31 +0000 (12:03 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove unnecessary strncpy in zip
Nikita Popov [Fri, 3 Jan 2020 10:51:46 +0000 (11:51 +0100)]
Remove unnecessary strncpy in zip
This causes a warning on GCC 9 and is unnecessary to boot: We
only use "cwd" for the open_basedir check, so we can just as well
pass in the original string.
Nikita Popov [Fri, 3 Jan 2020 10:27:27 +0000 (11:27 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add test for bug #73816
Nikita Popov [Fri, 3 Jan 2020 10:26:31 +0000 (11:26 +0100)]
Add test for bug #73816
This has been fixed by
0f2cdbf214efd98b4bdaf5ca41728faf00e7c037 ,
add the test case.
Nikita Popov [Fri, 3 Jan 2020 10:16:25 +0000 (11:16 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #71876
Nikita Popov [Fri, 3 Jan 2020 10:16:14 +0000 (11:16 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #71876
Nikita Popov [Fri, 3 Jan 2020 10:14:45 +0000 (11:14 +0100)]
Fixed bug #71876
This is a backport of
fcdc0a6db0ae63fbed9e3828137b899b844623ce
to the PHP-7.3 branch. We need to make sure that OnUpdateString
is also called for a NULL value, otherwise the reset of the encoding
at the end of the request will not work.
Nikita Popov [Fri, 3 Jan 2020 10:09:06 +0000 (11:09 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79056
Nikita Popov [Fri, 3 Jan 2020 09:40:51 +0000 (10:40 +0100)]
Fixed bug #79056
Nikita Popov [Thu, 31 Oct 2019 11:13:18 +0000 (12:13 +0100)]
Implement WeakMap
RFC: https://wiki.php.net/rfc/weak_maps
Máté Kocsis [Fri, 3 Jan 2020 09:18:34 +0000 (10:18 +0100)]
Use RETURN_THROWS() after zend_throw_exception() in reflection extension
Máté Kocsis [Thu, 2 Jan 2020 21:56:45 +0000 (22:56 +0100)]
Use RETURN_THROWS() after zend_parse_method_parameters()
Christoph M. Becker [Thu, 2 Jan 2020 18:28:45 +0000 (19:28 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add test case for bug #78883
Christoph M. Becker [Thu, 2 Jan 2020 18:25:31 +0000 (19:25 +0100)]
Add test case for bug #78883
The original test has been provided by divinity76.
Nikita Popov [Thu, 2 Jan 2020 14:55:01 +0000 (15:55 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79055
Extract functions for file cache type serialization
Nikita Popov [Thu, 2 Jan 2020 14:50:44 +0000 (15:50 +0100)]
Fixed bug #79055
Fix file cache serialization of property types. I'm changing the
overall type serialization format to perform additional adjustments
in order to yield a plausible pointer for zend_type, rather than
using an entirely separate serialization format, as was previously
done. That would have been annoying to extend to the case of CE
pointers.
Nikita Popov [Thu, 2 Jan 2020 14:16:24 +0000 (15:16 +0100)]
Extract functions for file cache type serialization
This is already done in master.
Nikita Popov [Thu, 2 Jan 2020 14:01:56 +0000 (15:01 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix file cache run_time_cache unserialization
Update ZCSG(map_ptr_last) only if for_shm
Nikita Popov [Thu, 2 Jan 2020 13:56:39 +0000 (14:56 +0100)]
Fix file cache run_time_cache unserialization
If the script was serialized as file_cache_only (thus non-immutable)
and then gets unserialized into SHM, we need to allocate a new
run_time_cache slot and can't use the serialized arena pointer.
Nikita Popov [Thu, 2 Jan 2020 10:59:36 +0000 (11:59 +0100)]
Update ZCSG(map_ptr_last) only if for_shm
Otherwise we may get a memory protection fault here. Updating of
ZCSG(map_ptr_last) is handled when loading from file cache to SHM.
Nikita Popov [Thu, 2 Jan 2020 10:14:16 +0000 (11:14 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Populate hashtable of __sleep() properties
Deref names returned by __sleep()
Extract php_var_serialize_nested_data() function
Nikita Popov [Thu, 2 Jan 2020 10:11:01 +0000 (11:11 +0100)]
Populate hashtable of __sleep() properties
Instead of populating a hashtable of property names and then
directly serializing.
This has the advantage of a) detecting duplicate properties more
precisely and b) gives us the ability to discard values without
rewriting the serialization string after the fact for GH-5027.
Nikita Popov [Thu, 2 Jan 2020 09:52:50 +0000 (10:52 +0100)]
Deref names returned by __sleep()
Nikita Popov [Thu, 2 Jan 2020 09:43:01 +0000 (10:43 +0100)]
Extract php_var_serialize_nested_data() function
And split code-paths for arrays and objects based on it.
Máté Kocsis [Thu, 2 Jan 2020 09:35:31 +0000 (10:35 +0100)]
Use RETURN_THROWS() after zend_throw_exception() in most of the extensions
Nikita Popov [Mon, 30 Dec 2019 17:04:07 +0000 (18:04 +0100)]
Switch hash() function to use fastzpp
For short inputs ZPP can be a large fraction of the hash()
execution time.
Nikita Popov [Mon, 30 Dec 2019 17:01:55 +0000 (18:01 +0100)]
Switch php_hash_fetch_ops() to use zend_string
This has two advantages: If the string is already lowercase, we
do not need to copy it, and it will hopefully match the interned
string name of the hash, making the comparison more efficient.
Tyson Andre [Mon, 30 Dec 2019 16:15:22 +0000 (11:15 -0500)]
Always delete tempfile created by ftruncate test.
The ftruncate() test will fill up the disk when the disk has less than
2GB of space left, on some systems.
I think it expands the file to less than 2GB, then returns an error code,
and the file remains at the larger size.
Because the disk is full, the `--CLEAN--` script can't be saved to
`ftruncate_bug76422.clean.php` to be executed, and the cleanup can't be run.
Subsequent tests also fail to run.
Closes GH-5043
Máté Kocsis [Wed, 1 Jan 2020 15:42:30 +0000 (16:42 +0100)]
Use RETURN_THROWS() after zend_throw_error()
Máté Kocsis [Wed, 1 Jan 2020 13:23:21 +0000 (14:23 +0100)]
Use RETURN_THROWS() after zend_type_error()
Máté Kocsis [Tue, 31 Dec 2019 15:58:15 +0000 (16:58 +0100)]
Use RETURN_THROWS() after zend_value_error()
Máté Kocsis [Tue, 31 Dec 2019 15:33:02 +0000 (16:33 +0100)]
Use RETURN_THROWS() during ZPP in the remaining extensions
In reflection, sodium, and SPL
Christoph M. Becker [Tue, 31 Dec 2019 13:27:45 +0000 (14:27 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Revert "Add test case for bug #78883"
Christoph M. Becker [Tue, 31 Dec 2019 13:26:52 +0000 (14:26 +0100)]
[ci skip] Revert "Add test case for bug #78883"
This reverts commit
09e76cbe6d73399f3476942e7502de0bdbf65fa2 , because
the test fails reliably on AppVeyor. This needs closer investigation.
Christoph M. Becker [Tue, 31 Dec 2019 12:09:57 +0000 (13:09 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add test case for bug #78883
Christoph M. Becker [Tue, 31 Dec 2019 12:02:05 +0000 (13:02 +0100)]
Add test case for bug #78883
The actual test has been provided by divinity76.
Christoph M. Becker [Tue, 31 Dec 2019 11:22:43 +0000 (12:22 +0100)]
Fix erroneous change
Christoph M. Becker [Tue, 31 Dec 2019 11:00:48 +0000 (12:00 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove superfluous compiler option
Christoph M. Becker [Tue, 31 Dec 2019 10:50:24 +0000 (11:50 +0100)]
Remove superfluous compiler option
`-fsanitize-address-use-after-scope` is the default as of clang 5.0.0,
and we don't allow to enable ASan for older versions anyway.
Máté Kocsis [Tue, 31 Dec 2019 10:27:02 +0000 (11:27 +0100)]
Use RETURN_THROWS() during ZPP in most of the extensions
Except for some bigger ones: reflection, sodium, spl
Máté Kocsis [Mon, 30 Dec 2019 17:20:30 +0000 (18:20 +0100)]
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
Máté Kocsis [Mon, 30 Dec 2019 17:15:44 +0000 (18:15 +0100)]
Use ZEND_THROWS() during ZPP in enchant, exif, fileinfo, filter, and FTP extensions
Máté Kocsis [Mon, 30 Dec 2019 17:14:29 +0000 (18:14 +0100)]
Use RETURN_THROWS() during ZPP in the date, dba and dom extensions
Máté Kocsis [Mon, 30 Dec 2019 17:09:40 +0000 (18:09 +0100)]
Use RETURN_THROWS() during ZPP in bz2, calendar, com_dotnet extensions
Nikita Popov [Mon, 30 Dec 2019 22:22:39 +0000 (23:22 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Also propagate include exceptions in opcache
Make url_stats in resolve_path quiet
Nikita Popov [Mon, 30 Dec 2019 22:21:32 +0000 (23:21 +0100)]
Also propagate include exceptions in opcache
Nikita Popov [Mon, 30 Dec 2019 22:06:12 +0000 (23:06 +0100)]
Make url_stats in resolve_path quiet
These stats are used to check whether the file exists -- they
should not generate errors. Having the flag set is particularly
important for custom stream wrappers.
Christoph M. Becker [Mon, 30 Dec 2019 22:18:34 +0000 (23:18 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid undefined behavior
Christoph M. Becker [Mon, 30 Dec 2019 22:13:39 +0000 (23:13 +0100)]
Avoid undefined behavior
Nikita Popov [Mon, 30 Dec 2019 21:57:07 +0000 (22:57 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Properly propagate url_stat exceptions during include
Nikita Popov [Mon, 30 Dec 2019 21:47:38 +0000 (22:47 +0100)]
Properly propagate url_stat exceptions during include
Make sure we abort operations early, and that we don't emit
additional warnings or errors if an exception has been thrown.
Christoph M. Becker [Mon, 30 Dec 2019 17:32:52 +0000 (18:32 +0100)]
Fix typo
Christoph M. Becker [Mon, 30 Dec 2019 15:18:46 +0000 (16:18 +0100)]
Fix #78790: mysqli_get_client_info() expects exactly 0 parameters, 1 given
Although the `mysqli` parameter is unused, it had been accepted so far,
and the documentation even claims that parameter would be required. To
not break BC, we allow it again.
Máté Kocsis [Mon, 30 Dec 2019 16:35:46 +0000 (17:35 +0100)]
Use RETURN_THROWS() during ZPP in main, sapi, win32, and Zend
Máté Kocsis [Sun, 29 Dec 2019 19:54:57 +0000 (20:54 +0100)]
Use RETURN_THROWS() when an exception is thrown
Closes GH-5036
Nikita Popov [Mon, 30 Dec 2019 16:24:16 +0000 (17:24 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79046
Nikita Popov [Mon, 30 Dec 2019 16:22:50 +0000 (17:22 +0100)]
Fixed bug #79046
Christoph M. Becker [Mon, 30 Dec 2019 16:21:50 +0000 (17:21 +0100)]
Fix typo
Máté Kocsis [Sun, 29 Dec 2019 20:14:36 +0000 (21:14 +0100)]
Convert zend_parse_parameters_none() to fast ZPP in standard lib
Closes GH-5037