- 1.5.0RC1

diff --git a/docs/http.ini b/docs/http.ini
index f2b2f30f80bdbf5fa2a30e5da6e6b9e6f4ec754b..a7ab0f6ac675206272ed9a53e3392c3af1e8477e 100644 (file)
--- a/docs/http.ini
+++ b/docs/http.ini
@@ -53,3 +53,6 @@
 ; global HttpRequestDataShare settings
 ;http.request.datashare.cookie = 0
 ;http.request.datashare.dns = 1
 ; global HttpRequestDataShare settings
 ;http.request.datashare.cookie = 0
 ;http.request.datashare.dns = 1

+
+; default ident of persistent handles
+;http.persistent.handles.ident = "GLOBAL"

diff --git a/http_functions.c b/http_functions.c
index 791aa1e6d0d6d9fe68ea3dbce2792576f84a5da6..4ddbda1685d1616fb0dedeb51e45e5e422f92f35 100644 (file)
--- a/http_functions.c
+++ b/http_functions.c
@@ -830,7 +830,7 @@ PHP_FUNCTION(http_persistent_handles_clean)
 }
 /* }}} */
 
 }
 /* }}} */
 

-/* {{{ proto string http_persistent_handles_ident(string ident) */
+/* {{{ proto string http_persistent_handles_ident([string ident]) */

 PHP_FUNCTION(http_persistent_handles_ident)
 {
        char *ident_str = NULL;
 PHP_FUNCTION(http_persistent_handles_ident)
 {
        char *ident_str = NULL;

diff --git a/package.xml b/package.xml
index 530e41a41c73839dcab84aa9b997cedc07b3a1ac..0f559aa28dd39a94c4df8e7b75e1d75cabb8615d 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -23,11 +23,15 @@ support. Parallel requests are available for PHP 5 and greater.
   </maintainer>
   </maintainers>
  <release>
   </maintainer>
   </maintainers>
  <release>

-  <version>1.4.0</version>
-  <date>2007-01-23</date>
+  <version>1.5.0RC1</version>
+  <date>2007-02-08</date>

   <license>BSD, revised</license>
   <license>BSD, revised</license>

-  <state>stable</state>
-  <notes>* Allow response codes up to 599 in HttpMessage::setResponseCode()
+  <state>beta</state>
+  <notes>+ Added HttpMessage::fromEnv(int type[, string class_name = &quot;HttpMessage&quot;]) (Clay Loveless)
++ Added support for per process persistent cURL handles (requested by Clay Loveless):
+  o Added --enable-http-persistent-handles configure option
+  o Added http_persistent_handles_count(), http_persistent_handles_clean([string name]), http_persistent_handles_ident([string ident])
+  o Added http.persistent.handles.ident INI setting

   </notes>
   <deps>
    <dep type="php" rel="ge" version="4.3"/>
   </notes>
   <deps>
    <dep type="php" rel="ge" version="4.3"/>


@@ -38,6 +42,7 @@ support. Parallel requests are available for PHP 5 and greater.
    <configureoption name="with-http-zlib-compression" default="yes" prompt="whether to enable support for gzencoded/deflated message bodies; specify zlib directory"/>
    <configureoption name="with-http-magic-mime" default="no" prompt="whether to enable response content type guessing; specify libmagic directory"/>
    <configureoption name="with-http-shared-deps" default="yes" prompt="whether to depend on extensions which have been built shared"/>
    <configureoption name="with-http-zlib-compression" default="yes" prompt="whether to enable support for gzencoded/deflated message bodies; specify zlib directory"/>
    <configureoption name="with-http-magic-mime" default="no" prompt="whether to enable response content type guessing; specify libmagic directory"/>
    <configureoption name="with-http-shared-deps" default="yes" prompt="whether to depend on extensions which have been built shared"/>

+   <configureoption name="enable-http-persistent-handles" default="no" prompt="whether to enable per-process persistent cURL handles"/>

   </configureoptions>
   <filelist>
    <dir name="docs">
   </configureoptions>
   <filelist>
    <dir name="docs">


@@ -133,6 +138,7 @@ support. Parallel requests are available for PHP 5 and greater.
     <file role="test" name="parse_message_004.phpt"/>
     <file role="test" name="parse_message_005.phpt"/>
     <file role="test" name="parse_params_001.phpt"/>
     <file role="test" name="parse_message_004.phpt"/>
     <file role="test" name="parse_message_005.phpt"/>
     <file role="test" name="parse_params_001.phpt"/>

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

     <file role="test" name="redirect_011.phpt"/>
     <file role="test" name="redirect_011_logging.phpt"/>
     <file role="test" name="redirect_012.phpt"/>
     <file role="test" name="redirect_011.phpt"/>
     <file role="test" name="redirect_011_logging.phpt"/>
     <file role="test" name="redirect_012.phpt"/>


@@ -188,6 +194,7 @@ support. Parallel requests are available for PHP 5 and greater.
    <file role="src" name="http_info_api.c"/>
    <file role="src" name="http_message_api.c"/>
    <file role="src" name="http_message_object.c"/>
    <file role="src" name="http_info_api.c"/>
    <file role="src" name="http_message_api.c"/>
    <file role="src" name="http_message_object.c"/>

+   <file role="src" name="http_persistent_handle_api.c"/>

    <file role="src" name="http_querystring_api.c"/>
    <file role="src" name="http_querystring_object.c"/>
    <file role="src" name="http_requestdatashare_object.c"/>
    <file role="src" name="http_querystring_api.c"/>
    <file role="src" name="http_querystring_object.c"/>
    <file role="src" name="http_requestdatashare_object.c"/>


@@ -222,6 +229,7 @@ support. Parallel requests are available for PHP 5 and greater.
    <file role="src" name="php_http_info_api.h"/>
    <file role="src" name="php_http_message_api.h"/>
    <file role="src" name="php_http_message_object.h"/>
    <file role="src" name="php_http_info_api.h"/>
    <file role="src" name="php_http_message_api.h"/>
    <file role="src" name="php_http_message_object.h"/>

+   <file role="src" name="php_http_persistent_handle_api.h"/>

    <file role="src" name="php_http_querystring_api.h"/>
    <file role="src" name="php_http_querystring_object.h"/>
    <file role="src" name="php_http_requestdatashare_object.h"/>
    <file role="src" name="php_http_querystring_api.h"/>
    <file role="src" name="php_http_querystring_object.h"/>
    <file role="src" name="php_http_requestdatashare_object.h"/>

diff --git a/package2.xml b/package2.xml
index 82714db72d35c82e456bfb984c3ecd3ac8f9b7dc..466a759ac5ea2a9bf7657bf551dbde2222376570 100644 (file)
--- a/package2.xml
+++ b/package2.xml
@@ -28,9 +28,9 @@ support. Parallel requests are available for PHP 5 and greater.
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>

- <date>2007-01-23</date>
+ <date>2007-02-08</date>

  <version>
  <version>

-  <release>1.5.0dev</release>
+  <release>1.5.0RC1</release>

   <api>1.5.0</api>
  </version>
  <stability>
   <api>1.5.0</api>
  </version>
  <stability>


@@ -40,8 +40,10 @@ support. Parallel requests are available for PHP 5 and greater.
  <license>BSD, revised</license>
  <notes><![CDATA[
 + Added HttpMessage::fromEnv(int type[, string class_name = "HttpMessage"]) (Clay Loveless)
  <license>BSD, revised</license>
  <notes><![CDATA[
 + Added HttpMessage::fromEnv(int type[, string class_name = "HttpMessage"]) (Clay Loveless)

-+ Added --enable-http-persistent-handles (per-process persistent cURL handles) (Clay Loveless)
-+ Added http_persistent_handles_count(), http_persistent_handles_clean([string name]), http_persistent_handles_ident([string ident])
++ Added support for per process persistent cURL handles (requested by Clay Loveless):
+  o Added --enable-http-persistent-handles configure option
+  o Added http_persistent_handles_count(), http_persistent_handles_clean([string name]), http_persistent_handles_ident([string ident])
+  o Added http.persistent.handles.ident INI setting

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


@@ -77,7 +79,7 @@ support. Parallel requests are available for PHP 5 and greater.
    <file role="src" name="php_http_headers_api.h"/>
    <file role="src" name="php_http_info_api.h"/>
    <file role="src" name="php_http_message_api.h"/>
    <file role="src" name="php_http_headers_api.h"/>
    <file role="src" name="php_http_info_api.h"/>
    <file role="src" name="php_http_message_api.h"/>

-   <file role="src" name="php_http_persistent_handles_api.h"/>
+   <file role="src" name="php_http_persistent_handle_api.h"/>

    <file role="src" name="php_http_querystring_api.h"/>
    <file role="src" name="php_http_request_api.h"/>
    <file role="src" name="php_http_request_int.h"/>
    <file role="src" name="php_http_querystring_api.h"/>
    <file role="src" name="php_http_request_api.h"/>
    <file role="src" name="php_http_request_int.h"/>


@@ -109,7 +111,7 @@ support. Parallel requests are available for PHP 5 and greater.
    <file role="src" name="http_headers_api.c"/>
    <file role="src" name="http_info_api.c"/>
    <file role="src" name="http_message_api.c"/>
    <file role="src" name="http_headers_api.c"/>
    <file role="src" name="http_info_api.c"/>
    <file role="src" name="http_message_api.c"/>

-   <file role="src" name="http_persistent_handles_api.c"/>
+   <file role="src" name="http_persistent_handle_api.c"/>

    <file role="src" name="http_querystring_api.c"/>
    <file role="src" name="http_request_api.c"/>
    <file role="src" name="http_request_info.c"/>
    <file role="src" name="http_querystring_api.c"/>
    <file role="src" name="http_request_api.c"/>
    <file role="src" name="http_request_info.c"/>


@@ -216,6 +218,7 @@ support. Parallel requests are available for PHP 5 and greater.
     <file role="test" name="parse_message_004.phpt"/>
     <file role="test" name="parse_message_005.phpt"/>
     <file role="test" name="parse_params_001.phpt"/>
     <file role="test" name="parse_message_004.phpt"/>
     <file role="test" name="parse_message_005.phpt"/>
     <file role="test" name="parse_params_001.phpt"/>

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

     <file role="test" name="redirect_011_logging.phpt"/>
     <file role="test" name="redirect_011.phpt"/>
     <file role="test" name="redirect_012_logging.phpt"/>
     <file role="test" name="redirect_011_logging.phpt"/>
     <file role="test" name="redirect_011.phpt"/>
     <file role="test" name="redirect_012_logging.phpt"/>

diff --git a/php_http.h b/php_http.h
index 62cb1bc2cea794265fec9376a98493f29c9187d4..005498b35bdf28adb0f44a8ded6bb7af9f96f4ec 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -15,7 +15,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 

-#define PHP_EXT_HTTP_VERSION "1.5.0dev"
+#define PHP_EXT_HTTP_VERSION "1.5.0RC1"

 
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 
 #ifdef HAVE_CONFIG_H
 #      include "config.h"

diff --git a/php_http_persistent_handle_api.h b/php_http_persistent_handle_api.h
index 7461b426b8e8f3fb80b28aeda440f5937e03ba8e..fc5507c648e45f6a8289af030770e1403a003502 100644 (file)
--- a/php_http_persistent_handle_api.h
+++ b/php_http_persistent_handle_api.h
@@ -44,3 +44,12 @@ PHP_HTTP_API STATUS _http_persistent_handle_release_ex(const char *name_str, siz
 
 #endif /* HTTP_HAVE_PERSISTENT_HANDLES */
 #endif /* HTTP_PERSISTENT_HANDLE_H */
 
 #endif /* HTTP_HAVE_PERSISTENT_HANDLES */
 #endif /* HTTP_PERSISTENT_HANDLE_H */

+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */