diff options
| author | Shawn Iwinski <shawn@iwin.ski> | 2017-04-07 13:23:30 -0400 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-04-10 08:34:38 +0200 |
| commit | e03739834e262e50f68c4831d9ac7e182bd9bc69 (patch) | |
| tree | f60551b2a917601234b3fedf500c687d5124a4fb /php-guzzlehttp-ringphp-upstream-pull-42.patch | |
| parent | 2393aea2475a872cc15b9d5719057d55462f329b (diff) | |
Fix rawhide (F27) FTBS
- Switch autoloader to php-composer(fedora/autoloader)
- Test with SCLs if available
(cherry picked from commit 6b81006e0e1590a7a0617244e45fafc64e6f7c96)
Diffstat (limited to 'php-guzzlehttp-ringphp-upstream-pull-42.patch')
| -rw-r--r-- | php-guzzlehttp-ringphp-upstream-pull-42.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/php-guzzlehttp-ringphp-upstream-pull-42.patch b/php-guzzlehttp-ringphp-upstream-pull-42.patch new file mode 100644 index 0000000..6439a36 --- /dev/null +++ b/php-guzzlehttp-ringphp-upstream-pull-42.patch @@ -0,0 +1,22 @@ +From 6218c409739ab2db2a2c9d30d56925fd1936dff6 Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Fri, 31 Mar 2017 08:29:47 +0200 +Subject: [PATCH] Fix #41 use proper proxy attribute without ending / + +--- + tests/Client/StreamHandlerTest.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/Client/StreamHandlerTest.php b/tests/Client/StreamHandlerTest.php +index 3cb9a8e..d491064 100644 +--- a/tests/Client/StreamHandlerTest.php ++++ b/tests/Client/StreamHandlerTest.php +@@ -375,7 +375,7 @@ public function testEmitsProgressInformationAndDebugInformation() + + public function testAddsProxyByProtocol() + { +- $url = str_replace('http', 'tcp', Server::$url); ++ $url = rtrim(str_replace('http', 'tcp', Server::$url), '/'); + $res = $this->getSendResult(['proxy' => ['http' => $url]]); + $opts = stream_context_get_options($res['body']); + $this->assertEquals($url, $opts['http']['proxy']); |