]>
granicus.if.org Git - php/log
Christoph M. Becker [Tue, 9 Jul 2019 08:04:20 +0000 (10:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Upgrade to SQLite 3.28.0
Christoph M. Becker [Tue, 9 Jul 2019 08:01:52 +0000 (10:01 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Upgrade to SQLite 3.28.0
Christoph M. Becker [Fri, 21 Jun 2019 13:48:50 +0000 (15:48 +0200)]
Upgrade to SQLite 3.28.0
Over the years, multiple security vulnerabilities[1] have been found
and fixed in SQLite3, so it makes sense to update our bundled libsqlite
to the latest available version.
[1] <https://www.cvedetails.com/vulnerability-list/vendor_id-9237/Sqlite.html>
Peter Kokot [Mon, 8 Jul 2019 16:48:50 +0000 (18:48 +0200)]
Update NEWS [ci skip]
Peter Kokot [Mon, 8 Jul 2019 16:48:27 +0000 (18:48 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS [ci skip]
Peter Kokot [Mon, 8 Jul 2019 16:45:36 +0000 (18:45 +0200)]
Update NEWS [ci skip]
Nikita Popov [Fri, 5 Jul 2019 10:07:10 +0000 (12:07 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 5 Jul 2019 10:06:52 +0000 (12:06 +0200)]
Backport fe_reset_rw case
Nikita Popov [Fri, 5 Jul 2019 09:40:45 +0000 (11:40 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 5 Jul 2019 09:39:42 +0000 (11:39 +0200)]
Fix inference for compound object op on dim
George Wang [Thu, 4 Jul 2019 16:04:08 +0000 (12:04 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
George Wang [Thu, 4 Jul 2019 16:03:21 +0000 (12:03 -0400)]
Updated to LiteSpeed SAPI V7.4.3
Increased response header count limit from 100 to 1000.
Added crash handler to cleanly shutdown PHP request.
Added CloudLinux mod_lsapi mode
Fixed bug #76058
Christoph M. Becker [Thu, 4 Jul 2019 12:50:23 +0000 (14:50 +0200)]
[ci skip] Remove NEWS entry
This commit already was contained in PHP 7.3.7, but doesn't need a NEWS
entry, since the regression had only been introduced with PHP 7.3.7RC1.
Fabien Villepinte [Thu, 4 Jul 2019 12:09:22 +0000 (14:09 +0200)]
Fix typo in NEWS [skip ci]
Nikita Popov [Wed, 3 Jul 2019 10:36:33 +0000 (12:36 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 3 Jul 2019 10:27:13 +0000 (12:27 +0200)]
Fixed bug #78231
Nikita Popov [Wed, 3 Jul 2019 08:19:31 +0000 (10:19 +0200)]
Fixed bug #78230
Christoph M. Becker [Wed, 3 Jul 2019 08:00:05 +0000 (10:00 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78241: touch() does not handle dates after 2038 in PHP 64-bit
Christoph M. Becker [Wed, 3 Jul 2019 07:59:17 +0000 (09:59 +0200)]
Fix #78241: touch() does not handle dates after 2038 in PHP 64-bit
`time_t` defaults to `_time64` (which is 64bit signed) even on x86, but
`Int32x32To64()` truncates it to signed 32bit. We replace the macro
with the "manual" calculation.
Nikita Popov [Tue, 2 Jul 2019 14:12:24 +0000 (16:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 2 Jul 2019 14:10:56 +0000 (16:10 +0200)]
Backport test fix
Closes GH-3816.
Christoph M. Becker [Tue, 2 Jul 2019 13:08:10 +0000 (15:08 +0200)]
Fix NEWS
Bug #78185 fixed a regression in PHP 7.3.7RC2, so should not be listed
here.
Nikita Popov [Tue, 2 Jul 2019 10:28:37 +0000 (12:28 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Alex Scott [Tue, 11 Jun 2019 14:31:07 +0000 (18:31 +0400)]
Fix bug #78138: opcache.validate_permission incorrectly works with PHAR files
opcache incorrectly handles PHAR files when opcache.validate_permission
option enabled, because it calls
access("phar://path-to/file.phar/path/inside.php", R_OK);
rather than
access("path-to/file.phar", R_OK)
Christoph M. Becker [Mon, 1 Jul 2019 16:12:28 +0000 (18:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add missing SKIPIFs
Christoph M. Becker [Mon, 1 Jul 2019 16:11:13 +0000 (18:11 +0200)]
Add missing SKIPIFs
All these tests are meant to run with OPcache available, and some will
even fail inevitably without it, so we add OPcache as SKIPIF
requirement.
Christoph M. Becker [Mon, 1 Jul 2019 15:22:55 +0000 (17:22 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add missing SKIPIFs
Christoph M. Becker [Mon, 1 Jul 2019 13:01:24 +0000 (15:01 +0200)]
Add missing SKIPIFs
All these tests are meant to run with OPcache available, and some will
even fail inevitably without it, so we add OPcache as SKIPIF
requirement.
Christoph M. Becker [Mon, 1 Jul 2019 14:43:47 +0000 (16:43 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix brittle test
Christoph M. Becker [Mon, 1 Jul 2019 14:41:20 +0000 (16:41 +0200)]
Fix brittle test
This test is easily tripped by former test runs with other PHP
versions. To avoid such false positives, we check that there is at
least one respective OPcache file, and that all found OPcache user ID
folders have exactly 32 hexadecimal digits.
Peter Kokot [Mon, 1 Jul 2019 00:54:42 +0000 (02:54 +0200)]
Update NEWS [ci skip]
Peter Kokot [Sun, 23 Jun 2019 13:46:47 +0000 (15:46 +0200)]
Fix bug #78197: PCRE2 version check
When external PCRE library version is of format ##.##-RC# the check
failed.
Derick Rethans [Sun, 30 Jun 2019 14:50:38 +0000 (15:50 +0100)]
Fixed tests due to changed timezone data
Derick Rethans [Sun, 30 Jun 2019 14:45:13 +0000 (15:45 +0100)]
Update timelib to 2018.02
Anatol Belski [Sat, 29 Jun 2019 15:40:14 +0000 (17:40 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS [ci skip]
Anatol Belski [Sat, 29 Jun 2019 15:39:45 +0000 (17:39 +0200)]
Update NEWS [ci skip]
Anatol Belski [Sat, 29 Jun 2019 11:30:35 +0000 (13:30 +0200)]
Fix typo
Joshua Westerheide [Sat, 29 Jun 2019 09:59:08 +0000 (11:59 +0200)]
Add tests from fix #78183 from PHP-7.2
Anatol Belski [Sat, 29 Jun 2019 11:29:41 +0000 (13:29 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78183: finfo_file shows wrong mime-type for .tga file
Joshua Westerheide [Fri, 28 Jun 2019 13:07:14 +0000 (15:07 +0200)]
Fix #78183: finfo_file shows wrong mime-type for .tga file
Due to a bug in the underlying libmagic 5.31, .tga images returned mime type "image/x-tgaimage/x-tga".
Nikita Popov [Fri, 28 Jun 2019 14:09:09 +0000 (16:09 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
sunnyeo [Fri, 28 Jun 2019 14:06:01 +0000 (16:06 +0200)]
Fix bugs in AST printer
Closes GH-4324.
Christoph M. Becker [Fri, 28 Jun 2019 10:36:33 +0000 (12:36 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #78192 PDO SQLite SegFault when reuse statement after schema has changed
Vincent [Wed, 26 Jun 2019 09:37:08 +0000 (11:37 +0200)]
Fix bug #78192 PDO SQLite SegFault when reuse statement after schema has changed
Reset stmt->columns when column count changed on new execution of prepared statement
Christoph M. Becker [Wed, 26 Jun 2019 15:01:29 +0000 (17:01 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Remove stream_socket_sendto.phpt
Nikita Popov [Wed, 26 Jun 2019 14:58:37 +0000 (16:58 +0200)]
Remove stream_socket_sendto.phpt
Fails for me locally due to different number of warnings with
different messages. Rather than adding more wildcards I'm dropping
this test entirely, as it doesn't seem to test anything particularly
useful.
(cherry picked from commit
84333cad674890174c47f3c21b1b1cf85a4276ac )
Christoph M. Becker [Tue, 25 Jun 2019 11:04:28 +0000 (13:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78202: Opcache stats for cache hits are capped at 32bit NUM
Christoph M. Becker [Tue, 25 Jun 2019 07:56:33 +0000 (09:56 +0200)]
Fix #78202: Opcache stats for cache hits are capped at 32bit NUM
We use the proper format specifiers now.
Andrey Hristov [Fri, 21 Jun 2019 13:32:13 +0000 (16:32 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
Andrey Hristov [Fri, 21 Jun 2019 13:30:25 +0000 (16:30 +0300)]
Add explicit cast to uint32_t.
It works even without it but explicit stuff is better. The compiler probably converts the 16-bit
uint16_t to uint32_t before doing the shift.
Nikita Popov [Fri, 21 Jun 2019 13:07:59 +0000 (15:07 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 21 Jun 2019 13:00:25 +0000 (15:00 +0200)]
Fix PKCS12 leak in openssl
Nikita Popov [Fri, 21 Jun 2019 12:43:15 +0000 (14:43 +0200)]
Fix d leak in ecc openssl_pkey_new
Nikita Popov [Fri, 21 Jun 2019 12:35:35 +0000 (14:35 +0200)]
Fix netscape spki leak in openssl
Nikita Popov [Fri, 21 Jun 2019 12:24:00 +0000 (14:24 +0200)]
Fix X509 leak in openssl_pkcs7_verify()
Nikita Popov [Fri, 21 Jun 2019 12:17:05 +0000 (14:17 +0200)]
Fix CSR leaks in openssl
Nikita Popov [Fri, 21 Jun 2019 12:03:06 +0000 (14:03 +0200)]
Free cert in php_openssl_load_stream_cafile()
X509_STORE_add_cert() increments the refcount of the cert, so we
should free it here.
Nikita Popov [Fri, 21 Jun 2019 10:55:12 +0000 (12:55 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Niklas Keller [Fri, 3 Aug 2018 19:00:14 +0000 (21:00 +0200)]
Fix memory leak in TLS matches_san_list
Christoph M. Becker [Thu, 20 Jun 2019 15:59:07 +0000 (17:59 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78189: file cache strips last character of uname hash
Christoph M. Becker [Thu, 20 Jun 2019 15:53:10 +0000 (17:53 +0200)]
Fix #78189: file cache strips last character of uname hash
We must not forget to increase `len` by one to cater to the directory
separator.
Christoph M. Becker [Thu, 20 Jun 2019 14:59:39 +0000 (16:59 +0200)]
Update NEWS
Remi Collet [Thu, 20 Jun 2019 09:58:49 +0000 (11:58 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix test for Windows and for parallel run
Remi Collet [Thu, 20 Jun 2019 09:58:32 +0000 (11:58 +0200)]
fix test for Windows and for parallel run
Remi Collet [Thu, 20 Jun 2019 09:51:51 +0000 (11:51 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
improve test clean section
Remi Collet [Thu, 20 Jun 2019 09:51:18 +0000 (11:51 +0200)]
improve test clean section
Remi Collet [Thu, 20 Jun 2019 08:41:21 +0000 (10:41 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
move NEWS entry
Remi Collet [Thu, 20 Jun 2019 08:40:52 +0000 (10:40 +0200)]
move NEWS entry
Remi Collet [Thu, 20 Jun 2019 08:28:00 +0000 (10:28 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
add test for #78185
Remi Collet [Thu, 20 Jun 2019 08:27:33 +0000 (10:27 +0200)]
add test for #78185
Dmitry Stogov [Thu, 20 Jun 2019 06:05:50 +0000 (09:05 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #78185 (File cache no longer works)
Dmitry Stogov [Thu, 20 Jun 2019 06:04:14 +0000 (09:04 +0300)]
Fixed bug #78185 (File cache no longer works)
Andrey Hristov [Wed, 19 Jun 2019 13:43:06 +0000 (16:43 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
Andrey Hristov [Wed, 19 Jun 2019 13:42:43 +0000 (16:42 +0300)]
Fix version comparison
Joe Watkins [Wed, 19 Jun 2019 10:42:25 +0000 (12:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix setcookie Max-Age to use php_time
Joe Watkins [Wed, 19 Jun 2019 10:42:00 +0000 (12:42 +0200)]
fix setcookie Max-Age to use php_time
Joe Watkins [Wed, 19 Jun 2019 10:40:23 +0000 (12:40 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
export php_time
Joe Watkins [Wed, 19 Jun 2019 10:39:51 +0000 (12:39 +0200)]
export php_time
Joe Watkins [Wed, 19 Jun 2019 06:58:28 +0000 (08:58 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Resolve discrepencies between second value yielded by gettimeofday and time, fixes #69044
Joe Watkins [Tue, 18 Jun 2019 09:06:00 +0000 (11:06 +0200)]
Resolve discrepencies between second value yielded by gettimeofday and time, fixes #69044
Christoph M. Becker [Tue, 18 Jun 2019 15:08:58 +0000 (17:08 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78173: XML-RPC mutates immutable objects during encoding
Asher Baker [Tue, 18 Jun 2019 14:05:38 +0000 (15:05 +0100)]
Fix #78173: XML-RPC mutates immutable objects during encoding
With opcache.protect_memory=1 enabled, the XML-RPC extension causes a
segfault on PHP 7.2 as it is modifying the recursion counter of objects
it touches, without first checking if they are immutable or not.
This doesn't affect 7.3+
Christoph M. Becker [Tue, 18 Jun 2019 07:33:35 +0000 (09:33 +0200)]
Update NEWS
Remi Collet [Tue, 18 Jun 2019 05:51:05 +0000 (07:51 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
move NEWS entry
Remi Collet [Tue, 18 Jun 2019 05:50:44 +0000 (07:50 +0200)]
move NEWS entry
Nikita Popov [Mon, 17 Jun 2019 11:30:56 +0000 (13:30 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 17 Jun 2019 11:30:15 +0000 (13:30 +0200)]
Accept null for preg_quote delimiter argument
Related to bug #78163.
Erik Lundin [Sat, 15 Jun 2019 07:31:16 +0000 (09:31 +0200)]
Add syslog.filter=raw
This passes through syslog message unchanged, without splitting
messages at newlines.
Dmitry Stogov [Fri, 14 Jun 2019 10:29:30 +0000 (13:29 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Backport
96a12578c13b5c37195b10526fcdc669b795644d
Dmitry Stogov [Fri, 14 Jun 2019 10:29:13 +0000 (13:29 +0300)]
Dmitry Stogov [Fri, 14 Jun 2019 10:25:06 +0000 (13:25 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Backport
91a6cdbff5ebd1ca4db1d6e8c42d3265ce80ace4
Dmitry Stogov [Fri, 14 Jun 2019 10:24:47 +0000 (13:24 +0300)]
Nikita Popov [Fri, 14 Jun 2019 09:11:24 +0000 (11:11 +0200)]
Fix some leaks in ldap
The result of zval_get_string() needs to be released. In some places
where it is inconvenient to manage, I went back to convert_to_string.
It is safe in those places due to existing array separations.
Also fix a preexisting leak when getting controls, the previous
value was not destroyed.
Côme Chilliet [Thu, 13 Jun 2019 20:12:34 +0000 (22:12 +0200)]
Some more string conversion handling, fixing bug #77958
Côme Chilliet [Thu, 13 Jun 2019 18:58:45 +0000 (20:58 +0200)]
Avoid converting zval when not needed
Also added exception checks so that exception from __toString are
correctly handled in the future
Nikita Popov [Thu, 13 Jun 2019 10:52:22 +0000 (12:52 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 13 Jun 2019 10:51:35 +0000 (12:51 +0200)]
Fixed bug #78106
When disabling opcache during the request via opcache.enable ini
setting, make sure we also disable ZCG(accelerator_enabled).
Nikita Popov [Thu, 13 Jun 2019 10:38:57 +0000 (12:38 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 13 Jun 2019 10:35:29 +0000 (12:35 +0200)]
Add test for bug #78106
Also add PHP_TEST_EXTRA_ARGS environment variable, which allows
to pass on -c, -d etc flags provided by run-tests.php. Otherwise
we won't get the built-in server to run with opcache.
Tyson Andre [Sun, 9 Jun 2019 21:37:38 +0000 (17:37 -0400)]
Be more precise about possible types for mysqli methods
mysqli has an uncommon approach to 64-bit compatibility:
it will convert numbers that can't be represented on 32-bit
platforms to a string.
This is documented at
https://www.php.net/manual/en/mysqli-stmt.affected-rows.php#refsect1-mysqli-stmt.affected-rows-returnvalues
So if there's a query to a remote mysqli server that affects
more than 2.2 billion rows, then the opcache inference might be
incorrect.
(It's possible to add a MAY_BE_STRING_ON_32_BIT_PLATFORM bitflag macro to
account for this, but I don't think there's a need or want to?)
Patches
3162285b86871fb22a85a50ce9bc30823da64b6a
This is based on the list of php 7.4 functions using
MYSQLI_RETURN_LONG_INT in mysqli_api.c