archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
134586 commits 526 branches 1434 tags 866 MiB
Commit graph

1374 commits

Author SHA1 Message Date
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
David Carlier
383d1b0330
Merge branch 'PHP-8.2' into PHP-8.3 2024-07-18 06:26:22 +01:00
David Carlier
efd00b8ff0
ext/curl: curl_error using curl_easy_strerror if CURLOPT_ERRORBUFFER 
did not fill the error buffer.

close GH-14984
 2024-07-18 06:25:37 +01: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]: 45cf4755e7 (diff-a8a54563608f8155973318f4ddb61d7328dab512b8ff2b5cc48cc76979d4204cL1683)

Closes GH-13293.
 2024-01-31 21:58:27 +01:00
Niels Dossche
83c8d02602 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix missing error check in curl_multi_init()
 2024-01-16 19:36:03 +01:00
divinity76
9814d4a191 Fix missing error check in curl_multi_init() 
Closes GH-13157.
 2024-01-16 19:35:36 +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
7c5a57077a Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix return value of _php_server_push_callback in case of failure
 2023-07-09 01:09:56 +02:00
Niels Dossche
e25e14ad95 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix return value of _php_server_push_callback in case of failure
 2023-07-09 01:09:50 +02:00
Niels Dossche
dc9adda653 Fix return value of _php_server_push_callback in case of failure 
It should return CURL_PUSH_DENY by default instead of CURL_PUSH_OK in
the branch I added, just like the check above.
I forgot to change this after doing tests.
 2023-07-09 01:08:34 +02:00
Niels Dossche
46a0d043b5 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix crash when an invalid callback function is passed to CURLMOPT_PUSHFUNCTION
 2023-07-08 21:44:26 +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
7e57e108f9
Merge branch 'PHP-8.2' 
* PHP-8.2:
  tests(ext-curl): fix HTTP/2 Server Push tests
 2023-07-07 10:38:55 +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
18f2f0a0ab Merge branch 'PHP-8.2' 
* PHP-8.2:
  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:38:04 +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
George Peter Banyard
d5ad75108e
More usage of known zend_str instead of C string (#11381) 2023-06-08 13:03:29 +01:00
Ilija Tovilo
b22758d764
Merge branch 'PHP-8.2' 
* PHP-8.2:
  [skip ci] Add all conflict to curl
 2023-04-19 16:24:23 +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
49fd6306db
Merge branch 'PHP-8.2' 
* PHP-8.2:
  [skip ci] Skip bug45161.phpt on Windows
 2023-04-13 13:21:18 +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
George Peter Banyard
ad997987dd
ext/curl: Protocol should be a case insensitive check (#11052) 
Minor drive-by refactoring to use the new API
 2023-04-11 11:45:05 +01:00
Niels Dossche
2ba3c999b9 Merge branch 'PHP-8.2' 
* PHP-8.2:
  Fix GH-10928: PHP Build Failed - Test curl_version() basic functionality [ext/curl/tests/curl_version_basic_001.phpt]
 2023-03-25 18:16:55 +01: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
7b4c7374c3
Merge branch 'PHP-8.2' 
* PHP-8.2:
  ext/curl: suppress -Wdeprecated-declarations in curl_arginfo.h
 2023-03-22 20:58:33 +01:00
Ilija Tovilo
c8f9adb44d
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  ext/curl: suppress -Wdeprecated-declarations in curl_arginfo.h
 2023-03-22 20:58:25 +01:00
Max Kellermann
2646d76abc
ext/curl: suppress -Wdeprecated-declarations in curl_arginfo.h 
Disable the warning before including curl_arginfo.h.

(Follow-up for https://github.com/php/php-src/pull/10531)
 2023-03-22 20:57:41 +01:00
Ilija Tovilo
ba7eeeacc0
Merge branch 'PHP-8.2' 
* PHP-8.2:
  [skip ci] Add CONFLICTS file for curl tests
 2023-03-21 19:17:49 +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