- Update to 2.0.4

- fix link to documentation
- update provided configuration

(cherry picked from commit 289cf7157c)

.gitignore

@@ -14,3 +14,4 @@ php-pecl-http.spec~
 /pecl_http-2.0.0.tgz
 /pecl_http-2.0.1.tgz
 /pecl_http-2.0.3.tgz
+/pecl_http-2.0.4.tgz

pecl_http.ini

@@ -1,13 +1,9 @@
 ; Enable HTTP extension module
 extension=http.so
 
-; http://www.php.net/manual/en/http.configuration.php
+; http://devel-m6w6.rhcloud.com/mdref/http
 
 ; The hashing algorithm used to generate the ETag. MD5, SHA1, and CRC32 are always 
 ; available. If the hash extension is enabled, any hashing algorithms this extension
 ; provides are available, too.
-;http.etag.mode = "md5"
-
-; The maximum amount of persistent handles to keep alive. 
-;http.persistent_handle.limit = -1
-
+;http.etag.mode = "crc32b"

php-pecl-http.spec

@@ -1,6 +1,6 @@
 # spec file for php-pecl-http
 #
-# Copyright (c) 2012-2013 Remi Collet
+# Copyright (c) 2012-2014 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/3.0/
 #
@@ -17,7 +17,7 @@
 %global with_zts  0%{?__ztsphp:1}
 
 Name:           php-pecl-http
-Version:        2.0.3
+Version:        2.0.4
 Release:        1%{?dist}
 Summary:        Extended HTTP support
 
@@ -58,6 +58,8 @@ Requires:       php-spl%{?_isa}
 %endif
 Requires:       php-pecl(propro)%{?_isa}
 Requires:       php-pecl(raphf)%{?_isa}
+# Can't install both version of the same extension
+Conflicts:      php-pecl-http1
 
 Provides:       php-pecl(%{proj_name})         = %{version}%{?prever}
 Provides:       php-pecl(%{proj_name})%{?_isa} = %{version}%{?prever}
@@ -87,7 +89,11 @@ Also provided is a powerful request and parallel interface.
 
 Version 2 is completely incompatible to previous version.
 
-Documentation : http://php.net/http
+Note:
+. php-pecl-http1 provides API version 1
+. php-pecl-http  provides API version 2
+
+Documentation : http://devel-m6w6.rhcloud.com/mdref/http
 
 
 %package devel
@@ -106,9 +112,6 @@ These are the files needed to compile programs using HTTP extension.
 mv %{proj_name}-%{version}%{?prever} NTS
 cd NTS
 
-# http://git.php.net/?p=pecl/http/pecl_http.git;a=patch;h=441de41329327d32937f107da371435d14d7be36
-sed -e '/ZEND_MOD_CONFLICTS/d' -i php_http.c
-
 extver=$(sed -n '/#define PHP_PECL_HTTP_VERSION/{s/.* "//;s/".*$//;p}' php_http.h)
 if test "x${extver}" != "x%{version}%{?prever}"; then
    : Error: Upstream HTTP version is now ${extver}, expecting %{version}%{?prever}.
@@ -218,6 +221,11 @@ fi
 
 
 %changelog
+* Thu Jan 02 2014 Remi Collet <remi@fedoraproject.org> - 2.0.4-1
+- Update to 2.0.4
+- fix link to documentation
+- update provided configuration
+
 * Tue Dec 10 2013 Remi Collet <remi@fedoraproject.org> - 2.0.3-1
 - Update to 2.0.3 (stable)
 - drop Conflicts with pecl/event

sources

@@ -1 +1 @@
-e2b23dcb43cd1af318558e7c114b4352  pecl_http-2.0.3.tgz
+75bdcf0e5f3788ef593e97c22cc4b8b1  pecl_http-2.0.4.tgz