2.0.0 stable

diff --git a/ThanksTo.txt b/ThanksTo.txt
index 48003f9e661c35401ab69a98a8373777e1a2bb2b..67c5b32de76687a0c9d8cf23ba14d055f65e826f 100644 (file)
--- a/ThanksTo.txt
+++ b/ThanksTo.txt
@@ -8,6 +8,7 @@ to implement, in alphabetical order:
        Ilia Alshanetsky (ilia at php dot net)
        Anatol Belski (ab at php dot net)
        Petr Czaderna (petr at hroch dot info)
+       Remi Collet (remi at php dot net)
        Benjamin Eberlei (kontakt at beberlei dot de)
        David James (james82 at gmail dot com)
        Thomas Landro Johnsen (thomas dot l dot johnsen at gmail dot com)

diff --git a/package.xml b/package.xml
index 5467a8310d0a09482c0b3f59f3255f50bd61de60..c12796c336e47ebadb6c068805e474eb969e4a9a 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -19,8 +19,17 @@ 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, if built with CURL 
-support. Parallel requests are available for PHP 5 and greater.
+It provides powerful request functionality with support for
+parallel requests.
+
+Documentation:
+v1: http://php.net/http
+v2: http://devel-m6w6.rhcloud.com/mdref/http
+
+Code Coverage:
+v1: http://dev.iworks.at/ext-http/lcov_html/ext/http/
+v2: http://dev.iworks.at/ext-http/lcov/ext/http/
+
 ]]></description>
  <lead>
   <name>Michael Wallner</name>
@@ -28,30 +37,26 @@ support. Parallel requests are available for PHP 5 and greater.
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
- <date>2013-08-12</date>
+ <date>2013-11-22</date>
  <version>
-  <release>2.0.0RC1</release>
+  <release>2.0.0</release>
   <api>2.0.0</api>
  </version>
  <stability>
-  <release>beta</release>
-  <api>beta</api>
+  <release>stable</release>
+  <api>stable</api>
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-Extended HTTP support. Again. Keep in mind that it's got the major version 2, because it's incompatible with pecl_http v1.
-
-Documentation:
-http://devel-m6w6.rhcloud.com/mdref/http
-
-Code Coverage:
-http://dev.iworks.at/ext-http/lcov/ext/http/
-
+Extended HTTP support. Again. 
+        
+Keep in mind that it's got the major version 2, because it's incompatible with pecl_http v1.
 ]]></notes>
  <contents>
   <dir name="/">
    <file role="doc" name="LICENSE"/>
    <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="src" name="config.m4"/>
@@ -240,13 +245,13 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
    <package>
     <name>raphf</name>
     <channel>pecl.php.net</channel>
-    <min>0.1.0</min>
+    <min>1.0.0</min>
     <providesextension>raphf</providesextension>
    </package>
    <package>
     <name>propro</name>
     <channel>pecl.php.net</channel>
-    <min>0.1.0</min>
+    <min>1.0.0</min>
     <providesextension>propro</providesextension>
    </package>
   </required>
@@ -273,11 +278,6 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
    name="with-http-libevent-dir"
    prompt="where to find libevent"
    default="/usr" />
-  <filelist>
-   <!-- install as="http.ini" name="docs/http.ini"/>
-   <install as="examples/tutorial.txt" name="docs/examples/tutorial.txt"/>
-   <install as="pecl/http/.php" name="lib/.php"/ -->
-  </filelist>
  </extsrcrelease>
  <changelog />
 </package>

diff --git a/php_http.c b/php_http.c
index 2ed94c8e1bf78cdf231445735a29ec05ffc64d70..4efec72d613f6667c0594411aa6204028e3a8009 100644 (file)
--- a/php_http.c
+++ b/php_http.c
@@ -73,7 +73,7 @@ zend_module_entry http_module_entry = {
        PHP_RINIT(http),
        PHP_RSHUTDOWN(http),
        PHP_MINFO(http),
-       PHP_HTTP_EXT_VERSION,
+       PHP_PECL_HTTP_VERSION,
        STANDARD_MODULE_PROPERTIES
 };
 
@@ -217,7 +217,7 @@ PHP_MINFO_FUNCTION(http)
 
        php_info_print_table_start();
        php_info_print_table_header(2, "HTTP Support", "enabled");
-       php_info_print_table_row(2, "Extension Version", PHP_HTTP_EXT_VERSION);
+       php_info_print_table_row(2, "Extension Version", PHP_PECL_HTTP_VERSION);
        php_info_print_table_end();
        
        php_info_print_table_start();

diff --git a/php_http.h b/php_http.h
index 8e341ca1d77df8d06e4c76b8cad21fd74527d817..6daa20428f91946870c4b8dddb21f041e907daf5 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -13,7 +13,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_HTTP_EXT_VERSION "2.0.0dev"
+#define PHP_PECL_HTTP_VERSION "2.0.0"
 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index fbb950ac276eb4a059a4494746601dea236c3fa1..3200fa2cad21bc901f2e65d1f7924807f2dc476a 100644 (file)
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -1089,7 +1089,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
        /* useragent */
        if ((opt = php_http_option_register(registry, ZEND_STRL("useragent"), CURLOPT_USERAGENT, IS_STRING))) {
                /* don't check strlen, to allow sending no useragent at all */
-               ZVAL_STRING(&opt->defval, "PECL::HTTP/" PHP_HTTP_EXT_VERSION " (PHP/" PHP_VERSION ")", 0);
+               ZVAL_STRING(&opt->defval, "PECL::HTTP/" PHP_PECL_HTTP_VERSION " (PHP/" PHP_VERSION ")", 0);
        }
 
        /* resume */