diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
| commit | c719fdcee603a5a706a45d10cb598762d56a727d (patch) | |
| tree | 620cbf137661399a3fb1eff92914204f9a970713 /dev-php/pecl-http/files | |
| parent | cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff) | |
gentoo resync : 25.09.2021
Diffstat (limited to 'dev-php/pecl-http/files')
| -rw-r--r-- | dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch | 11 | ||||
| -rw-r--r-- | dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch | 25 |
2 files changed, 11 insertions, 25 deletions
diff --git a/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch b/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch new file mode 100644 index 000000000000..3c124b4624a6 --- /dev/null +++ b/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch @@ -0,0 +1,11 @@ +--- a/src/php_http_client_curl.c 2021-01-13 10:34:34.000000000 -0500 ++++ b/src/php_http_client_curl.c 2021-09-22 10:38:58.854615743 -0400 +@@ -834,7 +834,7 @@ + } else { + storage->cookiestore = NULL; + } +- if ( CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore) ++ if ( CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore ? storage->cookiestore : "") + || CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore) + ) { + return FAILURE; diff --git a/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch b/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch deleted file mode 100644 index c3ad7d968360..000000000000 --- a/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit a4f66fb42bb5203e9d1897a6cf554aa702ce0380 -Author: Thomas Deutschmann <whissi@gentoo.org> -AuthorDate: Tue May 18 19:55:47 2021 +0200 -Commit: Thomas Deutschmann <whissi@gentoo.org> -CommitDate: Tue May 18 19:55:47 2021 +0200 - - tests: use getenv() to access environment variable - - Fixes - - Warning: Undefined array key "PATH" in pecl-http-4.1.0/work/php8.0/tests/skipif.inc on line 56 - -diff --git a/tests/skipif.inc b/tests/skipif.inc -index 51272fb..76c3bd7 100644 ---- a/tests/skipif.inc -+++ b/tests/skipif.inc -@@ -53,7 +53,7 @@ function skip_http2_test($message = "skip need http2 support") { - if (!(http\Client\Curl\FEATURES & http\Client\Curl\Features\HTTP2)) { - die("$message (FEATURES & HTTP2)\n"); - } -- foreach (explode(":", $_ENV["PATH"]) as $path) { -+ foreach (explode(":", getenv("PATH")) as $path) { - if (is_executable($path . "/nghttpd")) { - return; - } |