php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
114,562 Commits 545 Branches 1,479 Tags
57d9b94dea7e634ec4775faa8f33ae03d9db5ef6
Commit Graph

52339 Commits

Author SHA1 Message Date
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
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
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
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
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
1e95f44850 Merge branch 'master' of git.php.net:/php-src 2019-07-22 12:29:27 +02:00
Nikita Popov
6572c00b81 Merge branch 'PHP-7.4' of git.php.net:/php-src into PHP-7.4 2019-07-22 12:29:00 +02:00
Nikita Popov
36db71df47 Merge branch 'PHP-7.4' 2019-07-22 12:28:40 +02:00
Christoph M. Becker
ebe91a0066 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Drop superfluous ENABLE_GD_TTF
 2019-07-22 12:01:58 +02:00
Christoph M. Becker
d3d3404db7 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.
 2019-07-22 12:01:24 +02:00
Nikita Popov
b3f74b0b7d Deprecate allow_url_include 2019-07-22 11:39:52 +02:00
Nikita Popov
964de035a7 Deprecate restore_include_path() 2019-07-22 11:39:52 +02:00
Nikita Popov
b3668aabf7 Deprecate convert_cyr_string() 2019-07-22 11:39:52 +02:00
Nikita Popov
e41b7f6db4 Deprecate (real) cast 2019-07-22 11:39:52 +02:00
Nikita Popov
46b982409a Deprecate implode() with swapped parameter order 2019-07-22 11:39:52 +02:00
Nikita Popov
cd2f2cd7d0 Deprecate FILTER_SANITIZE_MAGIC_QUOTES 2019-07-22 11:39:52 +02:00
Nikita Popov
4e190691e2 Deprecate is_real() function 2019-07-22 11:39:52 +02:00
Nikita Popov
b1cdf06673 Deprecate money_format() 2019-07-22 11:39:52 +02:00
Nikita Popov
4e4d8a4a6c Deprecate hebrevc() 2019-07-22 11:39:52 +02:00
Nikita Popov
e9e2fa4ad4 Deprecate ezmlm_hash() 2019-07-22 11:39:52 +02:00
Nikita Popov
39e756e7fe Deprecate encoding as 3rd param to mb_strrpos() 2019-07-22 11:39:52 +02:00
Nikita Popov
3121b7174f Deprecate Reflection export() methods 
And remove the Reflector::export() interface method.
 2019-07-22 11:39:52 +02:00
Nikita Popov
0ba7c3eadf Deprecate array_key_exists() on objects 2019-07-22 11:39:52 +02:00
Nikita Popov
b2ea507bea Deprecate get_magic_quotes_gpc() and get_magic_quotes_runtime() 2019-07-22 11:39:52 +02:00
Dmitry Stogov
390810e1e6 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Evaluate constant in class scope
 2019-07-22 11:59:49 +03:00
Dmitry Stogov
2f51764e5d Evaluate constant in class scope 2019-07-22 11:59:24 +03:00
Remi Collet
2db5dfd6fc Merge branch 'PHP-7.4' 
* PHP-7.4:
  improve temporary fix for system libgd
 2019-07-22 09:12:48 +02:00
Remi Collet
fff6b18657 improve temporary fix for system libgd 
- PHP_GD_PNG needed to set include path for png.h
- PHP_GD_JPEG needed to set include path for jpeglib.h
 2019-07-22 09:11:32 +02:00
Peter Kokot
9ddf7b5599 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove some unused HAVE_* symbols
 2019-07-21 11:35:09 +02:00
Peter Kokot
1b969a74d0 Remove some unused HAVE_* symbols 
- HAVE_NET_SNMP removed via cab643f615
- HAVE_CRYPTO_AEAD_AES256GCM ad120c5ae9
- Remove HAVE_FREETDS and HAVE_LIBDNET_STUB (not used in current
  extension; copy paste from other removed extensions)

Closes GH-4448
 2019-07-21 11:34:18 +02:00
Peter Kokot
00821b807c Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove HAVE_LIBZIP
 2019-07-21 11:32:53 +02:00
Peter Kokot
15782b27b8 Remove HAVE_LIBZIP 
The libzip library is now always used from the system.

Closes GH-4450
 2019-07-21 11:32:13 +02:00