]>
granicus.if.org Git - php/log
Christoph M. Becker [Thu, 1 Aug 2019 08:50:08 +0000 (10:50 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Remove upgrade-pcre.php script
Christoph M. Becker [Thu, 1 Aug 2019 08:49:05 +0000 (10:49 +0200)]
Remove upgrade-pcre.php script
This script has not been updated for PCRE2, and it's mostly useless
anyway. Therefore we remove it altogether.
Nikita Popov [Thu, 1 Aug 2019 08:10:28 +0000 (10:10 +0200)]
Add test for bug #78356
Nikita Popov [Thu, 1 Aug 2019 08:06:23 +0000 (10:06 +0200)]
Revert "Use RW fetch for argument unpacking"
This reverts commit
6913ec3282149914e999d91b056fe1cc68d15ed7 .
This reverts commit
a9e332e02777c9b3805f6af846a4f48504109d2b .
Causes https://bugs.php.net/bug.php?id=78356, which I don't have
a good solution for.
Christoph M. Becker [Wed, 31 Jul 2019 16:08:05 +0000 (18:08 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix 78213: Empty row pocket
Christoph M. Becker [Wed, 31 Jul 2019 16:05:40 +0000 (18:05 +0200)]
Fix 78213: Empty row pocket
We have to ensure that we don't create an arena which is smaller than
its header, regardless of the configured alignment.
Peter Kokot [Tue, 30 Jul 2019 20:09:00 +0000 (22:09 +0200)]
Update NEWS
Peter Kokot [Mon, 29 Jul 2019 19:12:40 +0000 (21:12 +0200)]
Fix #78348: Remove -lrt from pdo_sqlite.so
The fdatasync check has been removed since PHP 5.3.
The Solaris fix was introduced via
8d63360fc40dec579af5b5f455ef02b85caff5c5
and is today no longer relevant since the sqlite library is neither
bundled in php-src anymore neither the check needs to be done via the
PHP build system.
Closes GH-4485
Christoph M. Becker [Tue, 30 Jul 2019 14:32:49 +0000 (16:32 +0200)]
Fix tests
Apparently, nobody is testing with MySQL < 5.6 for quite a while. We
should consider dropping support for these very old versions.
Nikita Popov [Tue, 30 Jul 2019 08:31:51 +0000 (10:31 +0200)]
Handle RW UNPACK in inference
Nikita Popov [Tue, 23 Jul 2019 13:54:35 +0000 (15:54 +0200)]
Fix FPM timer event re-registration
Make sure that fpm_event_add calls inside a timer callback work by
unregistering the event from the queue before invoking its callback.
The read timeout in tester.inc is increased because the added test
needs two seconds (one for SIGTERM, one for SIGKILL) until the
reload succeeds, so we should wait longer than that for a response.
Nikita Popov [Tue, 30 Jul 2019 08:05:12 +0000 (10:05 +0200)]
Use RW fetch for argument unpacking
Argument unpacking may need to create references inside the array
that is being unpacked. However, it currently can only do this
if a plain variable is unpacked, not for any nested accesses,
because the value is fetched for read. Resolve this by fetching
the operands for RW.
Christoph M. Becker [Tue, 30 Jul 2019 07:50:18 +0000 (09:50 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add security related NEWS entries [ci skip]
Christoph M. Becker [Tue, 30 Jul 2019 07:49:39 +0000 (09:49 +0200)]
Add security related NEWS entries [ci skip]
Remi Collet [Tue, 30 Jul 2019 07:27:20 +0000 (09:27 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
add security NEW entries + reorder [ci skip]
Remi Collet [Tue, 30 Jul 2019 07:27:06 +0000 (09:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
add security NEW entries + reorder [ci skip]
Remi Collet [Tue, 30 Jul 2019 07:26:50 +0000 (09:26 +0200)]
add security NEW entries + reorder [ci skip]
Stanislav Malyshev [Mon, 29 Jul 2019 21:51:21 +0000 (14:51 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78338: Array cross-border reading in PCRE
Christoph M. Becker [Mon, 29 Jul 2019 17:31:47 +0000 (19:31 +0200)]
Fix #78338: Array cross-border reading in PCRE
We backport r1092 from pcre2.
Stanislav Malyshev [Mon, 29 Jul 2019 20:20:52 +0000 (13:20 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77919: Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
Stanislav Malyshev [Mon, 29 Jul 2019 20:20:44 +0000 (13:20 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77919: Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
Stanislav Malyshev [Mon, 29 Jul 2019 20:19:16 +0000 (13:19 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #77919: Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
Christoph M. Becker [Mon, 29 Jul 2019 14:08:03 +0000 (16:08 +0200)]
Fix #77919: Potential UAF in Phar RSHUTDOWN
We have to properly clean up in case phar_flush() is failing.
We also make the expectation of the respective test case less liberal
to avoid missing such bugs in the future.
Stanislav Malyshev [Mon, 29 Jul 2019 07:55:18 +0000 (00:55 -0700)]
Update NEWS
Nikita Popov [Mon, 29 Jul 2019 18:01:20 +0000 (20:01 +0200)]
Don't explicitly install homebrew
It is already installed on azure, and this installation step is
very unreliable lately.
Christoph M. Becker [Mon, 29 Jul 2019 16:46:05 +0000 (18:46 +0200)]
Fix build for --disable-signals
Nikita Popov [Mon, 29 Jul 2019 15:34:21 +0000 (17:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 29 Jul 2019 15:34:08 +0000 (17:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Albert Casademont [Tue, 23 Jul 2019 12:03:06 +0000 (14:03 +0200)]
Fix bug #78326
Similar to what fread() does, truncate the stream_get_contents()
result if the original buffer was way too large.
Nikita Popov [Mon, 29 Jul 2019 14:58:29 +0000 (16:58 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 29 Jul 2019 14:57:57 +0000 (16:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 23 Jul 2019 08:38:23 +0000 (10:38 +0200)]
Fix Zend signals unblocking
There are a few parts here:
* opcache should not be blocking signals while invoking compile_file,
otherwise signals may remain blocked on a compile error. While at
it, also protect SHM memory during compile_file.
* We should deactivate Zend signals at the end of the request, to make
sure that we gracefully recover from a missing unblock and signals
don't remain blocked forever.
* We don't use a critical section in deactivation, because it should
not be necessary. Additionally we want to clean up the signal queue,
if it is non-empty.
* Enable SIGG(check) in debug builds so we notice issues in the future.
Christoph M. Becker [Mon, 29 Jul 2019 12:48:57 +0000 (14:48 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS [ci skip]
Christoph M. Becker [Mon, 29 Jul 2019 12:48:23 +0000 (14:48 +0200)]
Update NEWS [ci skip]
The fix has been cherry-picked into PHP-7.3.8, so the bug will be fixed
already there.
Christoph M. Becker [Thu, 25 Jul 2019 15:05:43 +0000 (17:05 +0200)]
Document how to generate ffi_parser.c
Nikita Popov [Mon, 29 Jul 2019 11:03:28 +0000 (13:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 29 Jul 2019 11:02:01 +0000 (13:02 +0200)]
Fixed bug #78341
The smart branch logic assumed b->start refers to the old offsets,
while b->start was already adjusted to the new offsets at this
point. Delay the change until later.
Nikita Popov [Mon, 29 Jul 2019 09:27:39 +0000 (11:27 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 29 Jul 2019 09:27:34 +0000 (11:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 29 Jul 2019 09:23:26 +0000 (11:23 +0200)]
Fixed bug #78333
Don't dereference float/double values at unknown address, instead
memcpy it into an aligned stack slot and dereference that.
Nikita Popov [Mon, 29 Jul 2019 09:26:15 +0000 (11:26 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 29 Jul 2019 09:26:00 +0000 (11:26 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 29 Jul 2019 09:23:26 +0000 (11:23 +0200)]
Fixed bug #78333
Don't dereference float/double values at unknown address, instead
memcpy it into an aligned stack slot and dereference that.
Nikita Popov [Mon, 29 Jul 2019 09:12:00 +0000 (11:12 +0200)]
Fixed bug #78344
When performing a constant visibility check during compilation we
might be dealing with unlinked classes and as such should account
for the possibility of unresolved parents.
Nikita Popov [Mon, 29 Jul 2019 08:07:12 +0000 (10:07 +0200)]
Fixed bug #78340
Even if we know the file size, we still need to read in a loop in
case the read call returns an incomplete result.
This was less of an issue previously because we did not use the
"one large read" approach for non-plain stream wrappers.
Stanislav Malyshev [Mon, 8 Jul 2019 00:39:59 +0000 (17:39 -0700)]
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Stanislav Malyshev [Mon, 8 Jul 2019 00:01:01 +0000 (17:01 -0700)]
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
Christoph M. Becker [Mon, 29 Jul 2019 06:51:14 +0000 (08:51 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78342: Bus error in configure test for iconv //IGNORE
Christoph M. Becker [Mon, 29 Jul 2019 06:50:17 +0000 (08:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78342: Bus error in configure test for iconv //IGNORE
Christoph M. Becker [Mon, 29 Jul 2019 06:48:13 +0000 (08:48 +0200)]
Fix #78342: Bus error in configure test for iconv //IGNORE
We have to check the return value of iconv_open() for error, to avoid
that and potentially other undesired behavior of iconv().
Tyson Andre [Sat, 27 Jul 2019 18:35:42 +0000 (14:35 -0400)]
nit: Fix a typo in UPGRADING
Closes GH-4481
Sebastian Jennen [Sat, 27 Jul 2019 07:47:32 +0000 (09:47 +0200)]
file encoding cleanup: remove bom in win32 files
These two files have been: "UTF-8 Unicode (with BOM) text".
By applying `dos2unix` on these files the BOM has been removed.
I checked the whole source code with dos2unix:
These were the only two text files affected.
Peter Kokot [Tue, 23 Jul 2019 23:01:11 +0000 (01:01 +0200)]
Mention also API versions bumps
Closes GH-4470
Theodore Brown [Thu, 25 Jul 2019 17:23:26 +0000 (12:23 -0500)]
Fix typos in UPGRADING and improve wording in a few places
Closes GH-4478
Christoph M. Becker [Thu, 25 Jul 2019 17:09:21 +0000 (19:09 +0200)]
Remove duplication
Levi Morrison [Thu, 25 Jul 2019 15:50:47 +0000 (09:50 -0600)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Remove .post files only for passing tests
Levi Morrison [Thu, 25 Jul 2019 15:49:18 +0000 (09:49 -0600)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Remove .post files only for passing tests
Levi Morrison [Thu, 25 Jul 2019 15:48:29 +0000 (09:48 -0600)]
Remove .post files only for passing tests
This allows the sh script for failing tests with --POST-- to work
Matteo Beccati [Thu, 25 Jul 2019 14:28:42 +0000 (16:28 +0200)]
Addded missing NEWS/UPGRADING entries for PDO "??" escape
Remi Collet [Wed, 24 Jul 2019 14:06:07 +0000 (16:06 +0200)]
Fix build warnings
- switch from strncpy to memcpy for -Wstringop-truncation
Nikita Popov [Tue, 23 Jul 2019 09:57:02 +0000 (11:57 +0200)]
Throw notice for plain wrapper fread/fwrite errors
Similar to what is done for socket read/write errors.
Peter Kokot [Mon, 22 Jul 2019 21:25:44 +0000 (23:25 +0200)]
Bump PHP_JSON_VERSION to PHP_VERSION
Closes GH-4459
Peter Kokot [Sun, 21 Jul 2019 07:58:44 +0000 (09:58 +0200)]
Remove AC_FPM_POLL
AC_FPM_POLL defines HAVE_POLL symbol which is already checked by
configure.ac and function poll in AC_CHECK_FUNCTIONS.
Closes GH-4449
Peter Kokot [Wed, 24 Jul 2019 19:40:21 +0000 (21:40 +0200)]
Remove outdated Libtool hack for macs
This was once relevant for older versions of macs and autoconf 2.13.
Closes GH-4435
Nikita Popov [Wed, 24 Jul 2019 18:51:19 +0000 (20:51 +0200)]
Mark _get_zval_ptr_deref as unused
Dmitry Stogov [Wed, 24 Jul 2019 16:51:56 +0000 (19:51 +0300)]
Avoid over-specialization
Dmitry Stogov [Wed, 24 Jul 2019 15:49:46 +0000 (18:49 +0300)]
Reordering
Dmitry Stogov [Wed, 24 Jul 2019 15:36:50 +0000 (18:36 +0300)]
Delay dereference
Nikita Popov [Wed, 24 Jul 2019 14:40:18 +0000 (16:40 +0200)]
Remove php_openssl_cipher_get_version()
This was added in 7.1 when add_assoc_string mistakenly accepted
a char* rather than const char* parameter and is no longer needed.
We can use SSL_CIPHER_get_version() directly.
Dmitry Stogov [Wed, 24 Jul 2019 14:30:38 +0000 (17:30 +0300)]
Avoid reloading
David Carlier [Sun, 21 Jul 2019 13:48:46 +0000 (14:48 +0100)]
Fix bindpath mem leak in cgi
Closes GH-4451.
Derick Rethans [Wed, 24 Jul 2019 09:39:54 +0000 (09:39 +0000)]
Update NEWS for 7.4.0beta2
Derick Rethans [Wed, 24 Jul 2019 09:38:35 +0000 (09:38 +0000)]
Update NEWS for PHP 7.4.0beta1
Nikita Popov [Tue, 23 Jul 2019 10:41:24 +0000 (12:41 +0200)]
Don't skip uninitialized typed props in get_class_vars()
For bug #78319.
Nikita Popov [Wed, 24 Jul 2019 08:42:19 +0000 (10:42 +0200)]
Revert "Drop free_filename field from zend_file_handle"
This reverts commit
e0eca262852dba1a78afcde64a49126c81fead1a .
free_filename is used by the wincache extension, restore this
field for PHP 7.4.
Nikita Popov [Wed, 24 Jul 2019 08:05:44 +0000 (10:05 +0200)]
Avoid references in TMP var
Make sure we deref the OBJ_IS result, because we store it in a TMP
var, which is not allowed to contain references and will cause
assertion failures in the unspecialized VM.
This also partially reverts
fd463a9a6078074f8f648982b42bdd14423fb614 ,
which merged the TMP and VAR specializations of COALESCE to work
around this bug.
An alternative would be to change the result type of OBJ_IS back
to VAR.
Nikita Popov [Wed, 24 Jul 2019 07:44:55 +0000 (09:44 +0200)]
Try to fix macos build
By avoiding unused variable opline warnings. Also clean up the
replacement of ZEND_VM_SPEC -- we were sometimes treating it as
an always-defined constant with a value (what it actually is) and
sometimes as a conditionally defined constant (which it isn't, but
which still worked thanks to the specializer). Switch to only
treating it as a constant with a value.
Dmitry Stogov [Tue, 23 Jul 2019 22:52:05 +0000 (01:52 +0300)]
Fixed CALL VM
Dmitry Stogov [Tue, 23 Jul 2019 22:43:01 +0000 (01:43 +0300)]
Fixed unspecialized executor
George Peter Banyard [Sun, 14 Jul 2019 01:45:31 +0000 (03:45 +0200)]
Cleanup of remaining E_STRICT in tests
Derick Rethans [Tue, 23 Jul 2019 08:06:23 +0000 (08:06 +0000)]
Update NEWS for 7.4.0beta2
Derick Rethans [Tue, 23 Jul 2019 08:05:05 +0000 (08:05 +0000)]
Update NEWS for PHP 7.4.0beta1
Peter Kokot [Tue, 23 Jul 2019 00:32:38 +0000 (02:32 +0200)]
Update NEWS
Peter Kokot [Tue, 23 Jul 2019 00:13:54 +0000 (02:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS
Update NEWS
Peter Kokot [Tue, 23 Jul 2019 00:13:36 +0000 (02:13 +0200)]
Update NEWS
Peter Kokot [Tue, 23 Jul 2019 00:13:12 +0000 (02:13 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS
Peter Kokot [Tue, 23 Jul 2019 00:13:00 +0000 (02:13 +0200)]
Update NEWS
Matteo Beccati [Mon, 22 Jul 2019 17:22:07 +0000 (19:22 +0200)]
Fix FR #71885 (Allow escaping question mark placeholders)
Peter Kokot [Sun, 21 Jul 2019 23:27:22 +0000 (01:27 +0200)]
Remove HAVE_OCILOBISTEMPORARY and HAVE_OCICOLLASSIGN
Symbols are not used in the current code.
Also remove not needed ocijdbc8 library addition and checks whcih were
removed also via
b8e1d4d4e5af74a9d5a95d03adbe2b93e58301b7 so Oracle 8
is no longer supported.
Closes GH-4454
Nikita Popov [Mon, 22 Jul 2019 15:56:16 +0000 (17:56 +0200)]
Add upgrading entries
[ci skip]
Nikita Popov [Mon, 22 Jul 2019 15:49:08 +0000 (17:49 +0200)]
Also report errors from Zend stream reader operation
Nikita Popov [Thu, 18 Jul 2019 13:25:59 +0000 (15:25 +0200)]
Report errors from stream read and write operations
The php_stream_read() and php_stream_write() functions now return
an ssize_t value, with negative results indicating failure. Functions
like fread() and fwrite() will return false in that case.
As a special case, EWOULDBLOCK and EAGAIN on non-blocking streams
should not be regarded as error conditions, and be reported as
successful zero-length reads/writes instead. The handling of EINTR
remains unclear and is internally inconsistent (e.g. some code-paths
will automatically retry on EINTR, while some won't).
I'm landing this now to make sure the stream wrapper ops API changes
make it into 7.4 -- however, if the user-facing changes turn out to
be problematic we have the option of clamping negative returns to
zero in php_stream_read() and php_stream_write() to restore the
old behavior in a relatively non-intrusive manner.
Nikita Popov [Mon, 22 Jul 2019 14:59:23 +0000 (16:59 +0200)]
Special-case rc=1 self-referential arrays in ReflectionReference
New fix for bug #78263. This is special-cased elsewhere in the engine,
so we need to mirror it here.
Nikita Popov [Mon, 22 Jul 2019 14:49:08 +0000 (16:49 +0200)]
Revert "Add ReflectionReference::getRefcount()"
This reverts commit
428cfdd1810b17f0064b7691276f0eb92dc963b6 .
Remi Collet [Mon, 22 Jul 2019 09:47:38 +0000 (11:47 +0200)]
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
Peter Kokot [Mon, 22 Jul 2019 14:05:26 +0000 (16:05 +0200)]
Remove HAVE_PQPUTCOPYEND
Symbol is not used anywhere in the code and also Postgresql 7.x is
EOL anyway.
Closes GH-4453
Peter Kokot [Mon, 22 Jul 2019 14:04:07 +0000 (16:04 +0200)]
Fix internals upgrading log
Peter Kokot [Mon, 22 Jul 2019 14:01:25 +0000 (16:01 +0200)]
Remove HAVE_DSA_DEFAULT_METHOD
Last usage removed via
6a813634052710f3f4bf6e2e03ca1b6c7be3bcee .
Closes GH-4455
Christoph M. Becker [Mon, 22 Jul 2019 13:10:08 +0000 (15:10 +0200)]
Remove superfluous HAVE_GD_BUNDLED checks
If we're compiling the bundled libgd, `HAVE_GD_BUNDLED` is set, so
there is no need to check for this macro again.
Nikita Popov [Mon, 22 Jul 2019 10:41:15 +0000 (12:41 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4