php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
116,551 Commits 549 Branches 1,486 Tags
5898e8ef3c1bfb2aaa040bc9b86c6c402015865d
Commit Graph

1145 Commits

Author SHA1 Message Date
Máté Kocsis c58b12334d Add union return types with one class 2019-11-18 12:44:38 +01:00
Máté Kocsis 27e83d0fb8 Add union return types for function stubs 2019-11-11 14:54:55 +01:00
Fabien Villepinte a555cc0b3d Clean DONE tags from tests 
Remove most of the `===DONE===` tags and its variations.
Keep `===DONE===` if the test output otherwise becomes empty.

Closes GH-4872.
 2019-11-07 21:31:47 +01:00
Nikita Popov c849438bd0 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #78775
 2019-11-05 12:16:17 +01:00
Nikita Popov 3e41ade638 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed bug #78775
 2019-11-05 12:16:09 +01:00
Nikita Popov 747cb46244 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #78775
 2019-11-05 12:15:44 +01:00
Nikita Popov 4f984a2fdb Fixed bug #78775 
Clear the OpenSSL error queue before performing SSL stream operations.
As we don't control all code that could possibly be using OpenSSL,
we can't rely on the error queue being empty.
 2019-11-05 12:13:46 +01:00
Máté Kocsis 9493893412 Cleanup return values when parameter parsing is unsuccessful 2019-10-30 16:05:20 +01:00
Christoph M. Becker 913a449b27 Remove generic type annotations 
Cf. <https://github.com/php/php-src/commit/de69a9d3ebad41da9bc7c59f836bb141f0af70f8#r35675846>.
 2019-10-26 16:24:53 +02:00
Nikita Popov 235983dfde Merge branch 'PHP-7.4' 2019-09-30 17:52:39 +02:00
Fabien Villepinte 0aa3acc6c4 Fix borked SKIPIFs 2019-09-30 17:51:41 +02:00
Gabriel Caruso 5d6e923d46 Remove mention of PHP major version in Copyright headers 
Closes GH-4732.
 2019-09-25 14:51:43 +02:00
Simon Podlipsky 4867864cae Add Curl ext PHP stubs 
Closes GH-4557.
 2019-08-20 15:16:57 +02:00
Nikita Popov 429378d78d Remove some misleading RETURN_FALSE 
These functions throw, so they can't return false.

This is just a subset...
 2019-08-12 10:05:36 +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 e13981f981 Merge branch 'PHP-7.4' 2019-07-18 14:42:34 +02:00
Nikita Popov be7f405f6b Merge branch 'PHP-7.3' into PHP-7.4 2019-07-18 14:42:20 +02:00
Nikita Popov 4a9f78f9d7 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-18 14:41:35 +02:00
Abyr Valg c8c183eb62 Fixed bug #77946 
Save multi_info_read() result into easy handle.
 2019-07-18 14:40:47 +02:00
Peter Kokot 22583b20bc Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix typo
  Remove unused defines
 2019-07-18 02:23:46 +02:00
Peter Kokot 359a78b16c Remove unused defines 
Used in php-src the past and today removed and not used anymore:
- HAVE_CURL_EASY_STRERROR
- HAVE_CURL_MULTI_STRERROR
- HAVE_NEW_MIME2TEXT
- HAVE_MBSTR_CN
- HAVE_MBSTR_JA
- HAVE_MBSTR_KR
- HAVE_MBSTR_RU
- HAVE_MBSTR_TW

Part of oniguruma which doesn't use these anymore
- NOT_RUBY
- HAVE_STDARG_PROTOTYPES

Unused:
- HAVE_MPIR

Closes GH-4427
 2019-07-18 02:21:39 +02:00
Peter Kokot e504716320 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove duplicate AC_PROG_CPP call
 2019-07-18 02:15:32 +02:00
Peter Kokot daa243d1a0 Remove duplicate AC_PROG_CPP call 
AC_PROG_CPP is already called in configure.ac.

Closes GH-4425
 2019-07-18 02:14:31 +02:00
Nikita Popov 74bf7bfb88 Merge branch 'PHP-7.4' 2019-07-11 15:49:02 +02:00
Nikita Popov 17f7fb7605 Switch to using shell-less proc_open() in various server tests 2019-07-11 15:48:10 +02:00
Nikita Popov f6f0d383b3 Merge branch 'PHP-7.4' 2019-07-03 11:42:04 +02:00
Nikita Popov 959c84b249 Remove curl_basic_017.phpt 
The output of the three handles may be interleaved. We already have
curl_basic_018.phpt which uses curl_multi_getcontent() and thus
has predictable output. As such, I'm dropping this test altogether.
 2019-07-03 11:38:24 +02:00
Nikita Popov a1479fbbd9 Merge branch 'PHP-7.4' 2019-06-25 14:30:24 +02:00
Nikita Popov 8757f30cc7 Fix CURLINFO_COOKIELIST leak 2019-06-25 14:28:58 +02:00
Nikita Popov dc18af96f9 Merge branch 'PHP-7.4' 2019-06-17 12:44:42 +02:00
Nikita Popov 6381b1ee82 Make ext/curl/tests/bug48203_multi.phpt more robust 
We don't have a guarantee in which order the output here will
occur. And it's not really relevant for the test anyway, so use a
wildcard.
 2019-06-17 12:43:45 +02:00
Nikita Popov 98f81ace40 Merge branch 'PHP-7.4' 2019-06-14 16:56:42 +02:00
Nikita Popov 8a5ce6f16f Make curl_multi_info_read.phpt more robust 
I don't think there's any need to make remote connections here
(and bugs.php.net is down right now...) so just use local files
instead.
 2019-06-14 16:55:51 +02:00
Nikita Popov 5ae158a004 Merge branch 'PHP-7.4' 2019-06-12 15:28:41 +02:00
Nikita Popov bc8fece0cf Don't warn if libcurl SSL library not detected 
libcurl may link against 7 different ssl libraries, all of which
are thread-safe -- apart from openssl, of course. We check for
openssl and register locking callbacks in that case, but we should
not warn if any other library is used.
 2019-06-12 15:26:50 +02:00
Nikita Popov 477d1e02ae Merge branch 'PHP-7.4' 2019-06-12 11:54:21 +02:00
Nikita Popov 2f1d822d78 Preserve CFLAGS/LDFLAGS for curl ssl check 
We need to add the curl-specific flags, but we also need to preserve
the general flags, to keep around important stuff like -m32.
 2019-06-12 11:54:13 +02:00
Christoph M. Becker 1fcfb636f3 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix test regarding Unix Domain Sockets on Windows
 2019-06-06 15:09:57 +02:00
Christoph M. Becker c358c280df Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix test regarding Unix Domain Sockets on Windows
 2019-06-06 15:02:41 +02:00
Christoph M. Becker 5f2f6180b9 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix test regarding Unix Domain Sockets on Windows
 2019-06-06 15:00:35 +02:00
Christoph M. Becker 2df32942d3 Fix test regarding Unix Domain Sockets on Windows 
Recent Windows versions actually support Unix Domain Sockets.  Cf.
<https://github.com/curl/curl/pull/3939>.
 2019-06-06 14:59:58 +02:00
Nikita Popov 1df8175b61 Convert fetch_resource warnings into TypeErrors 
More type checks that are not part of zpp and should generate a
TypeError in PHP 8.
 2019-06-03 09:17:12 +02:00
Christoph M. Becker 5193e5c405 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix test case for cURL 7.65.0
 2019-05-22 12:03:10 +02:00
Christoph M. Becker 21bf9b0f4c Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix test case for cURL 7.65.0
 2019-05-22 12:02:43 +02:00
Christoph M. Becker 69c634a56d Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix test case for cURL 7.65.0
 2019-05-22 12:02:03 +02:00
Christoph M. Becker 62fe6ba20c Fix test case for cURL 7.65.0 
Reported and patch provided by @Jan-E.
 2019-05-22 12:01:23 +02:00
Rasmus Lerdorf 3345d71109 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
 2019-05-21 14:47:28 -07:00
Rasmus Lerdorf 12c1d7419a Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
 2019-05-21 14:46:44 -07:00
Rasmus Lerdorf 2d29263a9f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
 2019-05-21 14:46:24 -07:00