diff options
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | pecl_http-upstream.patch | 34 | ||||
| -rw-r--r-- | php-pecl-http.spec | 8 |
3 files changed, 5 insertions, 39 deletions
@@ -1,4 +1,4 @@ -Extension [ <persistent> extension #167 http version 2.1.2 ] { +Extension [ <persistent> extension #167 http version 2.1.3 ] { - Dependencies { Dependency [ raphf (Required) ] diff --git a/pecl_http-upstream.patch b/pecl_http-upstream.patch deleted file mode 100644 index 505f524..0000000 --- a/pecl_http-upstream.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 62030d589336fc052eab8cf4503ef1968f5d9ac8 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@php.net> -Date: Thu, 25 Sep 2014 10:16:51 +0200 -Subject: [PATCH] Fix build with curl < 7.26 - -$ grep "define CURL_REDIR_POST_30" curl-7.2*/include/curl/curl.h - -curl-7.25.0/include/curl/curl.h:#define CURL_REDIR_POST_301 1 -curl-7.25.0/include/curl/curl.h:#define CURL_REDIR_POST_302 2 - -curl-7.26.0/include/curl/curl.h:#define CURL_REDIR_POST_301 1 -curl-7.26.0/include/curl/curl.h:#define CURL_REDIR_POST_302 2 -curl-7.26.0/include/curl/curl.h:#define CURL_REDIR_POST_303 4 ---- - php_http_client_curl.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/php_http_client_curl.c b/php_http_client_curl.c -index 6f9884e..8f25211 100644 ---- a/php_http_client_curl.c -+++ b/php_http_client_curl.c -@@ -2169,7 +2169,9 @@ PHP_MINIT_FUNCTION(http_client_curl) - #if PHP_HTTP_CURL_VERSION(7,19,1) - REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_301", CURL_REDIR_POST_301, CONST_CS|CONST_PERSISTENT); - REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_302", CURL_REDIR_POST_302, CONST_CS|CONST_PERSISTENT); -+#if PHP_HTTP_CURL_VERSION(7,26,0) - REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_303", CURL_REDIR_POST_303, CONST_CS|CONST_PERSISTENT); -+#endif - REGISTER_NS_LONG_CONSTANT("http\\Client\\Curl", "POSTREDIR_ALL", CURL_REDIR_POST_ALL, CONST_CS|CONST_PERSISTENT); - #endif - --- -2.1.0 - diff --git a/php-pecl-http.spec b/php-pecl-http.spec index 8ed6c73..6f37d39 100644 --- a/php-pecl-http.spec +++ b/php-pecl-http.spec @@ -27,7 +27,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: %{?scl_prefix}php-pecl-http -Version: 2.1.2 +Version: 2.1.3 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} Summary: Extended HTTP support @@ -39,8 +39,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 -Patch0: %{proj_name}-upstream.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel >= 5.3.0 BuildRequires: %{?scl_prefix}php-hash @@ -174,7 +172,6 @@ These are the files needed to compile programs using HTTP extension. mv %{proj_name}-%{version}%{?prever} NTS cd NTS -%patch0 -p1 -b .upstream extver=$(sed -n '/#define PHP_PECL_HTTP_VERSION/{s/.* "//;s/".*$//;p}' php_http.h) if test "x${extver}" != "x%{version}%{?prever}"; then @@ -330,6 +327,9 @@ rm -rf %{buildroot} %changelog +* Thu Oct 16 2014 Remi Collet <remi@fedoraproject.org> - 2.1.3-1 +- Update to 2.1.3, no change, only our patch merged + * Thu Sep 25 2014 Remi Collet <remi@fedoraproject.org> - 2.1.2-1 - Update to 2.1.2 |