v3.1.0
This commit is contained in:
Remi Collet
parent
dce9f2e49e
commit
b03a8b4b23
|
|
@ -10,3 +10,5 @@ clog
|
|||
/pecl_http-2.5.5.tgz
|
||||
/pecl_http-2.5.6.tgz
|
||||
/pecl_http-3.0.1.tgz
|
||||
/pecl_http-3.1.0.tgz
|
||||
/pecl_http-2.6.0.tgz
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
From 1f2b82b9a141d67e285803c353e6e618be8c41d1 Mon Sep 17 00:00:00 2001
|
||||
From: Remi Collet <fedora@famillecollet.com>
|
||||
Date: Sat, 26 Mar 2016 11:39:09 +0100
|
||||
Subject: [PATCH] skip online test
|
||||
|
||||
---
|
||||
tests/client019.phpt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/tests/client019.phpt b/tests/client019.phpt
|
||||
index eea116a..c386a68 100644
|
||||
--- a/tests/client019.phpt
|
||||
+++ b/tests/client019.phpt
|
||||
@@ -3,6 +3,7 @@ client proxy - send proxy headers for a proxy request
|
||||
--SKIPIF--
|
||||
<?php
|
||||
include "skipif.inc";
|
||||
+skip_online_test();
|
||||
skip_client_test();
|
||||
$client = new http\Client("curl");
|
||||
array_key_exists("proxyheader", $client->getAvailableOptions())
|
||||
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;
|
||||
|
|
@ -20,8 +20,8 @@
|
|||
%endif
|
||||
|
||||
Name: php-pecl-http
|
||||
Version: 3.0.1
|
||||
Release: 2%{?dist}
|
||||
Version: 3.1.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Extended HTTP support
|
||||
|
||||
License: BSD
|
||||
|
|
@ -32,9 +32,6 @@ Source0: http://pecl.php.net/get/%{proj_name}-%{version}%{?prever}.tgz
|
|||
# From http://www.php.net/manual/en/http.configuration.php
|
||||
Source1: %{proj_name}.ini
|
||||
|
||||
# Upstream patch
|
||||
Patch0: %{proj_name}-upstream.patch
|
||||
|
||||
BuildRequires: php-devel >= 7
|
||||
BuildRequires: php-hash
|
||||
BuildRequires: php-iconv
|
||||
|
|
@ -44,6 +41,7 @@ BuildRequires: pcre-devel
|
|||
BuildRequires: zlib-devel >= 1.2.0.4
|
||||
BuildRequires: curl-devel >= 7.18.2
|
||||
BuildRequires: libidn-devel
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: php-pecl-propro-devel >= 1.0.0
|
||||
BuildRequires: php-pecl-raphf-devel >= 1.1.0
|
||||
BuildRequires: libevent-devel >= 1.4
|
||||
|
|
@ -102,7 +100,7 @@ sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
|
|||
|
||||
mv %{proj_name}-%{version}%{?prever} NTS
|
||||
cd NTS
|
||||
%patch0 -p1
|
||||
sed -e '/WORDS_BIGENDIAN/s/if /ifdef /' -i src/php_http_etag.c
|
||||
|
||||
extver=$(sed -n '/#define PHP_PECL_HTTP_VERSION/{s/.* "//;s/".*$//;p}' php_http.h)
|
||||
if test "x${extver}" != "x%{version}%{?prever}"; then
|
||||
|
|
@ -127,6 +125,7 @@ peclconf() {
|
|||
--with-http-zlib-dir=%{_prefix} \
|
||||
--with-http-libcurl-dir=%{_prefix} \
|
||||
--with-http-libidn-dir=%{_prefix} \
|
||||
--with-http-libicu-dir=%{_prefix} \
|
||||
--with-http-libevent-dir=%{_prefix} \
|
||||
--with-libdir=%{_lib} \
|
||||
--with-php-config=$1
|
||||
|
|
@ -187,8 +186,6 @@ done
|
|||
--modules | grep %{pecl_name}
|
||||
|
||||
%if %{with_tests}
|
||||
rm ?TS/tests/client022.phpt
|
||||
|
||||
: Upstream test suite NTS extension
|
||||
cd NTS
|
||||
TEST_PHP_EXECUTABLE=%{__php} \
|
||||
|
|
@ -237,6 +234,9 @@ NO_INTERACTION=1 \
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Dec 12 2016 Remi Collet <remi@fedoraproject.org> - 3.1.0-1
|
||||
- Update to 3.1.0 (php 7, stable)
|
||||
|
||||
* Mon Nov 14 2016 Remi Collet <remi@fedoraproject.org> - 3.0.1-2
|
||||
- rebuild for https://fedoraproject.org/wiki/Changes/php71
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue