php-pecl-http: 2.5.0RC1

6 files changed, 10 insertions, 607 deletions

diff --git a/REFLECTION b/REFLECTION
index c49d1c4..c016415 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #181 http version 2.4.3 ] {
+Extension [ <persistent> extension #182 http version 2.5.0RC1 ] {
 
   - Dependencies {
     Dependency [ raphf (Required) ]
@@ -3684,7 +3684,7 @@ Extension [ <persistent> extension #181 http version 2.4.3 ] {
 
     Class [ <internal:http> class http\Params implements ArrayAccess ] {
 
-      - Constants [11] {
+      - Constants [12] {
         Constant [ string DEF_PARAM_SEP ] { , }
         Constant [ string DEF_ARG_SEP ] { ; }
         Constant [ string DEF_VAL_SEP ] { = }
@@ -3694,6 +3694,7 @@ Extension [ <persistent> extension #181 http version 2.4.3 ] {
         Constant [ integer PARSE_URLENCODED ] { 4 }
         Constant [ integer PARSE_DIMENSION ] { 8 }
         Constant [ integer PARSE_RFC5987 ] { 16 }
+        Constant [ integer PARSE_RFC5988 ] { 32 }
         Constant [ integer PARSE_DEFAULT ] { 17 }
         Constant [ integer PARSE_QUERY ] { 12 }
       }
diff --git a/bug69313.phpt b/bug69313.phpt
deleted file mode 100644
index 824918c..0000000
--- a/bug69313.phpt
+++ /dev/null
@@ -1,46 +0,0 @@
---TEST--
-Bug #69313 (http\Client doesn't send GET body)
---SKIPIF--
-<?php
-include "./skipif.inc";
-skip_client_test();
-?>
---FILE--
-<?php
-
-
-include "helper/server.inc";
-
-echo "Test\n";
-
-server("proxy.inc", function($port, $stdin, $stdout, $stderr) {
-	$request = new http\Client\Request("GET", "http://localhost:$port/");
-	$request->setHeader("Content-Type", "text/plain");
-	$request->getBody()->append("foo");
-	$client = new http\Client();
-	$client->enqueue($request);
-	$client->send();
-	echo $client->getResponse();
-});
-
-?>
-
-Done
---EXPECTF--
-Test
-HTTP/1.1 200 OK
-Accept-Ranges: bytes
-Etag: "%s"
-X-Original-Transfer-Encoding: chunked
-Content-Length: %d
-
-GET / HTTP/1.1
-User-Agent: %s
-Host: localhost:%d
-Accept: */*
-Content-Type: text/plain
-Content-Length: 3
-X-Original-Content-Length: 3
-
-foo
-Done
diff --git a/php-pecl-http-dev.spec b/php-pecl-http-dev.spec
deleted file mode 100644
index 7e1d77a..0000000
--- a/php-pecl-http-dev.spec
+++ /dev/null
@@ -1,496 +0,0 @@
-# spec file for php-pecl-http
-#
-# Copyright (c) 2012-2015 Remi Collet
-# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/4.0/
-#
-# Please, preserve the changelog entries
-#
-%{?scl:          %scl_package         php-pecl-http}
-%{!?scl:         %global _root_prefix %{_prefix}}
-%{!?php_inidir:  %global php_inidir   %{_sysconfdir}/php.d}
-%{!?php_incldir: %global php_incldir  %{_includedir}/php}
-%{!?__pecl:      %global __pecl       %{_bindir}/pecl}
-%{!?__php:       %global __php        %{_bindir}/php}
-
-# The project is pecl_http but the extension is only http
-%global proj_name pecl_http
-%global pecl_name http
-%global with_zts  0%{?__ztsphp:1}
-%if "%{php_version}" < "5.6"
-# after json hash iconv propro raphf
-%global ini_name  z-%{pecl_name}.ini
-%else
-# after 40-json 20-iconv 40-propro 40-raphf
-%global ini_name  50-%{pecl_name}.ini
-%endif
-%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
-
-%global prever RC1
-Name:           %{?scl_prefix}php-pecl-http
-Version:        2.3.0
-Release:        0.1.RC1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
-Summary:        Extended HTTP support
-
-License:        BSD
-Group:          Development/Languages
-URL:            http://pecl.php.net/package/pecl_http
-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
-BuildRequires:  %{?scl_prefix}php-iconv
-BuildRequires:  %{?scl_prefix}php-json
-BuildRequires:  %{?scl_prefix}php-spl
-BuildRequires:  %{?scl_prefix}php-pear
-BuildRequires:  pcre-devel
-BuildRequires:  zlib-devel >= 1.2.0.4
-BuildRequires:  curl-devel >= 7.18.2
-BuildRequires:  libidn-devel
-BuildRequires:  %{?scl_prefix}php-pecl-propro-devel
-BuildRequires:  %{?scl_prefix}php-pecl-raphf-devel
-
-%if 0%{?scl:1} && 0%{?fedora} < 15 && 0%{?rhel} < 7 && "%{?scl_vendor}" != "remi"
-# Filter in the SCL collection
-%{?filter_requires_in: %filter_requires_in %{_libdir}/.*\.so}
-# libvent from SCL as not available in system
-BuildRequires: %{scl_prefix}libevent-devel  > 2
-Requires:      %{scl_prefix}libevent%{_isa} > 2
-Requires:      libcurl%{_isa}
-Requires:      zlib%{_isa}
-%global        _event_prefix %{_prefix}
-
-%else
-%global        _event_prefix %{_root_prefix}
-%if "%{?vendor}" == "Remi Collet"
-BuildRequires: libevent-devel > 2
-%else
-# Copr build
-BuildRequires: libevent-devel > 1.4
-%endif
-%endif
-
-Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
-Requires:       %{?scl_prefix}php(api) = %{php_core_api}
-%if "%{php_version}" < "5.4"
-# php 5.3.3 in EL-6 don't use arched virtual provides
-# so only requires real packages instead
-Requires:       %{?scl_prefix}php-common%{?_isa}
-%else
-Requires:       %{?scl_prefix}php-hash%{?_isa}
-Requires:       %{?scl_prefix}php-iconv%{?_isa}
-Requires:       %{?scl_prefix}php-json%{?_isa}
-Requires:       %{?scl_prefix}php-spl%{?_isa}
-%endif
-Requires:       %{?scl_prefix}php-pecl(propro)%{?_isa}
-Requires:       %{?scl_prefix}php-pecl(raphf)%{?_isa}
-%if "%{php_version}" > "5.6"
-# V1 don't support PHP 5.6 https://bugs.php.net/66879
-Obsoletes:      %{?scl_prefix}php-pecl-http1 < 2
-%else
-# Can't install both versions of the same extension
-Conflicts:      %{?scl_prefix}php-pecl-http1
-%endif
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
-
-Provides:       %{?scl_prefix}php-pecl(%{proj_name})         = %{version}%{?prever}
-Provides:       %{?scl_prefix}php-pecl(%{proj_name})%{?_isa} = %{version}%{?prever}
-Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}%{?prever}
-Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}%{?prever}
-Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}%{?prever}
-Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}%{?prever}
-
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
-# Other third party repo stuff
-Obsoletes:     php53-pecl-http  <= %{version}
-Obsoletes:     php53u-pecl-http <= %{version}
-Obsoletes:     php54-pecl-http  <= %{version}
-Obsoletes:     php54w-pecl-http <= %{version}
-%if "%{php_version}" > "5.5"
-Obsoletes:     php55u-pecl-http <= %{version}
-Obsoletes:     php55w-pecl-http <= %{version}
-%endif
-%if "%{php_version}" > "5.6"
-Obsoletes:     php56u-pecl-http <= %{version}
-Obsoletes:     php56w-pecl-http <= %{version}
-%endif
-%endif
-
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%endif
-%{?filter_setup}
-
-
-%description
-The HTTP extension aims to provide a convenient and powerful set of
-functionality for major applications.
-
-The HTTP extension eases handling of HTTP URLs, dates, redirects, headers
-and messages in a HTTP context (both incoming and outgoing). It also provides
-means for client negotiation of preferred language and charset, as well as
-a convenient way to exchange arbitrary data with caching and resuming
-capabilities.
-
-Also provided is a powerful request and parallel interface.
-
-Version 2 is completely incompatible to previous version.
-
-Note:
-. php-pecl-http1 provides API version 1
-. php-pecl-http  provides API version 2
-
-Documentation : http://devel-m6w6.rhcloud.com/mdref/http
-
-Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection}.
-
-
-%package devel
-Summary:       Extended HTTP support developer files (header)
-Group:         Development/Libraries
-Requires:      %{name}%{?_isa} = %{version}-%{release}
-Requires:      %{?scl_prefix}php-devel%{?_isa} >= 5.3.0
-%if "%{php_version}" > "5.6"
-# V1 don't support PHP 5.6 https://bugs.php.net/66879
-Obsoletes:     %{?scl_prefix}php-pecl-http1-devel < 2
-%else
-# Can't install both versions of the same extension
-Conflicts:     %{?scl_prefix}php-pecl-http1-devel
-%endif
-
-%description devel
-These are the files needed to compile programs using HTTP extension.
-
-
-%prep
-%setup -c -q 
-
-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
-   : Error: Upstream HTTP version is now ${extver}, expecting %{version}%{?prever}.
-   : Update the pdover macro and rebuild.
-   exit 1
-fi
-cd ..
-
-cp %{SOURCE1} %{ini_name}
-
-%if %{with_zts}
-# Duplicate source tree for NTS / ZTS build
-cp -pr NTS ZTS
-%endif
-
-
-%build
-peclconf() {
-%configure \
-  --with-http \
-  --with-http-zlib-dir=%{_root_prefix} \
-  --with-http-libcurl-dir=%{_root_prefix} \
-  --with-http-libidn-dir=%{_root_prefix} \
-  --with-http-libevent-dir=%{_event_prefix} \
-  --with-libdir=%{_lib} \
-  --with-php-config=$1
-}
-cd NTS
-%{_bindir}/phpize
-peclconf %{_bindir}/php-config
-make %{?_smp_mflags}
-
-%if %{with_zts}
-cd ../ZTS
-%{_bindir}/zts-phpize
-peclconf %{_bindir}/zts-php-config
-make %{?_smp_mflags}
-%endif
-
-
-%install
-rm -rf %{buildroot}
-
-make -C NTS install INSTALL_ROOT=%{buildroot}
-
-# Install XML package description
-install -Dpm 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
-# install config file (z-http.ini to be loaded after json)
-install -Dpm644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
-
-%if %{with_zts}
-make -C ZTS install INSTALL_ROOT=%{buildroot}
-install -Dpm644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
-%endif
-
-# Test & Documentation
-cd NTS
-for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 $i %{buildroot}%{pecl_testdir}/%{proj_name}/$i
-done
-for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{proj_name}/$i
-done
-
-
-%check
-%if 0%{?fedora} == 20
-# ignore failed tests (timeout) with curl 7.32
-# see https://bugzilla.redhat.com/show_bug.cgi?id=1194603
-rm ?TS/tests/client{006,007,008,018,021}.phpt
-%endif
-
-%if "%{php_version}" < "5.4"
-# Known failed test with 5.3.3 (need investigations)
-export REPORT_EXIT_STATUS=0
-%else
-export REPORT_EXIT_STATUS=1
-%endif
-
-# Shared needed extensions
-modules=""
-for mod in json hash iconv propro raphf; do
-  if [ -f %{php_extdir}/${mod}.so ]; then
-    modules="$modules -d extension=${mod}.so"
-  fi
-done
-
-: Minimal load test for NTS extension
-%{__php} --no-php-ini \
-    $modules \
-    --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
-    --modules | grep %{pecl_name}
-
-%if %{with_tests}
-: Upstream test suite NTS extension
-cd NTS
-SKIP_ONLINE_TESTS=1 \
-TEST_PHP_EXECUTABLE=%{__php} \
-TEST_PHP_ARGS="-n $modules -d extension=$PWD/modules/%{pecl_name}.so" \
-NO_INTERACTION=1 \
-%{__php} -n run-tests.php --show-diff
-%endif
-
-%if %{with_zts}
-: Minimal load test for ZTS extension
-%{__ztsphp} --no-php-ini \
-    $modules \
-    --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
-    --modules | grep %{pecl_name}
-
-%if %{with_tests}
-: Upstream test suite ZTS extension
-cd ../ZTS
-SKIP_ONLINE_TESTS=1 \
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="-n $modules -d extension=$PWD/modules/%{pecl_name}.so" \
-NO_INTERACTION=1 \
-%{__ztsphp} -n run-tests.php --show-diff
-%endif
-%endif
-
-
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
-    %{pecl_uninstall} %{proj_name} >/dev/null || :
-fi
-
-
-%clean
-rm -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root,-)
-%{?_licensedir:%license NTS/LICENSE}
-%doc %{pecl_docdir}/%{proj_name}
-%config(noreplace) %{php_inidir}/%{ini_name}
-%{php_extdir}/%{pecl_name}.so
-%{pecl_xmldir}/%{name}.xml
-
-%if %{with_zts}
-%config(noreplace) %{php_ztsinidir}/%{ini_name}
-%{php_ztsextdir}/%{pecl_name}.so
-%endif
-
-%files devel
-%defattr(-,root,root,-)
-%doc %{pecl_testdir}/%{proj_name}
-%{php_incldir}/ext/%{pecl_name}
-
-%if %{with_zts}
-%{php_ztsincldir}/ext/%{pecl_name}
-%endif
-
-
-%changelog
-* Thu Feb 19 2015 Remi Collet <remi@fedoraproject.org> - 2.3.0-0.1.RC1
-- update to 2.3.0RC1 (beta)
-- add some upstream patches
-
-* Mon Feb 09 2015 Remi Collet <remi@fedoraproject.org> - 2.2.1-1
-- Update to 2.2.1 (stable)
-
-* Tue Jan 27 2015 Remi Collet <remi@fedoraproject.org> - 2.2.0-1
-- Update to 2.2.0 (stable)
-- add dependency on libidn
-- drop runtime dependency on pear, new scriptlets
-
-* Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 2.2.0-0.3.RC1
-- Fedora 21 SCL mass rebuild
-
-* Wed Nov 12 2014 Remi Collet <remi@fedoraproject.org> - 2.2.0-0.2.RC1
-- update to 2.2.0RC1 (beta)
-
-* Fri Nov 07 2014 Remi Collet <remi@fedoraproject.org> - 2.2.0-0.1
-- test build of 2.2.0dev
-
-* Thu Nov 06 2014 Remi Collet <remi@fedoraproject.org> - 2.1.4-1
-- Update to 2.1.4
-
-* 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
-
-* Tue Sep 09 2014 Remi Collet <remi@fedoraproject.org> - 2.1.1-1
-- Update to 2.1.1
-
-* Mon Sep  1 2014 Remi Collet <remi@fedoraproject.org> - 2.1.0-1
-- Update to 2.1.0
-
-* Mon Aug 25 2014 Remi Collet <rcollet@redhat.com> - 2.1.0-0.6.RC3
-- improve SCL build
-
-* Tue Aug 19 2014 Remi Collet <remi@fedoraproject.org> - 2.1.0-0.5.RC3
-- Update to 2.1.0RC3
-- ignore known failed test with PHP 5.3.3
-
-* Mon Aug 11 2014 Remi Collet <remi@fedoraproject.org> - 2.1.0-0.4.RC2
-- add upstream patch for PHP 5.3
-
-* Mon Aug 11 2014 Remi Collet <remi@fedoraproject.org> - 2.1.0-0.3.RC2
-- Update to 2.1.0RC2
-
-* Tue Aug 05 2014 Remi Collet <remi@fedoraproject.org> - 2.1.0-0.2.RC1
-- add upstream patches
-
-* Sat Aug 02 2014 Remi Collet <remi@fedoraproject.org> - 2.1.0-0.1.RC1
-- Update to 2.1.0RC1
-- run test suite during build
-
-* Fri Jul 11 2014 Remi Collet <remi@fedoraproject.org> - 2.0.7-1
-- Update to 2.0.7
-
-* Wed May 14 2014 Remi Collet <remi@fedoraproject.org> - 2.0.6-2
-- php56: obsoletes php-pecl-http1
-
-* Thu Apr 24 2014 Remi Collet <remi@fedoraproject.org> - 2.0.6-1
-- Update to 2.0.6
-
-* Wed Apr  9 2014 Remi Collet <remi@fedoraproject.org> - 2.0.5-2
-- add numerical prefix to extension configuration file
-
-* Fri Apr 04 2014 Remi Collet <remi@fedoraproject.org> - 2.0.5-1
-- Update to 2.0.5
-- use libevent v2 in SCL
-
-* Sun Mar 09 2014 Remi Collet <remi@fedoraproject.org> - 2.0.4-2
-- add upstream patch for -Werror=format-security
-
-* 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
-
-* Fri Nov 29 2013 Remi Collet <rcollet@redhat.com> - 2.0.1-1
-- adapt for SCL
-
-* Tue Nov 26 2013 Remi Collet <remi@fedoraproject.org> - 2.0.1-1
-- Update to 2.0.1 (stable)
-
-* Fri Nov 22 2013 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
-- update to 2.0.0 (stable)
-- install doc in pecl doc_dir
-- install tests in pecl test_dir (in devel)
-
-* Tue Aug 20 2013 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.18.beta5
-- update to 2.0.0 beta5
-- requires propro and raphf extensions
-
-* Thu Mar 21 2013 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.15.beta4
-- fix build with php 5.5.0beta1
-
-* Sun Dec 30 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.14.beta4
-- update to 2.0.0beta4
-
-* Thu Dec 13 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.13.beta3
-- update to 2.0.0beta3
-
-* Thu Nov 29 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.12.beta2
-- update to 2.0.0beta2
-- also provides php-http
-- remove old directives from configuration file
-
-* Fri Oct 12 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.11.beta1
-- update to 2.0.0beta1
-- must be load after json, to rename config to z-http.ini
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-0.10.alpha1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Apr 21 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.9.alpha1
-- update to 2.0.0alpha1
-
-* Sat Mar 31 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.8.dev10
-- update to 2.0.0dev10
-
-* Fri Mar 16 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.7.dev8
-- update to 2.0.0dev8
-
-* Fri Mar 09 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.6.dev7
-- update to 2.0.0dev7
-
-* Fri Mar 02 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.5.dev6
-- update to 2.0.0dev6
-
-* Sat Feb 18 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.4.dev5
-- update to 2.0.0dev5
-- fix filters
-
-* Wed Jan 25 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.3.dev4
-- zts binary in /usr/bin with zts prefix
-
-* Mon Jan 23 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.2.dev4
-- update to 2.0.0dev4
-- fix missing file https://bugs.php.net/60839
-
-* Sun Jan 22 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-0.1.dev3
-- initial package
-
diff --git a/php-pecl-http.spec b/php-pecl-http.spec
index 02d9032..f96c2f3 100644
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@@ -1,4 +1,4 @@
-# spec file for php-pecl-http
+# remirepo/fedora spec file for php-pecl-http
 #
 # Copyright (c) 2012-2015 Remi Collet
 # License: CC-BY-SA
@@ -31,10 +31,10 @@
 %global with_tests %{?_without_tests:0}%{!?_without_tests:1}
 %endif
 
-#global prever RC1
+%global prever RC1
 Name:           %{?scl_prefix}php-pecl-http
-Version:        2.4.3
-Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version:        2.5.0
+Release:        0.1.%{prever}%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 Summary:        Extended HTTP support
 
 License:        BSD
@@ -45,14 +45,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
 
-# http://git.php.net/?p=pecl/http/pecl_http.git;a=blob_plain;f=tests/helper/upload.inc;hb=HEAD
-# See http://git.php.net/?p=pecl/http/pecl_http.git;a=commit;h=5c5ee386409f5b6d697c483edc788d09f8c8aeb3
-Source2:        upload.inc
-# http://git.php.net/?p=pecl/http/pecl_http.git;a=blob_plain;f=tests/querystring003.phpt;hb=HEAD
-Source3:        querystring003.phpt
-# http://git.php.net/?p=pecl/http/pecl_http.git;a=blob_plain;f=tests/bug69313.phpt;hb=HEAD
-Source4:        bug69313.phpt
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  %{?scl_prefix}php-devel >= 5.3.0
 BuildRequires:  %{?scl_prefix}php-hash
@@ -193,9 +185,6 @@ These are the files needed to compile programs using HTTP extension.
 mv %{proj_name}-%{version}%{?prever} NTS
 cd NTS
 
-cp %{SOURCE2} tests/helper/
-cp %{SOURCE3} %{SOURCE4} tests/
-
 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}.
@@ -263,12 +252,6 @@ done
 
 
 %check
-%if 0%{?fedora} == 20
-# ignore failed tests (timeout) with curl 7.32
-# see https://bugzilla.redhat.com/show_bug.cgi?id=1194603
-rm ?TS/tests/client{006,007,008,018,021}.phpt
-%endif
-
 %if "%{php_version}" < "5.4"
 # Known failed test with 5.3.3 (need investigations)
 export REPORT_EXIT_STATUS=0
@@ -365,6 +348,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri May 22 2015 Remi Collet <remi@fedoraproject.org> - 2.5.0-0.1.RC1
+- update to 2.5.0RC1 (beta)
+
 * Wed Apr 08 2015 Remi Collet <remi@fedoraproject.org> - 2.4.3-1
 - Update to 2.4.3
 
diff --git a/querystring003.phpt b/querystring003.phpt
deleted file mode 100644
index a504174..0000000
--- a/querystring003.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-querystring offset set
---SKIPIF--
-<?php
-include "skipif.inc";
-?>
---FILE--
-<?php
-
-echo "Test\n";
-
-$qs = new http\QueryString("foo=bar&bar=baz");
-echo $qs,"\n";
-$qs["foo"] = "baz";
-echo $qs,"\n";
-?>
-===DONE===
---EXPECT--
-Test
-foo=bar&bar=baz
-foo=baz&bar=baz
-===DONE===
diff --git a/upload.inc b/upload.inc
deleted file mode 100644
index 9502d2b..0000000
--- a/upload.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php 
-
-include "server.inc";
-
-serve(function($client) {
-	$request = new http\Message($client, false);
-	
-	if ($request->getHeader("Expect") === "100-continue") {
-		$response = new http\Env\Response;
-		$response->setEnvRequest($request);
-		$response->setResponseCode(100);
-		$response->send($client);
-	}
-	
-	/* return the initial message as response body */
-	$response = new http\Env\Response;
-	/* avoid OOM with $response->getBody()->append($request); */
-	$request->toStream($response->getBody()->getResource());
-	$response->send($client);
-});