prepare 3.1.0

diff --cc CHANGELOG.md
index 842851107b4b2fe7ca5ad1c3ebb492a7f4d47561,18e339f0a15ad9521137a08bb66ca29ad7d0e624..9e2d12dcf4dd92fa0c9c7b1e643f3881d2115860
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,6 -1,43 +1,42 @@@
 -# ChangeLog v2
 -
 -## 2.6.0, 2016-12-12
 +# ChangeLog v3
  
 -* Fixed PHP-5.3 compatibility
++## 3.1.0, 2016-12-12
+ 
+ + Added http\Client\Curl\User interface for userland event loops
+ + Added http\Url::IGNORE_ERRORS, http\Url::SILENT_ERRORS and http\Url::STDFLAGS
+ + Added http\Client::setDebug(callable $debug)
+ + Added http\Client\Curl\FEATURES constants and namespace
+ + Added http\Client\Curl\VERSIONS constants and namespace
+ + Added share_cookies and share_ssl (libcurl >= 7.23.0) options to http\Client::configure()
+ + http\Client uses curl_share handles to properly share cookies and SSL/TLS sessions between requests
+ + Improved configure checks for default CA bundles
+ + Improved negotiation precision
+ * Fixed regression introduced by http\Params::PARSE_RFC5987: negotiation using the params parser would receive param keys without the trailing asterisk, stripped by http\Params::PARSE_RFC5987.
+ * Fix gh-issue #50: http\Client::dequeue() within http\Client::setDebug() causes segfault (Mike, Maik Wagner)
+ * Fix gh-issue #47: http\Url: Null pointer deref in sanitize_value() (Mike, @rc0r)
+ * Fix gh-issue #45: HTTP/2 response message parsing broken with libcurl >= 7.49.1 (Mike)
+ * Fix gh-issue #43: Joining query with empty original variable in query (Mike, Sander Backus)
+ * Fix gh-issue #42: fatal error when using punycode in URLs (Mike, Sebastian Thielen)
+ * Fix gh-issue #41: Use curl_version_info_data.features when initializing options (Mike)
+ * Fix gh-issue #40: determinde the SSL backend used by curl at runtime (Mike, @rcanavan)
+ * Fix gh-issue #39: Notice: http\Client::enqueue(): Could not set option proxy_service_name (Mike, @rcanavan)
+ * Fix gh-issue #38: Persistent curl handles: error code not properly reset (Mike, @afflerbach)
+ * Fix gh-issue #36: Unexpected cookies sent if persistent_handle_id is used (Mike, @rcanavan, @afflerbach)
+ * Fix gh-issue #34: allow setting multiple headers with the same name (Mike, @rcanavan)
+ * Fix gh-issue #33: allow setting prodyhost request option to NULL (Mike, @rcanavan)
+ * Fix gh-issue #31: add/improve configure checks for default CA bundle/path (Mike, @rcanavan)
+ 
+ Changes from beta1:
 -
 -## 2.6.0RC1, 2016-10-04
+ * Fixed recursive calls to the event loop dispatcher
+ 
+ Changes from beta2:
+++ 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) (CVE-2016-7961)
+ * 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)
+ 
 +## 3.1.0RC1, 2016-10-04
  
  + Added http\Client\Curl\User interface for userland event loops
  + Added http\Url::IGNORE_ERRORS, http\Url::SILENT_ERRORS and http\Url::STDFLAGS

diff --cc package.xml
index 3f08039a819f6054e246494f83d24c4c21ae51ef,818eca91eee6895b7416eaee92279065d4040b9b..ee711ea4144a4bce02271e5d31dfe3c70c260f87
--- 1/package.xml
--- 2/package.xml
+++ b/package.xml
@@@ -31,13 -31,13 +31,13 @@@ https://mdref.m6w6.name/htt
    <email>mike@php.net</email>
    <active>yes</active>
   </lead>
-  <date>2016-10-04</date>
+  <date>2016-12-12</date>
   <version>
-   <release>3.1.0RC1</release>
 -  <release>2.6.0</release>
 -  <api>2.6.0</api>
++  <release>3.1.0</release>
 +  <api>3.1.0</api>
   </version>
   <stability>
-   <release>beta</release>
+   <release>stable</release>
    <api>stable</api>
   </stability>
   <license uri="http://copyfree.org/content/standard/licenses/2bsd/license.txt">BSD-2-Clause</license>
@@@ -70,11 -70,10 +70,11 @@@ Changes from beta1
  * Fixed recursive calls to the event loop dispatcher
  
  Changes from beta2:
 ++ 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 bug #73185: Buffer overflow in HTTP parse_hostinfo() (Mike, @rc0r) (CVE-2016-7961)
  * 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="/">

diff --cc php_http.h
index fedc4cdf2db84cb86a445d7742381ae993b888d7,5f52c3bc15e53eec6e9f69d34d27ebb1fe349080..eeb69e11615f1ab9bdcc80690fbc3e4b360a9e05
--- 1/php_http.h
--- 2/php_http.h
+++ b/php_http.h
@@@ -13,7 -13,7 +13,7 @@@
  #ifndef PHP_EXT_HTTP_H
  #define PHP_EXT_HTTP_H
  
- #define PHP_PECL_HTTP_VERSION "3.1.0RC1"
 -#define PHP_PECL_HTTP_VERSION "2.6.0"
++#define PHP_PECL_HTTP_VERSION "3.1.0"
  
  extern zend_module_entry http_module_entry;
  #define phpext_http_ptr &http_module_entry