Config.w32 chack for both instances of event.h

[m6w6/ext-http] / package.xml

diff --git a/package.xml b/package.xml
index e2541da06ff62f833b60244c8f13b9b8d9c441fc..866ba0cdb9b1097a85b95f9a445e239451ea35f5 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="UTF-8" ?>

 <package version="2.0" xmlns="http://pear.php.net/dtd/package-2.0"
  xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 <package version="2.0" xmlns="http://pear.php.net/dtd/package-2.0"
  xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"


@@ -11,12 +11,12 @@
  <channel>pecl.php.net</channel>
  <summary>Extended HTTP Support</summary>
  <description><![CDATA[
  <channel>pecl.php.net</channel>
  <summary>Extended HTTP Support</summary>
  <description><![CDATA[

-This HTTP extension aims to provide a convenient and powerful 
+This HTTP extension aims to provide a convenient and powerful

 set of functionality for one of PHPs major applications.
 
 set of functionality for one of PHPs major applications.
 

-It eases handling of HTTP urls, headers and messages, provides 
-means for negotiation of a client's preferred content type, 
-language and charset, as well as a convenient way to send any 
+It eases handling of HTTP urls, headers and messages, provides
+means for negotiation of a client's preferred content type,
+language and charset, as well as a convenient way to send any

 arbitrary data with caching and resuming capabilities.
 
 It provides powerful request functionality with support for
 arbitrary data with caching and resuming capabilities.
 
 It provides powerful request functionality with support for


@@ -24,10 +24,6 @@ parallel requests.
 
 Documentation:
 https://mdref.m6w6.name/http
 
 Documentation:
 https://mdref.m6w6.name/http

-
-Code Coverage:
-http://dev.iworks.at/ext-http/lcov/ext/http/
-

 ]]></description>
  <lead>
   <name>Michael Wallner</name>
 ]]></description>
  <lead>
   <name>Michael Wallner</name>


@@ -35,96 +31,119 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>

- <date>2015-09-10</date>
+ <date>2019-10-29</date>

  <version>
  <version>

-  <release>2.5.3dev</release>
-  <api>2.5.0</api>
+  <release>3.2.3</release>
+  <api>3.2.0</api>

  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>

- <license>BSD, revised</license>
+ <license uri="http://copyfree.org/content/standard/licenses/2bsd/license.txt">BSD-2-Clause</license>

  <notes><![CDATA[
  <notes><![CDATA[

-* Fixed gh-issue #12: crash on bad url passed to http\Message::setRequestUrl()
-* URL parser now fails on empty labels 
+  * Fixed Windows build (Jan Ehrhardt)

 ]]></notes>
  <contents>
   <dir name="/">
 ]]></notes>
  <contents>
   <dir name="/">

-   <file role="doc" name="LICENSE"/>
+   <file role="doc" name="AUTHORS"/>
+   <file role="doc" name="BUGS"/>
+   <file role="doc" name="CHANGELOG.md"/>
+   <file role="doc" name="CONTRIBUTING.md"/>
+   <file role="doc" name="CVE.md"/>

    <file role="doc" name="CREDITS"/>
    <file role="doc" name="CREDITS"/>

-   <file role="doc" name="Exceptions.txt"/>
-   <file role="doc" name="KnownIssues.txt"/>
-   <file role="doc" name="ThanksTo.txt"/>
+   <file role="doc" name="LICENSE"/>
+   <file role="doc" name="README.md"/>
+   <file role="doc" name="THANKS"/>
+   <file role="doc" name="TODO"/>

    <file role="src" name="config.m4"/>
    <file role="src" name="config9.m4"/>
    <file role="src" name="config.w32"/>
    <file role="src" name="config.m4"/>
    <file role="src" name="config9.m4"/>
    <file role="src" name="config.w32"/>

-   
-   <file role="src" name="php_http_api.h"/>
-   <file role="src" name="php_http_buffer.c"/>
-   <file role="src" name="php_http_buffer.h"/>
-   <file role="src" name="php_http.c"/>
-   <file role="src" name="php_http_client.c"/>
-   <file role="src" name="php_http_client.h"/>
-   <file role="src" name="php_http_client_curl.c"/>
-   <file role="src" name="php_http_client_curl.h"/>
-   <file role="src" name="php_http_client_request.c"/>
-   <file role="src" name="php_http_client_request.h"/>
-   <file role="src" name="php_http_client_response.c"/>
-   <file role="src" name="php_http_client_response.h"/>
-   <file role="src" name="php_http_cookie.c"/>
-   <file role="src" name="php_http_cookie.h"/>
-   <file role="src" name="php_http_curl.c"/>
-   <file role="src" name="php_http_curl.h"/>
-   <file role="src" name="php_http_encoding.c"/>
-   <file role="src" name="php_http_encoding.h"/>
-   <file role="src" name="php_http_env.c"/>
-   <file role="src" name="php_http_env.h"/>
-   <file role="src" name="php_http_env_request.c"/>
-   <file role="src" name="php_http_env_request.h"/>
-   <file role="src" name="php_http_env_response.c"/>
-   <file role="src" name="php_http_env_response.h"/>
-   <file role="src" name="php_http_etag.c"/>
-   <file role="src" name="php_http_etag.h"/>
-   <file role="src" name="php_http_exception.c"/>
-   <file role="src" name="php_http_exception.h"/>
-   <file role="src" name="php_http_filter.c"/>
-   <file role="src" name="php_http_filter.h"/>
+   <file role="src" name="Makefile.frag"/>

    <file role="src" name="php_http.h"/>
    <file role="src" name="php_http.h"/>

-   <file role="src" name="php_http_header_parser.c"/>
-   <file role="src" name="php_http_header_parser.h"/>
-   <file role="src" name="php_http_header.c"/>
-   <file role="src" name="php_http_header.h"/>
-   <file role="src" name="php_http_info.c"/>
-   <file role="src" name="php_http_info.h"/>
-   <file role="src" name="php_http_message_body.c"/>
-   <file role="src" name="php_http_message_body.h"/>
-   <file role="src" name="php_http_message.c"/>
-   <file role="src" name="php_http_message.h"/>
-   <file role="src" name="php_http_message_parser.c"/>
-   <file role="src" name="php_http_message_parser.h"/>
-   <file role="src" name="php_http_misc.c"/>
-   <file role="src" name="php_http_misc.h"/>
-   <file role="src" name="php_http_negotiate.c"/>
-   <file role="src" name="php_http_negotiate.h"/>
-   <file role="src" name="php_http_object.c"/>
-   <file role="src" name="php_http_object.h"/>
-   <file role="src" name="php_http_options.c"/>
-   <file role="src" name="php_http_options.h"/>
-   <file role="src" name="php_http_params.c"/>
-   <file role="src" name="php_http_params.h"/>
-   <file role="src" name="php_http_querystring.c"/>
-   <file role="src" name="php_http_querystring.h"/>
-   <file role="src" name="php_http_response_codes.h"/>
-   <file role="src" name="php_http_url.c"/>
-   <file role="src" name="php_http_url.h"/>
-   <file role="src" name="php_http_utf8.h"/>
-   <file role="src" name="php_http_version.c"/>
-   <file role="src" name="php_http_version.h"/>
-
+   <dir name="autoconf">
+    <dir name="pecl">
+        <file role="src" name="pecl.m4"/>
+        <file role="src" name="libbrotli.m4"/>
+        <file role="src" name="libcurl.m4"/>
+        <file role="src" name="libevent.m4"/>
+        <file role="src" name="zlib.m4"/>
+    </dir>
+   </dir>
+   <dir name="src">
+    <file role="src" name="php_http_api.h"/>
+    <file role="src" name="php_http_buffer.c"/>
+    <file role="src" name="php_http_buffer.h"/>
+    <file role="src" name="php_http.c"/>
+    <file role="src" name="php_http_client.c"/>
+    <file role="src" name="php_http_client.h"/>
+    <file role="src" name="php_http_client_curl.c"/>
+    <file role="src" name="php_http_client_curl.h"/>
+    <file role="src" name="php_http_client_curl_event.c"/>
+    <file role="src" name="php_http_client_curl_event.h"/>
+    <file role="src" name="php_http_client_curl_user.c"/>
+    <file role="src" name="php_http_client_curl_user.h"/>
+    <file role="src" name="php_http_client_request.c"/>
+    <file role="src" name="php_http_client_request.h"/>
+    <file role="src" name="php_http_client_response.c"/>
+    <file role="src" name="php_http_client_response.h"/>
+    <file role="src" name="php_http_cookie.c"/>
+    <file role="src" name="php_http_cookie.h"/>
+    <file role="src" name="php_http_curl.c"/>
+    <file role="src" name="php_http_curl.h"/>
+    <file role="src" name="php_http_encoding.c"/>
+    <file role="src" name="php_http_encoding.h"/>
+    <file role="src" name="php_http_encoding_zlib.c"/>
+    <file role="src" name="php_http_encoding_zlib.h"/>
+    <file role="src" name="php_http_encoding_brotli.c"/>
+    <file role="src" name="php_http_encoding_brotli.h"/>
+    <file role="src" name="php_http_env.c"/>
+    <file role="src" name="php_http_env.h"/>
+    <file role="src" name="php_http_env_request.c"/>
+    <file role="src" name="php_http_env_request.h"/>
+    <file role="src" name="php_http_env_response.c"/>
+    <file role="src" name="php_http_env_response.h"/>
+    <file role="src" name="php_http_etag.c"/>
+    <file role="src" name="php_http_etag.h"/>
+    <file role="src" name="php_http_exception.c"/>
+    <file role="src" name="php_http_exception.h"/>
+    <file role="src" name="php_http_filter.c"/>
+    <file role="src" name="php_http_filter.h"/>
+    <file role="src" name="php_http_header_parser.c"/>
+    <file role="src" name="php_http_header_parser.h"/>
+    <file role="src" name="php_http_header.c"/>
+    <file role="src" name="php_http_header.h"/>
+    <file role="src" name="php_http_info.c"/>
+    <file role="src" name="php_http_info.h"/>
+    <file role="src" name="php_http_message_body.c"/>
+    <file role="src" name="php_http_message_body.h"/>
+    <file role="src" name="php_http_message.c"/>
+    <file role="src" name="php_http_message.h"/>
+    <file role="src" name="php_http_message_parser.c"/>
+    <file role="src" name="php_http_message_parser.h"/>
+    <file role="src" name="php_http_misc.c"/>
+    <file role="src" name="php_http_misc.h"/>
+    <file role="src" name="php_http_negotiate.c"/>
+    <file role="src" name="php_http_negotiate.h"/>
+    <file role="src" name="php_http_object.c"/>
+    <file role="src" name="php_http_object.h"/>
+    <file role="src" name="php_http_options.c"/>
+    <file role="src" name="php_http_options.h"/>
+    <file role="src" name="php_http_params.c"/>
+    <file role="src" name="php_http_params.h"/>
+    <file role="src" name="php_http_querystring.c"/>
+    <file role="src" name="php_http_querystring.h"/>
+    <file role="src" name="php_http_response_codes.h"/>
+    <file role="src" name="php_http_url.c"/>
+    <file role="src" name="php_http_url.h"/>
+    <file role="src" name="php_http_utf8.h"/>
+    <file role="src" name="php_http_version.c"/>
+    <file role="src" name="php_http_version.h"/>
+   </dir>

    <dir name="tests">
     <file role="test" name="skipif.inc"/>
      <dir name="data">
    <dir name="tests">
     <file role="test" name="skipif.inc"/>
      <dir name="data">

+      <file role="test" name="bug71719.bin"/>

       <file role="test" name="message_r_content_range.txt"/>
       <file role="test" name="message_r_multipart_put.txt"/>
       <file role="test" name="message_rr_empty.txt"/>
       <file role="test" name="message_r_content_range.txt"/>
       <file role="test" name="message_r_multipart_put.txt"/>
       <file role="test" name="message_rr_empty.txt"/>


@@ -135,7 +154,10 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
      </dir>
      <dir name="helper">
       <file role="test" name="cookie.inc"/>
      </dir>
      <dir name="helper">
       <file role="test" name="cookie.inc"/>

+      <file role="test" name="cookie1.inc"/>
+      <file role="test" name="cookie2.inc"/>

       <file role="test" name="dump.inc"/>
       <file role="test" name="dump.inc"/>

+      <file role="test" name="env.inc"/>

       <file role="test" name="http2.crt"/>
       <file role="test" name="http2.key"/>
       <file role="test" name="pipeline.inc"/>
       <file role="test" name="http2.crt"/>
       <file role="test" name="http2.key"/>
       <file role="test" name="pipeline.inc"/>


@@ -154,6 +176,8 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
      <file role="test" name="bug69076.phpt"/>
      <file role="test" name="bug69313.phpt"/>
      <file role="test" name="bug69357.phpt"/>
      <file role="test" name="bug69076.phpt"/>
      <file role="test" name="bug69313.phpt"/>
      <file role="test" name="bug69357.phpt"/>

+     <file role="test" name="bug71719.phpt"/>
+     <file role="test" name="bug73055.phpt"/>

      <file role="test" name="client001.phpt"/>
      <file role="test" name="client002.phpt"/>
      <file role="test" name="client003.phpt"/>
      <file role="test" name="client001.phpt"/>
      <file role="test" name="client002.phpt"/>
      <file role="test" name="client003.phpt"/>


@@ -180,6 +204,12 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
      <file role="test" name="client024.phpt"/>
      <file role="test" name="client025.phpt"/>
      <file role="test" name="client026.phpt"/>
      <file role="test" name="client024.phpt"/>
      <file role="test" name="client025.phpt"/>
      <file role="test" name="client026.phpt"/>

+     <file role="test" name="client027.phpt"/>
+     <file role="test" name="client028.phpt"/>
+     <file role="test" name="client029.phpt"/>
+     <file role="test" name="client030.phpt"/>
+     <file role="test" name="client031.phpt"/>
+     <file role="test" name="client032.phpt"/>

      <file role="test" name="clientrequest001.phpt"/>
      <file role="test" name="clientrequest002.phpt"/>
      <file role="test" name="clientrequest003.phpt"/>
      <file role="test" name="clientrequest001.phpt"/>
      <file role="test" name="clientrequest002.phpt"/>
      <file role="test" name="clientrequest003.phpt"/>


@@ -208,6 +238,11 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
      <file role="test" name="encstream007.phpt"/>
      <file role="test" name="encstream008.phpt"/>
      <file role="test" name="encstream009.phpt"/>
      <file role="test" name="encstream007.phpt"/>
      <file role="test" name="encstream008.phpt"/>
      <file role="test" name="encstream009.phpt"/>

+     <file role="test" name="encstream015.phpt"/>
+     <file role="test" name="encstream016.phpt"/>
+     <file role="test" name="encstream017.phpt"/>
+     <file role="test" name="encstream018.phpt"/>
+     <file role="test" name="encstream019.phpt"/>

      <file role="test" name="envrequestbody001.phpt"/>
      <file role="test" name="envrequestcookie001.phpt"/>
      <file role="test" name="envrequestfiles001.phpt"/>
      <file role="test" name="envrequestbody001.phpt"/>
      <file role="test" name="envrequestcookie001.phpt"/>
      <file role="test" name="envrequestfiles001.phpt"/>


@@ -240,11 +275,17 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
      <file role="test" name="envresponseheader001.phpt"/>
      <file role="test" name="envresponseranges001.phpt"/>
      <file role="test" name="etag001.phpt"/>
      <file role="test" name="envresponseheader001.phpt"/>
      <file role="test" name="envresponseranges001.phpt"/>
      <file role="test" name="etag001.phpt"/>

+     <file role="test" name="filterbrotli.phpt"/>

      <file role="test" name="filterchunked.phpt"/>
      <file role="test" name="filterzlib.phpt"/>
      <file role="test" name="gh-issue6.phpt"/>
      <file role="test" name="filterchunked.phpt"/>
      <file role="test" name="filterzlib.phpt"/>
      <file role="test" name="gh-issue6.phpt"/>

-     <file role="test" name="gh-issue7.phpt"/>
+     <file role="test" name="gh-issue11.phpt"/>

      <file role="test" name="gh-issue12.phpt"/>
      <file role="test" name="gh-issue12.phpt"/>

+     <file role="test" name="gh-issue42.phpt"/>
+     <file role="test" name="gh-issue47.phpt"/>
+     <file role="test" name="gh-issue48.phpt"/>
+     <file role="test" name="gh-issue50.phpt"/>
+     <file role="test" name="gh-issue63.phpt"/>

      <file role="test" name="header001.phpt"/>
      <file role="test" name="header002.phpt"/>
      <file role="test" name="header003.phpt"/>
      <file role="test" name="header001.phpt"/>
      <file role="test" name="header002.phpt"/>
      <file role="test" name="header003.phpt"/>


@@ -308,6 +349,7 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
      <file role="test" name="phpinfo.phpt"/>
      <file role="test" name="propertyproxy001.phpt"/>
      <file role="test" name="querystring001.phpt"/>
      <file role="test" name="phpinfo.phpt"/>
      <file role="test" name="propertyproxy001.phpt"/>
      <file role="test" name="querystring001.phpt"/>

+     <file role="test" name="querystring001_a.phpt"/>

      <file role="test" name="querystring002.phpt"/>
      <file role="test" name="querystring003.phpt"/>
      <file role="test" name="serialize001.phpt"/>
      <file role="test" name="querystring002.phpt"/>
      <file role="test" name="querystring003.phpt"/>
      <file role="test" name="serialize001.phpt"/>


@@ -327,16 +369,24 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
      <file role="test" name="urlparser009.phpt"/>
      <file role="test" name="urlparser010.phpt"/>
      <file role="test" name="urlparser011.phpt"/>
      <file role="test" name="urlparser009.phpt"/>
      <file role="test" name="urlparser010.phpt"/>
      <file role="test" name="urlparser011.phpt"/>

+     <file role="test" name="urlparser012.phpt"/>
+     <file role="test" name="urlparser013.phpt"/>

      <file role="test" name="version001.phpt"/>
    </dir>
      <file role="test" name="version001.phpt"/>
    </dir>

+   <dir name="scripts">
+    <file role="src" name="bench_select_vs_event.php"/>
+    <file role="src" name="check_package-xml.php"/>
+    <file role="src" name="gen_curlinfo.php"/>
+    <file role="src" name="gen_stubs.php"/>
+    <file role="src" name="gen_travis_yml.php"/>
+    <file role="src" name="gen_utf8.php"/>
+   </dir>

   </dir>
  </contents>
  <dependencies>
   <required>
    <php>
   </dir>
  </contents>
  <dependencies>
   <required>
    <php>

-    <min>5.3.0</min>
-    <max>7.0.0</max>
-       <exclude>7.0.0</exclude>
+    <min>7.0.0</min>

    </php>
    <pearinstaller>
     <min>1.4.1</min>
    </php>
    <pearinstaller>
     <min>1.4.1</min>


@@ -344,13 +394,13 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
    <package>
     <name>raphf</name>
     <channel>pecl.php.net</channel>
    <package>
     <name>raphf</name>
     <channel>pecl.php.net</channel>

-    <min>1.1.0</min>
+    <min>2.0.0dev</min>

     <providesextension>raphf</providesextension>
    </package>
    <package>
     <name>propro</name>
     <channel>pecl.php.net</channel>
     <providesextension>raphf</providesextension>
    </package>
    <package>
     <name>propro</name>
     <channel>pecl.php.net</channel>

-    <min>1.0.0</min>
+    <min>2.0.0dev</min>

     <providesextension>propro</providesextension>
    </package>
   </required>
     <providesextension>propro</providesextension>
    </package>
   </required>


@@ -373,10 +423,26 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
    name="with-http-libevent-dir"
    prompt="where to find libevent"
    default="/usr" />
    name="with-http-libevent-dir"
    prompt="where to find libevent"
    default="/usr" />

+  <configureoption
+   name="with-http-libicu-dir"
+   prompt="where to find libicu"
+   default="/usr" />
+  <configureoption
+   name="with-http-libidn2-dir"
+   prompt="where to find libidn2"
+   default="/usr" />

   <configureoption
    name="with-http-libidn-dir"
    prompt="where to find libidn"
    default="/usr" />
   <configureoption
    name="with-http-libidn-dir"
    prompt="where to find libidn"
    default="/usr" />

+  <configureoption
+   name="with-http-libidnkit2-dir"
+   prompt="where to find libidnkit2"
+   default="/usr" />
+  <configureoption
+   name="with-http-libidnkit-dir"
+   prompt="where to find libidnkit"
+   default="/usr" />

   </extsrcrelease>
  <changelog />
 </package>
   </extsrcrelease>
  <changelog />
 </package>