From 3ee7c98db4fcdc01003f11e9f568af5a48d98b8c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 19 Jul 2018 14:05:53 +0200
Subject: v3.2.0

---
 pecl_http-upstream.patch | 49 ------------------------------------------------
 1 file changed, 49 deletions(-)
 delete mode 100644 pecl_http-upstream.patch

(limited to 'pecl_http-upstream.patch')

diff --git a/pecl_http-upstream.patch b/pecl_http-upstream.patch
deleted file mode 100644
index d07660b..0000000
--- a/pecl_http-upstream.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 9f18b5395f9c937105d698ce564920dc06dce8f5 Mon Sep 17 00:00:00 2001
-From: Michael Wallner <mike@php.net>
-Date: Wed, 25 May 2016 12:06:57 +0200
-Subject: [PATCH] fix tests for master
-
----
- tests/client008.phpt | 2 +-
- tests/etag001.phpt   | 2 +-
- tests/skipif.inc     | 3 ++-
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/tests/client008.phpt b/tests/client008.phpt
-index 98fc8f8..3f5641f 100644
---- a/tests/client008.phpt
-+++ b/tests/client008.phpt
-@@ -1,5 +1,5 @@
- --TEST--
--client features
-+client configuration
- --SKIPIF--
- <?php
- include "skipif.inc";
-diff --git a/tests/etag001.phpt b/tests/etag001.phpt
-index e23bd0a..e5e3d4a 100644
---- a/tests/etag001.phpt
-+++ b/tests/etag001.phpt
-@@ -10,7 +10,7 @@ _ext("hash");
- $body = new http\Message\Body;
- $body->append("Hello, my old fellow.");
- foreach (hash_algos() as $algo) {
--    if (strncmp($algo, "sha3-", 5)) {
-+    if (strncmp($algo, "sha3-", 5) && strncmp($algo, "sha512/", 7)) {
-         ini_set("http.etag.mode", $algo);
-         printf("%10s: %s\n",
-             $algo,
-diff --git a/tests/skipif.inc b/tests/skipif.inc
-index 4ab631e..770cf5d 100644
---- a/tests/skipif.inc
-+++ b/tests/skipif.inc
-@@ -21,7 +21,8 @@ function skip_client_test($message = "skip need a client driver\n") {
- }
- 
- function skip_http2_test($message = "skip need http2 support (nghttpd in PATH)\n") {
--	if (defined("http\\Client\\Curl\\HTTP_VERSION_2_0")) {
-+	if (defined("http\\Client\\Curl\\HTTP_VERSION_2_0")
-+	&& (http\Client\Curl\FEATURES & http\Client\Curl\Features\HTTP2)) {
- 		foreach (explode(":", $_ENV["PATH"]) as $path) {
- 			if (is_executable($path . "/nghttpd")) {
- 				return;
-- 
cgit