test build for upcoming 4.2.2

3 files changed, 72 insertions, 49 deletions

diff --git a/PHPINFO b/PHPINFO
index 2d339ef..8e241f0 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,13 +2,13 @@
 http
 
 HTTP Support => enabled
-Extension Version => 4.2.1
+Extension Version => 4.2.2
 
 Used Library => Compiled => Linked
 libz => 1.2.11 => 1.2.11
-libcurl => 7.71.1 => 7.71.1
-libevent => 2.1.8-stable => 2.1.8-stable
-libicu (IDNA2008/IDNA2003) => 67.1 => 67.1
+libcurl => 7.79.1 => 7.79.1
+libevent => 2.1.12-stable => 2.1.12-stable
+libicu (IDNA2008/IDNA2003) => 69.1 => 69.1
 libidn2 (IDNA2008) => disabled => disabled
 libidn (IDNA2003) => disabled => disabled
 libidnkit2 (IDNA2008) => disabled => disabled
diff --git a/REFLECTION b/REFLECTION
index 0c7013c..d70959f 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #84 http version 4.2.1 ] {
+Extension [ <persistent> extension #109 http version 4.2.2 ] {
 
   - Dependencies {
     Dependency [ raphf (Required) ]
@@ -11,8 +11,8 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
     }
   }
 
-  - Constants [83] {
-    Constant [ int http\Client\Curl\FEATURES ] { 12568477 }
+  - Constants [91] {
+    Constant [ int http\Client\Curl\FEATURES ] { 297781149 }
     Constant [ int http\Client\Curl\Features\IPV6 ] { 1 }
     Constant [ int http\Client\Curl\Features\KERBEROS4 ] { 2 }
     Constant [ int http\Client\Curl\Features\SSL ] { 4 }
@@ -36,18 +36,23 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
     Constant [ int http\Client\Curl\Features\BROTLI ] { 8388608 }
     Constant [ int http\Client\Curl\Features\ALTSVC ] { 16777216 }
     Constant [ int http\Client\Curl\Features\HTTP3 ] { 33554432 }
-    Constant [ string http\Client\Curl\VERSIONS ] { libcurl/7.71.1 OpenSSL/1.1.1k-fips zlib/1.2.11 brotli/1.0.9 libidn2/2.3.2 libpsl/0.21.1 (+libidn2/2.3.0) libssh/0.9.5/openssl/zlib nghttp2/1.43.0 }
-    Constant [ string http\Client\Curl\Versions\CURL ] { 7.71.1 }
-    Constant [ string http\Client\Curl\Versions\SSL ] { OpenSSL/1.1.1k-fips }
+    Constant [ int http\Client\Curl\Features\ZSTD ] { 67108864 }
+    Constant [ int http\Client\Curl\Features\UNICODE ] { 134217728 }
+    Constant [ int http\Client\Curl\Features\HSTS ] { 268435456 }
+    Constant [ string http\Client\Curl\VERSIONS ] { libcurl/7.79.1 OpenSSL/1.1.1l-fips zlib/1.2.11 brotli/1.0.9 libidn2/2.3.2 libpsl/0.21.1 (+libidn2/2.3.2) libssh/0.9.6/openssl/zlib nghttp2/1.45.1 OpenLDAP/2.4.59 }
+    Constant [ string http\Client\Curl\Versions\CURL ] { 7.79.1 }
+    Constant [ string http\Client\Curl\Versions\SSL ] { OpenSSL/1.1.1l-fips }
     Constant [ string http\Client\Curl\Versions\LIBZ ] { 1.2.11 }
     Constant [ null http\Client\Curl\Versions\ARES ] {  }
     Constant [ string http\Client\Curl\Versions\IDN ] { 2.3.2 }
     Constant [ null http\Client\Curl\Versions\ICONV ] {  }
     Constant [ string http\Client\Curl\Versions\BROTLI ] { 1.0.9 }
-    Constant [ string http\Client\Curl\Versions\NGHTTP2 ] { 1.43.0 }
+    Constant [ string http\Client\Curl\Versions\NGHTTP2 ] { 1.45.1 }
     Constant [ null http\Client\Curl\Versions\QUIC ] {  }
     Constant [ string http\Client\Curl\Versions\CAINFO ] { /etc/pki/tls/certs/ca-bundle.crt }
     Constant [ null http\Client\Curl\Versions\CAPATH ] {  }
+    Constant [ null http\Client\Curl\Versions\ZSTD ] {  }
+    Constant [ null http\Client\Curl\Versions\HYPER ] {  }
     Constant [ int http\Client\Curl\HTTP_VERSION_1_0 ] { 1 }
     Constant [ int http\Client\Curl\HTTP_VERSION_1_1 ] { 2 }
     Constant [ int http\Client\Curl\HTTP_VERSION_2_0 ] { 3 }
@@ -80,6 +85,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
     Constant [ int http\Client\Curl\AUTH_GSSNEG ] { 4 }
     Constant [ int http\Client\Curl\AUTH_SPNEGO ] { 4 }
     Constant [ int http\Client\Curl\AUTH_BEARER ] { 64 }
+    Constant [ int http\Client\Curl\AWS_SIGV4 ] { 128 }
     Constant [ int http\Client\Curl\AUTH_ANY ] { -17 }
     Constant [ int http\Client\Curl\PROXY_SOCKS4 ] { 4 }
     Constant [ int http\Client\Curl\PROXY_SOCKS4A ] { 6 }
@@ -95,6 +101,8 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
     Constant [ int http\Client\Curl\ALTSVC_H1 ] { 8 }
     Constant [ int http\Client\Curl\ALTSVC_H2 ] { 16 }
     Constant [ int http\Client\Curl\ALTSVC_H3 ] { 32 }
+    Constant [ int http\Client\Curl\HSTS_ENABLE ] { 1 }
+    Constant [ int http\Client\Curl\HSTS_READONLYFILE ] { 2 }
   }
 
   - Classes [33] {
@@ -116,7 +124,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Exception\RuntimeException extends RuntimeException implements Throwable, Stringable, http\Exception ] {
+    Class [ <internal:http> class http\Exception\RuntimeException extends RuntimeException implements Stringable, Throwable, http\Exception ] {
 
       - Constants [0] {
       }
@@ -207,7 +215,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Exception\UnexpectedValueException extends UnexpectedValueException implements Stringable, Throwable, http\Exception ] {
+    Class [ <internal:http> class http\Exception\UnexpectedValueException extends UnexpectedValueException implements Throwable, Stringable, http\Exception ] {
 
       - Constants [0] {
       }
@@ -298,7 +306,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Exception\BadMethodCallException extends BadMethodCallException implements Throwable, Stringable, http\Exception ] {
+    Class [ <internal:http> class http\Exception\BadMethodCallException extends BadMethodCallException implements Stringable, Throwable, http\Exception ] {
 
       - Constants [0] {
       }
@@ -389,7 +397,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Exception\InvalidArgumentException extends InvalidArgumentException implements Stringable, Throwable, http\Exception ] {
+    Class [ <internal:http> class http\Exception\InvalidArgumentException extends InvalidArgumentException implements Throwable, Stringable, http\Exception ] {
 
       - Constants [0] {
       }
@@ -480,7 +488,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Exception\BadHeaderException extends DomainException implements Stringable, Throwable, http\Exception ] {
+    Class [ <internal:http> class http\Exception\BadHeaderException extends DomainException implements Throwable, Stringable, http\Exception ] {
 
       - Constants [0] {
       }
@@ -571,7 +579,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Exception\BadUrlException extends DomainException implements Stringable, Throwable, http\Exception ] {
+    Class [ <internal:http> class http\Exception\BadUrlException extends DomainException implements Throwable, Stringable, http\Exception ] {
 
       - Constants [0] {
       }
@@ -662,7 +670,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Exception\BadMessageException extends DomainException implements Stringable, Throwable, http\Exception ] {
+    Class [ <internal:http> class http\Exception\BadMessageException extends DomainException implements Throwable, Stringable, http\Exception ] {
 
       - Constants [0] {
       }
@@ -753,7 +761,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Exception\BadConversionException extends DomainException implements Stringable, Throwable, http\Exception ] {
+    Class [ <internal:http> class http\Exception\BadConversionException extends DomainException implements Throwable, Stringable, http\Exception ] {
 
       - Constants [0] {
       }
@@ -844,7 +852,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Exception\BadQueryStringException extends DomainException implements Stringable, Throwable, http\Exception ] {
+    Class [ <internal:http> class http\Exception\BadQueryStringException extends DomainException implements Throwable, Stringable, http\Exception ] {
 
       - Constants [0] {
       }
@@ -935,7 +943,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Cookie ] {
+    Class [ <internal:http> class http\Cookie implements Stringable ] {
 
       - Constants [3] {
         Constant [ public int PARSE_RAW ] { 1 }
@@ -1125,10 +1133,11 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
           }
         }
 
-        Method [ <internal:http> public method __toString ] {
+        Method [ <internal:http, prototype Stringable> public method __toString ] {
 
           - Parameters [0] {
           }
+          - Return [ string ]
         }
       }
     }
@@ -1498,7 +1507,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Header implements Serializable ] {
+    Class [ <internal:http> class http\Header implements Stringable, Serializable ] {
 
       - Constants [5] {
         Constant [ public int MATCH_LOOSE ] { 0 }
@@ -1563,16 +1572,17 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
           }
         }
 
-        Method [ <internal:http> public method __toString ] {
+        Method [ <internal:http> public method toString ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:http> public method toString ] {
+        Method [ <internal:http, prototype Stringable> public method __toString ] {
 
           - Parameters [0] {
           }
+          - Return [ string ]
         }
 
         Method [ <internal:http> public method match ] {
@@ -1652,7 +1662,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> <iterateable> class http\Message implements Countable, Serializable, Iterator, Traversable ] {
+    Class [ <internal:http> <iterateable> class http\Message implements Stringable, Countable, Serializable, Iterator, Traversable ] {
 
       - Constants [3] {
         Constant [ public int TYPE_NONE ] { 0 }
@@ -1935,10 +1945,11 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
           }
         }
 
-        Method [ <internal:http> public method __toString ] {
+        Method [ <internal:http, prototype Stringable> public method __toString ] {
 
           - Parameters [0] {
           }
+          - Return [ string ]
         }
 
         Method [ <internal:http> public method detach ] {
@@ -2032,7 +2043,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Message\Body implements Serializable ] {
+    Class [ <internal:http> class http\Message\Body implements Stringable, Serializable ] {
 
       - Constants [0] {
       }
@@ -2054,7 +2065,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
           }
         }
 
-        Method [ <internal:http> public method __toString ] {
+        Method [ <internal:http, prototype Serializable> public method serialize ] {
 
           - Parameters [0] {
           }
@@ -2066,10 +2077,11 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
           }
         }
 
-        Method [ <internal:http, prototype Serializable> public method serialize ] {
+        Method [ <internal:http, prototype Stringable> public method __toString ] {
 
           - Parameters [0] {
           }
+          - Return [ string ]
         }
 
         Method [ <internal:http, prototype Serializable> public method unserialize ] {
@@ -2161,7 +2173,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> <iterateable> class http\QueryString implements Serializable, ArrayAccess, IteratorAggregate, Traversable ] {
+    Class [ <internal:http> <iterateable> class http\QueryString implements Stringable, Serializable, ArrayAccess, IteratorAggregate, Traversable ] {
 
       - Constants [6] {
         Constant [ public int TYPE_BOOL ] { 17 }
@@ -2208,10 +2220,11 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
           }
         }
 
-        Method [ <internal:http> public method __toString ] {
+        Method [ <internal:http, prototype Stringable> public method __toString ] {
 
           - Parameters [0] {
           }
+          - Return [ string ]
         }
 
         Method [ <internal:http> public method get ] {
@@ -2600,7 +2613,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> <iterateable> class http\Client\Request extends http\Message implements Traversable, Iterator, Serializable, Countable ] {
+    Class [ <internal:http> <iterateable> class http\Client\Request extends http\Message implements Traversable, Iterator, Serializable, Countable, Stringable ] {
 
       - Constants [3] {
         Constant [ public int TYPE_NONE ] { 0 }
@@ -2952,10 +2965,11 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
           }
         }
 
-        Method [ <internal:http, inherits http\Message> public method __toString ] {
+        Method [ <internal:http, inherits http\Message, prototype Stringable> public method __toString ] {
 
           - Parameters [0] {
           }
+          - Return [ string ]
         }
 
         Method [ <internal:http, inherits http\Message> public method detach ] {
@@ -2993,7 +3007,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> <iterateable> class http\Client\Response extends http\Message implements Traversable, Iterator, Serializable, Countable ] {
+    Class [ <internal:http> <iterateable> class http\Client\Response extends http\Message implements Traversable, Iterator, Serializable, Countable, Stringable ] {
 
       - Constants [3] {
         Constant [ public int TYPE_NONE ] { 0 }
@@ -3292,10 +3306,11 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
           }
         }
 
-        Method [ <internal:http, inherits http\Message> public method __toString ] {
+        Method [ <internal:http, inherits http\Message, prototype Stringable> public method __toString ] {
 
           - Parameters [0] {
           }
+          - Return [ string ]
         }
 
         Method [ <internal:http, inherits http\Message> public method detach ] {
@@ -3396,7 +3411,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Url ] {
+    Class [ <internal:http> class http\Url implements Stringable ] {
 
       - Constants [22] {
         Constant [ public int REPLACE ] { 0 }
@@ -3464,10 +3479,11 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
           }
         }
 
-        Method [ <internal:http> public method __toString ] {
+        Method [ <internal:http, prototype Stringable> public method __toString ] {
 
           - Parameters [0] {
           }
+          - Return [ string ]
         }
 
         Method [ <internal:http> public method toArray ] {
@@ -3478,7 +3494,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Env\Url extends http\Url ] {
+    Class [ <internal:http> class http\Env\Url extends http\Url implements Stringable ] {
 
       - Constants [22] {
         Constant [ public int REPLACE ] { 0 }
@@ -3546,10 +3562,11 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
           }
         }
 
-        Method [ <internal:http, inherits http\Url> public method __toString ] {
+        Method [ <internal:http, inherits http\Url, prototype Stringable> public method __toString ] {
 
           - Parameters [0] {
           }
+          - Return [ string ]
         }
 
         Method [ <internal:http, inherits http\Url> public method toArray ] {
@@ -3682,7 +3699,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> <iterateable> class http\Env\Request extends http\Message implements Traversable, Iterator, Serializable, Countable ] {
+    Class [ <internal:http> <iterateable> class http\Env\Request extends http\Message implements Traversable, Iterator, Serializable, Countable, Stringable ] {
 
       - Constants [3] {
         Constant [ public int TYPE_NONE ] { 0 }
@@ -4003,10 +4020,11 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
           }
         }
 
-        Method [ <internal:http, inherits http\Message> public method __toString ] {
+        Method [ <internal:http, inherits http\Message, prototype Stringable> public method __toString ] {
 
           - Parameters [0] {
           }
+          - Return [ string ]
         }
 
         Method [ <internal:http, inherits http\Message> public method detach ] {
@@ -4044,7 +4062,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> <iterateable> class http\Env\Response extends http\Message implements Traversable, Iterator, Serializable, Countable ] {
+    Class [ <internal:http> <iterateable> class http\Env\Response extends http\Message implements Traversable, Iterator, Serializable, Countable, Stringable ] {
 
       - Constants [8] {
         Constant [ public int TYPE_NONE ] { 0 }
@@ -4433,10 +4451,11 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
           }
         }
 
-        Method [ <internal:http, inherits http\Message> public method __toString ] {
+        Method [ <internal:http, inherits http\Message, prototype Stringable> public method __toString ] {
 
           - Parameters [0] {
           }
+          - Return [ string ]
         }
 
         Method [ <internal:http, inherits http\Message> public method detach ] {
@@ -4474,7 +4493,7 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
       }
     }
 
-    Class [ <internal:http> class http\Params implements ArrayAccess ] {
+    Class [ <internal:http> class http\Params implements Stringable, ArrayAccess ] {
 
       - Constants [12] {
         Constant [ public string DEF_PARAM_SEP ] { , }
@@ -4529,10 +4548,11 @@ Extension [ <persistent> extension #84 http version 4.2.1 ] {
           }
         }
 
-        Method [ <internal:http> public method __toString ] {
+        Method [ <internal:http, prototype Stringable> public method __toString ] {
 
           - Parameters [0] {
           }
+          - Return [ string ]
         }
 
         Method [ <internal:http, prototype ArrayAccess> public method offsetExists ] {
diff --git a/php-pecl-http.spec b/php-pecl-http.spec
index bd55478..75a9d51 100644
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@@ -3,7 +3,7 @@
 #
 # Fedora spec file for php-pecl-http
 #
-# Copyright (c) 2012-2021 Remi Collet
+# Copyright (c) 2012-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -36,7 +36,7 @@
 %bcond_without    tests
 %endif
 
-%global upstream_version 4.2.1
+%global upstream_version 4.2.2
 #global upstream_prever  beta1
 #global upstream_lower   beta1
 
@@ -46,7 +46,7 @@ Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
 Release:        0.9.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
 %else
-Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        0%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:        https://pecl.php.net/get/%{proj_name}-%{upstream_version}%{?upstream_prever}.tgz
 %endif
 Summary:        Extended HTTP support
@@ -335,6 +335,9 @@ fi
 
 
 %changelog
+* Mon Feb 21 2022 Remi Collet <remi@remirepo.net> - 4.2.2-0
+- test build for upcoming 4.2.2
+
 * Wed Sep 29 2021 Remi Collet <remi@remirepo.net> - 1.11.0~alpha1-2
 - rebuild using ICU 69