]>
granicus.if.org Git - php/log
Peter Kokot [Wed, 24 Jul 2019 20:04:24 +0000 (22:04 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove AC_FPM_POLL
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:43:26 +0000 (21:43 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove outdated Libtool hack for macs
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:53:19 +0000 (20:53 +0200)]
Merge branch 'PHP-7.4'
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 17:00:55 +0000 (20:00 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid over-specialization
Dmitry Stogov [Wed, 24 Jul 2019 16:51:56 +0000 (19:51 +0300)]
Avoid over-specialization
Dmitry Stogov [Wed, 24 Jul 2019 15:52:55 +0000 (18:52 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Reordering
Dmitry Stogov [Wed, 24 Jul 2019 15:49:46 +0000 (18:49 +0300)]
Reordering
Dmitry Stogov [Wed, 24 Jul 2019 15:40:03 +0000 (18:40 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Delay dereference
Dmitry Stogov [Wed, 24 Jul 2019 15:36:50 +0000 (18:36 +0300)]
Delay dereference
Nikita Popov [Wed, 24 Jul 2019 14:41:44 +0000 (16:41 +0200)]
Merge branch 'PHP-7.4'
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:38:42 +0000 (17:38 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid reloading
Dmitry Stogov [Wed, 24 Jul 2019 14:30:38 +0000 (17:30 +0300)]
Avoid reloading
Dmitry Stogov [Wed, 24 Jul 2019 11:13:40 +0000 (14:13 +0300)]
Simplify TMP/VAR operand releasing
Nikita Popov [Wed, 24 Jul 2019 10:07:04 +0000 (12:07 +0200)]
Merge branch 'PHP-7.4'
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 [Wed, 24 Jul 2019 08:52:18 +0000 (10:52 +0200)]
Merge branch 'PHP-7.4'
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:44:40 +0000 (10:44 +0200)]
Merge branch 'PHP-7.4'
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:07:51 +0000 (10:07 +0200)]
Merge branch '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:55:09 +0000 (09:55 +0200)]
Merge branch 'PHP-7.4'
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:26 +0000 (01:52 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed CALL VM
Dmitry Stogov [Tue, 23 Jul 2019 22:52:05 +0000 (01:52 +0300)]
Fixed CALL VM
Dmitry Stogov [Tue, 23 Jul 2019 22:43:20 +0000 (01:43 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed unspecialized executor
Dmitry Stogov [Tue, 23 Jul 2019 22:43:01 +0000 (01:43 +0300)]
Fixed unspecialized executor
Nikita Popov [Tue, 23 Jul 2019 09:28:10 +0000 (11:28 +0200)]
Merge branch 'PHP-7.4'
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:56 +0000 (02:32 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS
Update NEWS
Update NEWS
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:35:37 +0000 (19:35 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix FR #71885 (Allow escaping question mark placeholders)
Matteo Beccati [Mon, 22 Jul 2019 17:22:07 +0000 (19:22 +0200)]
Fix FR #71885 (Allow escaping question mark placeholders)
Peter Kokot [Mon, 22 Jul 2019 17:14:30 +0000 (19:14 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove HAVE_OCILOBISTEMPORARY and HAVE_OCICOLLASSIGN
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:38 +0000 (17:56 +0200)]
Merge branch 'PHP-7.4'
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 [Mon, 22 Jul 2019 15:25:28 +0000 (17:25 +0200)]
Merge branch 'PHP-7.4'
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 15:00:17 +0000 (17:00 +0200)]
Merge branch 'PHP-7.4'
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 14:14:36 +0000 (16:14 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
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
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:06:12 +0000 (16:06 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove HAVE_PQPUTCOPYEND
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:20 +0000 (16:04 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix internals upgrading log
Remove HAVE_DSA_DEFAULT_METHOD
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 14:00:18 +0000 (16:00 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove superfluous HAVE_GD_BUNDLED checks
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:20 +0000 (12:41 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 22 Jul 2019 10:41:15 +0000 (12:41 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 22 Jul 2019 10:40:26 +0000 (12:40 +0200)]
Remove test for bug #77185
Seems to be very unreliable in CI.
Nikita Popov [Mon, 22 Jul 2019 10:29:31 +0000 (12:29 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 22 Jul 2019 10:29:27 +0000 (12:29 +0200)]
Merge branch 'master' of git.php.net:/php-src
Nikita Popov [Mon, 22 Jul 2019 10:29:00 +0000 (12:29 +0200)]
Merge branch 'PHP-7.4' of git.php.net:/php-src into PHP-7.4
Nikita Popov [Mon, 22 Jul 2019 10:13:12 +0000 (12:13 +0200)]
Merge branch 'PHP-7.4'
Christoph M. Becker [Mon, 22 Jul 2019 10:01:58 +0000 (12:01 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Drop superfluous ENABLE_GD_TTF
Christoph M. Becker [Sun, 21 Jul 2019 15:28:49 +0000 (17:28 +0200)]
Drop superfluous ENABLE_GD_TTF
If we `HAVE_LIBFREETYPE`, we define `ENABLE_GD_TTF` if it is not
defined. Therefore we can check for `HAVE_LIBFREETYPE` in the first
place.
Nikita Popov [Mon, 22 Jul 2019 09:53:50 +0000 (11:53 +0200)]
Add deprecations to UPGRADING
Nikita Popov [Fri, 12 Jul 2019 10:53:09 +0000 (12:53 +0200)]
Deprecate unbinding $this from non-static closure
Nikita Popov [Fri, 12 Jul 2019 10:42:32 +0000 (12:42 +0200)]
Deprecate allow_url_include
Nikita Popov [Fri, 12 Jul 2019 10:20:41 +0000 (12:20 +0200)]
Deprecate restore_include_path()
Nikita Popov [Fri, 12 Jul 2019 10:14:02 +0000 (12:14 +0200)]
Deprecate convert_cyr_string()
Nikita Popov [Fri, 12 Jul 2019 10:09:50 +0000 (12:09 +0200)]
Deprecate (real) cast
Nikita Popov [Fri, 12 Jul 2019 08:31:16 +0000 (10:31 +0200)]
Deprecate implode() with swapped parameter order
Nikita Popov [Fri, 12 Jul 2019 08:21:21 +0000 (10:21 +0200)]
Deprecate FILTER_SANITIZE_MAGIC_QUOTES
Nikita Popov [Thu, 11 Jul 2019 15:18:01 +0000 (17:18 +0200)]
Deprecate is_real() function
Nikita Popov [Thu, 11 Jul 2019 15:12:08 +0000 (17:12 +0200)]
Deprecate money_format()
Nikita Popov [Thu, 11 Jul 2019 15:06:54 +0000 (17:06 +0200)]
Deprecate hebrevc()
Nikita Popov [Thu, 11 Jul 2019 15:04:36 +0000 (17:04 +0200)]
Deprecate ezmlm_hash()
Nikita Popov [Thu, 11 Jul 2019 15:02:04 +0000 (17:02 +0200)]
Deprecate encoding as 3rd param to mb_strrpos()
Nikita Popov [Thu, 11 Jul 2019 11:41:10 +0000 (13:41 +0200)]
Deprecate Reflection export() methods
And remove the Reflector::export() interface method.
Nikita Popov [Thu, 11 Jul 2019 11:35:44 +0000 (13:35 +0200)]
Deprecate array_key_exists() on objects
Nikita Popov [Thu, 11 Jul 2019 11:32:10 +0000 (13:32 +0200)]
Deprecate get_magic_quotes_gpc() and get_magic_quotes_runtime()
Nikita Popov [Mon, 22 Jul 2019 09:19:32 +0000 (11:19 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 22 Jul 2019 09:19:24 +0000 (11:19 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 22 Jul 2019 09:18:38 +0000 (11:18 +0200)]
Reduce number of workers in test
4 seems to be enough to reliably reproduce the issue. Let's see
if this works better in CI.
Dmitry Stogov [Mon, 22 Jul 2019 09:03:35 +0000 (12:03 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Initialize static_members_table
Dmitry Stogov [Mon, 22 Jul 2019 09:02:16 +0000 (12:02 +0300)]
Initialize static_members_table
Dmitry Stogov [Mon, 22 Jul 2019 08:59:49 +0000 (11:59 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Evaluate constant in class scope
Dmitry Stogov [Mon, 22 Jul 2019 08:59:24 +0000 (11:59 +0300)]
Evaluate constant in class scope
Nikita Popov [Mon, 22 Jul 2019 08:34:58 +0000 (10:34 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 22 Jul 2019 08:34:32 +0000 (10:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Maksim Nikulin [Wed, 23 Jan 2019 05:19:29 +0000 (12:19 +0700)]
Prevent use after free in fpm_event_epoll_wait
epoll event backend does not guarantee that child input/output events
are reported before SIGCHILD due to finished worker. While a bunch of
events received by epoll is being processed, child-related structures
may be removed before dispatching of an I/O event for the same child.
The result may be attempt to access to memory region allocated for
another purpose, segfault of the master process, and unavailable web
sites.
Postpone processing of SIGCHILD events till other events in the same
bunch are processed.
Fix Bug #62418 php-fpm master process crashes
Fix Bug #65398 Race condition between SIGCHLD and child stdout/stderr event leads to segfault
Fix Bug #75112 php-fpm crashing, hard to reproduce
Fix Bug #77114 php-fpm master segfaults in fpm_event_epoll_wait/fpm_event_fire
Fix Bug #77185 Use-after-free in FPM master event handling
Remi Collet [Mon, 22 Jul 2019 07:12:48 +0000 (09:12 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
improve temporary fix for system libgd