php-pecl-http: 2.6.0beta2

3 files changed, 123 insertions, 16 deletions

diff --git a/REFLECTION b/REFLECTION
index 905830e..66e5a6c 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #197 http version 2.5.6 ] {
+Extension [ <persistent> extension #65 http version 2.6.0beta2 ] {
 
   - Dependencies {
     Dependency [ raphf (Required) ]
@@ -14,7 +14,29 @@ Extension [ <persistent> extension #197 http version 2.5.6 ] {
     }
   }
 
-  - Constants [31] {
+  - Constants [53] {
+    Constant [ integer http\Client\Curl\FEATURES ] { 1017757 }
+    Constant [ integer http\Client\Curl\Features\IPV6 ] { 1 }
+    Constant [ integer http\Client\Curl\Features\KERBEROS4 ] { 2 }
+    Constant [ integer http\Client\Curl\Features\KERBEROS5 ] { 262144 }
+    Constant [ integer http\Client\Curl\Features\SSL ] { 4 }
+    Constant [ integer http\Client\Curl\Features\LIBZ ] { 8 }
+    Constant [ integer http\Client\Curl\Features\NTLM ] { 16 }
+    Constant [ integer http\Client\Curl\Features\GSSNEGOTIATE ] { 32 }
+    Constant [ integer http\Client\Curl\Features\ASYNCHDNS ] { 128 }
+    Constant [ integer http\Client\Curl\Features\SPNEGO ] { 256 }
+    Constant [ integer http\Client\Curl\Features\LARGEFILE ] { 512 }
+    Constant [ integer http\Client\Curl\Features\IDN ] { 1024 }
+    Constant [ integer http\Client\Curl\Features\SSPI ] { 2048 }
+    Constant [ integer http\Client\Curl\Features\GSSAPI ] { 131072 }
+    Constant [ integer http\Client\Curl\Features\TLSAUTH_SRP ] { 16384 }
+    Constant [ integer http\Client\Curl\Features\NTLM_WB ] { 32768 }
+    Constant [ integer http\Client\Curl\Features\HTTP2 ] { 65536 }
+    Constant [ integer http\Client\Curl\Features\UNIX_SOCKETS ] { 524288 }
+    Constant [ string http\Client\Curl\VERSIONS ] { libcurl/7.43.0 NSS/3.25 zlib/1.2.8 libidn/1.33 libssh2/1.6.0 nghttp2/1.7.1 }
+    Constant [ string http\Client\Curl\Versions\CURL ] { 7.43.0 }
+    Constant [ string http\Client\Curl\Versions\SSL ] { NSS/3.25 }
+    Constant [ string http\Client\Curl\Versions\LIBZ ] { 1.2.8 }
     Constant [ integer http\Client\Curl\HTTP_VERSION_1_0 ] { 1 }
     Constant [ integer http\Client\Curl\HTTP_VERSION_1_1 ] { 2 }
     Constant [ integer http\Client\Curl\HTTP_VERSION_2_0 ] { 3 }
@@ -48,7 +70,7 @@ Extension [ <persistent> extension #197 http version 2.5.6 ] {
     Constant [ integer http\Client\Curl\POSTREDIR_ALL ] { 7 }
   }
 
-  - Classes [29] {
+  - Classes [30] {
     Interface [ <internal:http> interface http\Exception ] {
 
       - Constants [0] {
@@ -1826,7 +1848,13 @@ Extension [ <persistent> extension #197 http version 2.5.6 ] {
 
     Class [ <internal:http> class http\Client implements SplSubject, Countable ] {
 
-      - Constants [0] {
+      - Constants [6] {
+        Constant [ integer DEBUG_INFO ] { 0 }
+        Constant [ integer DEBUG_IN ] { 1 }
+        Constant [ integer DEBUG_OUT ] { 2 }
+        Constant [ integer DEBUG_HEADER ] { 16 }
+        Constant [ integer DEBUG_BODY ] { 32 }
+        Constant [ integer DEBUG_SSL ] { 64 }
       }
 
       - Static properties [0] {
@@ -1847,7 +1875,7 @@ Extension [ <persistent> extension #197 http version 2.5.6 ] {
         Property [ <default> public $recordHistory ]
       }
 
-      - Methods [30] {
+      - Methods [31] {
         Method [ <internal:http, ctor> public method __construct ] {
 
           - Parameters [2] {
@@ -2049,6 +2077,13 @@ Extension [ <persistent> extension #197 http version 2.5.6 ] {
           - Parameters [0] {
           }
         }
+
+        Method [ <internal:http> public method setDebug ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $callback ]
+          }
+        }
       }
     }
 
@@ -2755,9 +2790,72 @@ Extension [ <persistent> extension #197 http version 2.5.6 ] {
       }
     }
 
+    Interface [ <internal:http> interface http\Client\Curl\User ] {
+
+      - Constants [5] {
+        Constant [ integer POLL_NONE ] { 0 }
+        Constant [ integer POLL_IN ] { 1 }
+        Constant [ integer POLL_OUT ] { 2 }
+        Constant [ integer POLL_INOUT ] { 3 }
+        Constant [ integer POLL_REMOVE ] { 4 }
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [6] {
+        Method [ <internal:http> abstract public method init ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $run ]
+          }
+        }
+
+        Method [ <internal:http> abstract public method timer ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $timeout_ms ]
+          }
+        }
+
+        Method [ <internal:http> abstract public method socket ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> $socket ]
+            Parameter #1 [ <required> $action ]
+          }
+        }
+
+        Method [ <internal:http> abstract public method once ] {
+
+          - Parameters [0] {
+          }
+        }
+
+        Method [ <internal:http> abstract public method wait ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <optional> $timeout_ms ]
+          }
+        }
+
+        Method [ <internal:http> abstract public method send ] {
+
+          - Parameters [0] {
+          }
+        }
+      }
+    }
+
     Class [ <internal:http> class http\Url ] {
 
-      - Constants [17] {
+      - Constants [20] {
         Constant [ integer REPLACE ] { 0 }
         Constant [ integer JOIN_PATH ] { 1 }
         Constant [ integer JOIN_QUERY ] { 2 }
@@ -2775,6 +2873,9 @@ Extension [ <persistent> extension #197 http version 2.5.6 ] {
         Constant [ integer PARSE_MBUTF8 ] { 131072 }
         Constant [ integer PARSE_TOIDN ] { 1048576 }
         Constant [ integer PARSE_TOPCT ] { 2097152 }
+        Constant [ integer IGNORE_ERRORS ] { 268435456 }
+        Constant [ integer SILENT_ERRORS ] { 536870912 }
+        Constant [ integer STDFLAGS ] { 3350531 }
       }
 
       - Static properties [0] {
diff --git a/php-pecl-http-php7.spec b/php-pecl-http-php7.spec
index 6d2f671..5a43b40 100644
--- a/php-pecl-http-php7.spec
+++ b/php-pecl-http-php7.spec
@@ -170,8 +170,10 @@ Obsoletes:     %{?scl_prefix}php-pecl-http1-devel < 2
 # Can't install both versions of the same extension
 Conflicts:     %{?scl_prefix}php-pecl-http1-devel
 %endif
+%if "%{?scl_prefix}" != "%{?sub_prefix}"
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel          = %{version}%{?prever}
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel%{?_isa}  = %{version}%{?prever}
+%endif
 
 %description devel
 These are the files needed to compile programs using HTTP extension.
diff --git a/php-pecl-http.spec b/php-pecl-http.spec
index a6523cb..3e0402c 100644
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@@ -15,15 +15,16 @@
 %else
 %global sub_prefix %{scl_prefix}
 %endif
+%scl_package       php-pecl-http
+%else
+%global _root_prefix %{_prefix}
 %endif
 
-%{?scl:          %scl_package         php-pecl-http}
-%{!?scl:         %global _root_prefix %{_prefix}}
-
+%global prever    beta2
 # 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}
+%global with_zts  0%{!?_without_zts:%{?__ztsphp:1}}
 %if "%{php_version}" < "5.6"
 # after hash iconv propro raphf
 %global ini_name  z-%{pecl_name}.ini
@@ -40,8 +41,8 @@
 
 #global prever RC1
 Name:           %{?sub_prefix}php-pecl-http
-Version:        2.5.6
-Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:        2.6.0
+Release:        0.1.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Summary:        Extended HTTP support
 
 License:        BSD
@@ -110,8 +111,10 @@ Provides:       %{?scl_prefix}php-pecl(%{proj_name})         = %{version}%{?prev
 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}
+%if "%{?scl_prefix}" != "%{?sub_prefix}"
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}%{?prever}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}%{?prever}
+%endif
 Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}%{?prever}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}%{?prever}
 
@@ -129,10 +132,6 @@ Obsoletes:     php55w-pecl-http <= %{version}
 Obsoletes:     php56u-pecl-http <= %{version}
 Obsoletes:     php56w-pecl-http <= %{version}
 %endif
-%if "%{php_version}" > "7.0"
-Obsoletes:     php70u-pecl-http <= %{version}
-Obsoletes:     php70w-pecl-http <= %{version}
-%endif
 %endif
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -177,8 +176,10 @@ Obsoletes:     %{?scl_prefix}php-pecl-http1-devel < 2
 # Can't install both versions of the same extension
 Conflicts:     %{?scl_prefix}php-pecl-http1-devel
 %endif
+%if "%{?scl_prefix}" != "%{?sub_prefix}"
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel          = %{version}%{?prever}
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}-devel%{?_isa}  = %{version}%{?prever}
+%endif
 
 %description devel
 These are the files needed to compile programs using HTTP extension.
@@ -362,6 +363,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep  7 2016 Remi Collet <remi@fedoraproject.org> - 2.6.0-0.1.beta2
+- Update to 2.6.0beta2 (php 5, beta)
+
 * Wed Mar  9 2016 Remi Collet <remi@fedoraproject.org> - 2.5.6-1
 - Update to 2.5.6 (php 5, stable)