php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
135,103 Commits 549 Branches 1,485 Tags
php-8.3.14
Commit Graph

474 Commits

Author SHA1 Message Date
Tim Düsterhus a1e96620f2 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  curl: Prevent a CurlMultiHandle from holding onto a CurlHandle if `add_handle` fails (#16302)
 2024-10-09 09:37:50 +02:00
Tim Düsterhus e49d732a83 curl: Prevent a CurlMultiHandle from holding onto a CurlHandle if add_handle fails (#16302) 
* curl: Prevent a CurlMultiHandle from holding onto a CurlHandle if `add_handle` fails

As a user I expect `curl_multi_add_handle` to not have any effect if it returns
an error and I specifically do not expect that it would be necessary to call
`curl_multi_remove_handle`.

* NEWS
 2024-10-09 09:37:13 +02:00
Ilija Tovilo 91c06790de Switch asan build to Ubuntu 24.04 
Closes GH-16065
 2024-09-26 15:13:35 +02:00
Christoph M. Becker 8b35b06be5 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  ext/curl: mark certain tests as xfail on curl 8.10.0
 2024-09-23 16:14:47 +02:00
Ayesh Karunaratne 0bdc4b8c24 ext/curl: mark certain tests as xfail on curl 8.10.0 
Closes GH-16007.
 2024-09-23 16:14:09 +02:00
Christoph M. Becker 5961b4ad25 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Mark failing curl test on macOS x64 as xfail
 2024-09-23 13:35:55 +02:00
Christoph M. Becker fc06e0c0d8 Mark failing curl test on macOS x64 as xfail 
Exactly these tests are failing on all our macOS x64 CI runners for
about a week.  For now we mark them as xfail, to get back to a green
CI pipeline.

Closes GH-16002.
 2024-09-23 13:35:28 +02:00
David Carlier 618edb5e15 Merge branch 'PHP-8.2' into PHP-8.3 2024-08-27 04:57:13 +01:00
David Carlier cc67220ea3 Fixed GH-15547: curl_multi_wait expects a signed int for timeout. 
confusion might come from the previous argument type.
PHP expects ms so we check it fits integer boundaries before the cast.
raising a warning at least for stable branches.

close GH-15548
 2024-08-27 04:56:32 +01:00
Christoph M. Becker fc93300407 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Revert "Skip bug45161.phpt on Windows"
 2024-07-18 12:43:35 +02:00
Christoph M. Becker 355baf982e Revert "Skip bug45161.phpt on Windows" 
This reverts commit 4b22c3e3ad.

As quick measure for GH-10753, that test was skipped on Windows.
However, it seems that there are no longer performance issues with
newer cURL versions, so we run that test again on Windows.

Fixes GH-10753.
Closes GH-14998.
 2024-07-18 12:42:01 +02:00
Niels Dossche 9e476775e2 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-13688: Test curl_basic_008 can fail (#13693)
 2024-07-04 18:09:09 +02:00
Niels Dossche 39ed9993f7 Fix GH-13688: Test curl_basic_008 can fail (#13693) 
.invalid is a reserved TLD that should never be caught.
 2024-07-04 18:07:54 +02:00
Niels Dossche ae26dc11d1 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-14307: Test curl_basic_024 fails with curl 8.8.0
 2024-05-24 14:42:41 +02:00
Niels Dossche a2c5b4ec05 Fix GH-14307: Test curl_basic_024 fails with curl 8.8.0 
Curl changed the behaviour, from the changelog:
  - lib: make protocol handlers store scheme name lowercase curl/curl@c294f9c

From the docs: "The returned scheme might be upper or lowercase. Do
comparisons case insensitively."

Closes GH-14312.
 2024-05-24 14:41:29 +02:00
David Carlier f2ec6e4806 Merge branch 'PHP-8.2' into PHP-8.3 2024-03-19 22:35:18 +00:00
David Carlier db063cb771 CI: update freebsd 13 image. 
13.2 is going to be EOL.

close GH-13622
 2024-03-19 22:34:56 +00:00
Niels Dossche 7e3a6a1b42 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  ext/curl: Fix failing tests due to string changes in libcurl 8.6.0
 2024-01-31 21:58:59 +01:00
Ayesh Karunaratne 404803577d ext/curl: Fix failing tests due to string changes in libcurl 8.6.0 
Upstream libcurl 8.6.0 contains a change[^1] that caused a test failure.
This fixes it by updating the test's `EXPECTF` to use a regex to account for both string patterns.

[^1]: https://github.com/curl/curl/commit/45cf4755e71f#diff-a8a54563608f8155973318f4ddb61d7328dab512b8ff2b5cc48cc76979d4204cL1683

Closes GH-13293.
 2024-01-31 21:58:27 +01:00
Ilija Tovilo 1c39cdd63e Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Skip intermittently failing curl test on macOS
 2023-12-08 13:38:48 +01:00
Ilija Tovilo 1b5a159183 [skip ci] Skip intermittently failing curl test on macOS 
The test fails with "CURL ERROR: 56". I will create an issue for it shortly.
 2023-12-08 13:36:52 +01:00
Ilija Tovilo 2b2d2b04e7 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix EXPECT for bug52820.phpt on newer curl versions
  Fix curl_basic_009.phpt for newer curl versions
 2023-08-10 15:52:21 +02:00
Ilija Tovilo 1aae59cf43 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix EXPECT for bug52820.phpt on newer curl versions
  Fix curl_basic_009.phpt for newer curl versions
 2023-08-10 15:52:14 +02:00
Ilija Tovilo 0e843c5d82 Fix EXPECT for bug52820.phpt on newer curl versions 
New curl versions have a "processing: url" line. The connection number in
"Closing connection" is apparently also dropped.
 2023-08-10 15:51:53 +02:00
Ilija Tovilo 3af76b2302 Fix curl_basic_009.phpt for newer curl versions 2023-08-10 15:51:49 +02:00
Niels Dossche de60872cfd Add new curl constants from curl until (including) 7.87 (#10459) 
Fixes GH-10454
 2023-07-17 20:42:39 +02:00
Niels Dossche d0c824cb7e Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix crash when an invalid callback function is passed to CURLMOPT_PUSHFUNCTION
 2023-07-08 21:39:17 +02:00
Niels Dossche 3ccd8d7866 Fix crash when an invalid callback function is passed to CURLMOPT_PUSHFUNCTION 
Previously this caused a SIGABRT.

Closes GH-11639.
 2023-07-08 21:32:10 +02:00
Ilija Tovilo 30a80b8e41 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  tests(ext-curl): fix HTTP/2 Server Push tests
 2023-07-07 10:38:48 +02:00
Kévin Dunglas 47d478806a tests(ext-curl): fix HTTP/2 Server Push tests 
Closes GH-10669
 2023-07-07 10:38:26 +02:00
nielsdos c160693515 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-11433: Unable to set CURLOPT_ACCEPT_ENCODING to NULL
  Fix "invalid state error" with cloned namespace declarations
  Fix lifetime issue with getAttributeNodeNS()
 2023-06-13 17:35:16 +02:00
nielsdos a8a3b99e00 Fix GH-11433: Unable to set CURLOPT_ACCEPT_ENCODING to NULL 
Closes GH-11446.
 2023-06-13 17:30:57 +02:00
Ilija Tovilo f948f79696 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Add all conflict to curl
 2023-04-19 16:24:16 +02:00
Ilija Tovilo af6b413691 [skip ci] Add all conflict to curl 2023-04-19 16:23:52 +02:00
Ilija Tovilo 023e17a89d Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Skip bug45161.phpt on Windows
 2023-04-13 13:20:45 +02:00
Ilija Tovilo 4b22c3e3ad [skip ci] Skip bug45161.phpt on Windows 
See GH-10753

The test is insanely slow on Windows and it's unclear why. It might be a curl
issue.
 2023-04-13 13:19:52 +02:00
Niels Dossche a095203a03 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-10928: PHP Build Failed - Test curl_version() basic functionality [ext/curl/tests/curl_version_basic_001.phpt]
 2023-03-25 18:15:42 +01:00
Niels Dossche 8e620b4ecb Fix GH-10928: PHP Build Failed - Test curl_version() basic functionality [ext/curl/tests/curl_version_basic_001.phpt] 
It's possible that curl was compiled without SSL, and/or without libz
support. In the case of the issue reporter it was without libz support.
This causes the test to fail because we expect a non-empty string.
Fix it by using %S instead of %s to allow empty strings.

Closes GH-10930.
 2023-03-25 18:15:20 +01:00
Ilija Tovilo 7c244f5539 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Add CONFLICTS file for curl tests
 2023-03-21 19:17:36 +01:00
Ilija Tovilo 0842b13e5c [skip ci] Add CONFLICTS file for curl tests 2023-03-21 19:17:06 +01:00
George Peter Banyard 512abc23a4 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fixed bug GH-10270 Unable to return CURL_READFUNC_PAUSE in readfunc callback
  Fix GH-10672 (pg_lo_open segfaults in the strict_types mode)
 2023-02-24 14:33:28 +00:00
Pierrick Charron 91db3a1b85 Fixed bug GH-10270 Unable to return CURL_READFUNC_PAUSE in readfunc callback 
Closes GH-10607

Signed-off-by: George Peter Banyard <girgias@php.net>
 2023-02-24 14:32:23 +00:00
Christoph M. Becker 03e72e7a87 Update curl/tests/check_win_config.phpt 
That was apparently missed in cec20f615d.
 2022-06-14 11:45:44 +02:00
Pierrick Charron 65472c792c Add skip online test to curl_upkeep test 2022-06-13 18:57:37 -04:00
Pierrick Charron b9af4335e3 Add new curl_upkeep() function 2022-06-13 18:15:21 -04:00
Christoph M. Becker 59272266ee Merge branch 'PHP-8.0' into PHP-8.1 
* PHP-8.0:
  Fix test for curl 7.83.0
 2022-05-03 15:08:43 +02:00
Christoph M. Becker 722e9b9fa5 Fix test for curl 7.83.0 
libcurl 7.83.0 removed some trailing exclamation marks from error
messages[1]; we have to cater to that.

[1] <https://github.com/curl/curl/commit/6968fb9d54dc3a1aaa1b16088f038eaf5dd8b2d7>

(cherry picked from commit a4179e4c92)
 2022-05-03 15:07:50 +02:00
Derick Rethans f7a5353531 Turn off "Expect" header in test 
Without this explicitly set, curl might decide to add a
`Expect: 100-continue` header if it deems the request too large.
See also: https://gms.tf/when-curl-sends-100-continue.html
 2022-04-29 16:39:01 +01:00
Christoph M. Becker a4179e4c92 Fix test for curl 7.83.0 
libcurl 7.83.0 removed some trailing exclamation marks from error
messages[1]; we have to cater to that.

[1] <https://github.com/curl/curl/commit/6968fb9d54dc3a1aaa1b16088f038eaf5dd8b2d7>
 2022-04-27 12:37:39 +02:00
David Carlier 7a45dcfe2e Introduce CURLOPT_XFERINFOFUNCTION 
`CURLOPT_XFERINFOFUNCTION` is available as of cURL 7.32.0, and
supersedes `CURLOPT_PROGRESSFUNCTION` which is still supported by
latest cURL, though.

Closes GH-7823.
 2022-04-22 18:09:06 +02:00