1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Commit Graph

114562 Commits

Author SHA1 Message Date
Dmitry Stogov
57d9b94dea Simplify TMP/VAR operand releasing 2019-07-24 14:13:40 +03:00
Nikita Popov
0fcd017340 Merge branch 'PHP-7.4' 2019-07-24 12:07:04 +02:00
David Carlier
b05f364333 Fix bindpath mem leak in cgi
Closes GH-4451.
2019-07-24 12:06:40 +02:00
Derick Rethans
126dd8e1eb Update NEWS for 7.4.0beta2 2019-07-24 09:39:54 +00:00
Derick Rethans
5dae0eae62 Update NEWS for PHP 7.4.0beta1 2019-07-24 09:38:35 +00:00
Nikita Popov
8aa92c1465 Merge branch 'PHP-7.4' 2019-07-24 10:52:18 +02:00
Nikita Popov
a49d53baa2 Don't skip uninitialized typed props in get_class_vars()
For bug #78319.
2019-07-24 10:52:01 +02:00
Nikita Popov
173ebe4c44 Merge branch 'PHP-7.4' 2019-07-24 10:44:40 +02:00
Nikita Popov
d9680272c7 Revert "Drop free_filename field from zend_file_handle"
This reverts commit e0eca26285.

free_filename is used by the wincache extension, restore this
field for PHP 7.4.
2019-07-24 10:43:37 +02:00
Nikita Popov
dc6341eb78 Merge branch 'PHP-7.4' 2019-07-24 10:07:51 +02:00
Nikita Popov
1eb706179f 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 fd463a9a60,
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.
2019-07-24 10:07:26 +02:00
Nikita Popov
80681e8d40 Merge branch 'PHP-7.4' 2019-07-24 09:55:09 +02:00
Nikita Popov
9e4603f772 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.
2019-07-24 09:44:55 +02:00
Dmitry Stogov
3c4f38d512 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed CALL VM
2019-07-24 01:52:26 +03:00
Dmitry Stogov
8d51af9bc2 Fixed CALL VM 2019-07-24 01:52:05 +03:00
Dmitry Stogov
43c4e4cd22 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed unspecialized executor
2019-07-24 01:43:20 +03:00
Dmitry Stogov
eaa9048973 Fixed unspecialized executor 2019-07-24 01:43:01 +03:00
Nikita Popov
d37d418927 Merge branch 'PHP-7.4' 2019-07-23 11:28:10 +02:00
George Peter Banyard
6d6d954d0d Cleanup of remaining E_STRICT in tests 2019-07-23 11:27:23 +02:00
Derick Rethans
a07e85f93f Update NEWS for 7.4.0beta2 2019-07-23 08:06:23 +00:00
Derick Rethans
2b540b2f52 Update NEWS for PHP 7.4.0beta1 2019-07-23 08:05:05 +00:00
Peter Kokot
cef2071eb4 Merge branch 'PHP-7.4'
* PHP-7.4:
  Update NEWS
  Update NEWS
  Update NEWS
2019-07-23 02:32:56 +02:00
Peter Kokot
1fa238a7b3 Update NEWS 2019-07-23 02:32:38 +02:00
Peter Kokot
e3236d8847 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Update NEWS
  Update NEWS
2019-07-23 02:13:54 +02:00
Peter Kokot
b42a13b08a Update NEWS 2019-07-23 02:13:36 +02:00
Peter Kokot
9e2ac14702 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Update NEWS
2019-07-23 02:13:12 +02:00
Peter Kokot
8f384bea93 Update NEWS 2019-07-23 02:13:00 +02:00
Matteo Beccati
9590912854 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix FR #71885 (Allow escaping question mark placeholders)
2019-07-22 19:35:37 +02:00
Matteo Beccati
b19fdc18a9 Fix FR #71885 (Allow escaping question mark placeholders) 2019-07-22 19:35:03 +02:00
Peter Kokot
7dbd25df68 Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove HAVE_OCILOBISTEMPORARY and HAVE_OCICOLLASSIGN
2019-07-22 19:14:30 +02:00
Peter Kokot
5d827c89cf 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 b8e1d4d4e5 so Oracle 8
is no longer supported.

Closes GH-4454
2019-07-22 19:13:24 +02:00
Nikita Popov
ac555cf6ee Merge branch 'PHP-7.4' 2019-07-22 17:56:38 +02:00
Nikita Popov
845d07b343 Add upgrading entries
[ci skip]
2019-07-22 17:56:16 +02:00
Nikita Popov
5664035ffe Also report errors from Zend stream reader operation 2019-07-22 17:49:08 +02:00
Nikita Popov
a1e2c8870e Merge branch 'PHP-7.4' 2019-07-22 17:26:01 +02:00
Nikita Popov
d59aac58b3 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.
2019-07-22 17:17:28 +02:00
Nikita Popov
7a1540fa28 Merge branch 'PHP-7.4' 2019-07-22 17:00:17 +02:00
Nikita Popov
c817b8020c 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.
2019-07-22 16:59:23 +02:00
Nikita Popov
19588a8f3b Revert "Add ReflectionReference::getRefcount()"
This reverts commit 428cfdd181.
2019-07-22 16:49:08 +02:00
Remi Collet
92d6720dcf 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
2019-07-22 16:14:36 +02:00
Remi Collet
31d85b8417 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 2019-07-22 16:14:19 +02:00
Peter Kokot
4ec0889bec Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove HAVE_PQPUTCOPYEND
2019-07-22 16:06:12 +02:00
Peter Kokot
a2b758dab5 Remove HAVE_PQPUTCOPYEND
Symbol is not used anywhere in the code and also Postgresql 7.x is
EOL anyway.

Closes GH-4453
2019-07-22 16:05:26 +02:00
Peter Kokot
f888f4cf4f Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix internals upgrading log
  Remove HAVE_DSA_DEFAULT_METHOD
2019-07-22 16:04:20 +02:00
Peter Kokot
9b8bf13b3a Fix internals upgrading log 2019-07-22 16:04:07 +02:00
Peter Kokot
4b03e102c5 Remove HAVE_DSA_DEFAULT_METHOD
Last usage removed via 6a81363405.

Closes GH-4455
2019-07-22 16:02:55 +02:00
Christoph M. Becker
ea2b8122e6 Merge branch 'PHP-7.4'
* PHP-7.4:
  Remove superfluous HAVE_GD_BUNDLED checks
2019-07-22 16:00:18 +02:00
Christoph M. Becker
f8202b5513 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.
2019-07-22 15:59:44 +02:00
Nikita Popov
a9969ec1bd Merge branch 'PHP-7.4' 2019-07-22 12:41:20 +02:00
Nikita Popov
72b9105d30 Merge branch 'PHP-7.3' into PHP-7.4 2019-07-22 12:41:15 +02:00