diff options
| author | Marius Bakke <marius@gnu.org> | 2022-07-27 17:53:05 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-07-27 17:53:05 +0200 |
| commit | 6a3ed96af73939df69167b5736d03abf1d7ecebd (patch) | |
| tree | c44435fc118e474835323ece38d5e560d0d62dc0 /gnu/packages/patches/php-curl-compat.patch | |
| parent | f7815e76b00f61959e3bae68e4d7365ace45abf1 (diff) | |
| parent | 4059158e6a284976c80b0fe8f64f69868d59ab10 (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/patches/php-curl-compat.patch')
| -rw-r--r-- | gnu/packages/patches/php-curl-compat.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/gnu/packages/patches/php-curl-compat.patch b/gnu/packages/patches/php-curl-compat.patch new file mode 100644 index 0000000000..0617251194 --- /dev/null +++ b/gnu/packages/patches/php-curl-compat.patch @@ -0,0 +1,17 @@ +Fix test result with cURL 7.83 and later. + +Taken from upstream: + + https://github.com/php/php-src/commit/a4179e4c92b6365d39e09cb9cd63c476848013af + +diff --git a/ext/curl/tests/curl_basic_007.phpt b/ext/curl/tests/curl_basic_007.phpt +index 3b53658d6a7e..3834e4674f82 100644 +--- a/ext/curl/tests/curl_basic_007.phpt ++++ b/ext/curl/tests/curl_basic_007.phpt +@@ -20,5 +20,5 @@ curl_close($ch); + + ?> + --EXPECTF-- +-string(%d) "No URL set!%w" ++string(%d) "No URL set%A" + int(3) |