X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=package.xml;h=3f08039a819f6054e246494f83d24c4c21ae51ef;hp=fe4e1b0280966f59893e51d7864857920835ff27;hb=b4175028c2a884d5aa0359c98901629c908c6cc0;hpb=0869caece2853a07711676bad8f032fa89ed82e9

diff --git a/package.xml b/package.xml
index fe4e1b0..3f08039 100644
--- a/package.xml
+++ b/package.xml
@@ -31,7 +31,7 @@ https://mdref.m6w6.name/http
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
- <date>2016-09-12</date>
+ <date>2016-10-04</date>
  <version>
   <release>3.1.0RC1</release>
   <api>3.1.0</api>
@@ -70,14 +70,19 @@ Changes from beta1:
 * Fixed recursive calls to the event loop dispatcher
 
 Changes from beta2:
-* Fix bug #73055: crash in http\QueryString (Mike, @rc0r)
++ Improved configure checks for IDNA libraries (added --with-http-libicu-dir, --with-http-libidnkit{,2}-dir, --with-http-libidn2-dir)
+* Fix bug #73055: crash in http\QueryString (Mike, @rc0r) (CVE-2016-7398)
+* Fix bug #73185: Buffer overflow in HTTP parse_hostinfo() (Mike, @rc0r)
 * Fix HTTP/2 version parser for older libcurl versions (Mike)
+* Fix gh-issue #52: Underscores in host names: libidn Failed to parse IDN (Mike, @canavan)
 ]]></notes>
  <contents>
   <dir name="/">
    <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="LICENSE"/>
    <file role="doc" name="README.md"/>
@@ -88,6 +93,14 @@ Changes from beta2:
    <file role="src" name="config.w32"/>
    <file role="src" name="Makefile.frag"/>
    <file role="src" name="php_http.h"/>
+   <dir name="autoconf">
+    <dir name="pecl">
+   	 <file role="src" name="pecl.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"/>
@@ -218,6 +231,7 @@ Changes from beta2:
      <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="clientrequest001.phpt"/>
      <file role="test" name="clientrequest002.phpt"/>
      <file role="test" name="clientrequest003.phpt"/>
@@ -281,6 +295,7 @@ Changes from beta2:
      <file role="test" name="filterchunked.phpt"/>
      <file role="test" name="filterzlib.phpt"/>
      <file role="test" name="gh-issue6.phpt"/>
+     <file role="test" name="gh-issue11.phpt"/>
      <file role="test" name="gh-issue12.phpt"/>
      <file role="test" name="gh-issue42.phpt"/>
      <file role="test" name="gh-issue47.phpt"/>
@@ -368,6 +383,8 @@ Changes from beta2:
      <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>
    <dir name="scripts">
@@ -420,10 +437,26 @@ Changes from beta2:
    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-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>