php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-31 04:32:19 +02:00
Code Issues Packages Projects Releases Wiki Activity
115,813 Commits 547 Branches 1,481 Tags
375ceefec00df23c71bbc164e272ff41f68c91bc
Commit Graph

341 Commits

Author SHA1 Message Date
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
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
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
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
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
Christoph M. Becker
248a8987ea Merge branch 'PHP-7.4' 
* PHP-7.4:
  Deprecate and ignore $version parameter of curl_version()
 2019-05-13 08:54:22 +02:00
Christoph M. Becker
357da6bc59 Deprecate and ignore $version parameter of curl_version() 
`curl_version()`[1] (of ext/curl) makes `curl_version_info()`[2] (of
libcurl) available to PHP userland.  The latter requires to pass an
`age` argument which usually is `CURLVERSION_NOW`, so that the
information returned by the runtime matches the declarations used
during compile time.  For C programs it is simply necessary to pass
this information, and in rare occasions it might make sense to pass
something else than `CURLVERSION_NOW`.  curl.h notes:

| The 'CURLVERSION_NOW' is the symbolic name meant to be used by
| basically all programs ever that want to get version information.

For the PHP binding, using a newer `age` than available at compile time
will neither provide the PHP program more information, nor would using
an older `age` have tangible benefits.

We therefore deprecate the useless `$version` parameter, and if it is
passed nonetheless, we use `CURLVERSION_NOW` instead of the supplied
value, and raise a warning.

[1] <https://www.php.net/manual/en/function.curl-version.php>
[2] <https://curl.haxx.se/libcurl/c/curl_version_info.html>
 2019-05-13 08:53:41 +02:00
Nikita Popov
f89adfe72c Merge branch 'PHP-7.4' 2019-05-02 15:13:30 +02:00
Nikita Popov
2934f9da4d Merge branch 'PHP-7.3' into PHP-7.4 2019-05-02 15:13:24 +02:00
Javier Spagnoletti
6b73e692c9 Add more missing CURL_VERSION_* constants 
And also check for CURL_VERSION_* constants in the sync-constants.php
script.

Related to request #72189: Add missing `CURL_VERSION_*` constants.
 2019-05-02 15:11:42 +02:00
Christoph M. Becker
d09d3e28df Merge branch 'PHP-7.4' 
* PHP-7.4:
  Extend CURLFile to support streams
 2019-04-29 10:21:44 +02:00
Christoph M. Becker
c68dc6b5e3 Extend CURLFile to support streams 
Due to former restrictions of the libcurl API, curl multipart/formdata
file uploads supported only proper files.  However, as of curl 7.56.0
the new `curl_mime_*()` API is available (and already supported by
PHP[1]), which allows us to support arbitrary *seekable* streams, which
is generally desirable, and particularly resolves issues with the
transparent Unicode and long part support on Windows (see bug #77711).

Note that older curl versions are still supported, but CURLFile is
still restricted to proper files in this case.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=a83b68ba56714bfa06737a61af795460caa4a105>
 2019-04-29 10:21:07 +02:00
Nikita Popov
ed0c80f1bf Merge branch 'PHP-7.4' 2019-04-15 15:58:14 +02:00
Rodrigo Prado
8e68a9d9eb Add test for curl_version() 2019-04-15 15:57:11 +02:00
Peter Kokot
6426420f61 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Replace dirname(__FILE__) by __DIR__ in tests
 2019-03-15 23:36:47 +01:00
Fabien Villepinte
26dfce7f36 Replace dirname(__FILE__) by __DIR__ in tests 2019-03-15 22:55:30 +01:00
Pedro Magalhães
f26c8644bb Merge branch 'PHP-7.4' 
* PHP-7.4:
  Added test for #77535 fix
 2019-03-15 18:14:55 +00:00
Pedro Magalhães
63802a8446 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Added test for #77535 fix
 2019-03-15 18:13:37 +00:00
Pedro Magalhães
3a04b507ec Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Added test for #77535 fix
 2019-03-15 18:12:55 +00:00
Pedro Magalhães
f167b06d4c Added test for #77535 fix 2019-03-15 18:11:51 +00:00
Nikita Popov
852485d8ec Adjust tests for zpp TypeError change 2019-03-11 11:32:20 +01:00
Nikita Popov
c8e10c6119 More zpp error/variation test removals 2019-03-07 15:54:31 +01:00
Nikita Popov
c0e15a3b7f Implement fine-grained conflict handling 
Tests can specify conflict keys, either in --CONFLICTS-- or
a per-directory CONFLICTS file. Non-conflicting tests may be run
in parallel.
 2019-02-20 11:20:40 +01:00
Anatol Belski
206a925a17 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Sync test with changes in libcurl 7.64.0
  Sync test for libcurl 7.64.0
 2019-02-07 22:29:30 -08:00
Anatol Belski
1bbf7013c8 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Sync test with changes in libcurl 7.64.0
  Sync test for libcurl 7.64.0
 2019-02-07 22:28:45 -08:00
Anatol Belski
e27301c7b3 Sync test with changes in libcurl 7.64.0 2019-02-07 22:22:38 -08:00
Anatol Belski
c9f0e12353 Sync test for libcurl 7.64.0 2019-02-07 22:21:59 -08:00
Nikita Popov
8bc663f43b Remove zpp variation tests 2019-02-05 09:38:55 +01:00
Nikita Popov
6beecbb0aa Merge branch 'PHP-7.3' 2019-01-18 12:06:42 +01:00
Nikita Popov
de38ce1a2e Merge branch 'PHP-7.2' into PHP-7.3 2019-01-18 12:05:11 +01:00
Pedro Magalhães
32ae716037 Fixed bug #76675 
Leave a reference to the resource in the php_curl.
 2019-01-18 12:04:25 +01:00
Nikita Popov
a624c2bd13 Use serialize_deny for CURLFile 
Instead of a throwing __wakeup() method.
 2018-11-26 13:20:51 +01:00