- version bump

- prevent possible crash if sapi_module.treat_data is not set

diff --git a/http_querystring_object.c b/http_querystring_object.c
index d7d3000937fddf9f72b5ba74f1e2c53a3b189311..1238781a26aa0f5b20bdd4d83762638b3e80fdad 100644 (file)
--- a/http_querystring_object.c
+++ b/http_querystring_object.c
@@ -338,7 +338,9 @@ PHP_METHOD(HttpQueryString, __construct)
        zval *params = NULL, *qarray = NULL, *qstring = NULL, **_GET, **_SERVER, **QUERY_STRING;
        
        SET_EH_THROW_HTTP();
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bz", &global, &params)) {
+       if (!sapi_module.treat_data) {
+               http_error(HE_ERROR, HTTP_E_QUERYSTRING, "The SAPI does not have a treat_data function registered");
+       } else if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bz", &global, &params)) {
                if (global) {
                        if (    (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &_SERVER)) &&
                                        (Z_TYPE_PP(_SERVER) == IS_ARRAY) &&

diff --git a/package2.xml b/package2.xml
index 5edcb1779cd9a00aab9d2e18365bf98878d63a1e..499d7904a5923107d4c7c70409a6c8bdc4a144b5 100644 (file)
--- a/package2.xml
+++ b/package2.xml
@@ -37,8 +37,8 @@ HttpResponse
  </lead>
  <date>2006-00-00</date>
  <version>
-  <release>0.25.0</release>
-  <api>0.25.0</api>
+  <release>1.0.0RC</release>
+  <api>1.0.0RC</api>
  </version>
  <stability>
   <release>beta</release>
@@ -46,16 +46,7 @@ HttpResponse
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-* Fixed bug #6924 (Linking fails on Mac OSX).
-* Fixed HttpRequest::addRawPostData().
-
-- Renamed HttpQueryString::getInstance() to more commonly used ::singleton().
-- Renamed HttpQueryString::iconv() to more generic ::xlate().
-
-+ Added feature request http_put_data() and HttpRequest::(set|get|add)PutData().
-+ Added 'range' request option.
-+ Added 'proxytype' request option.
-+ Added HTTP_PROXY_HTTP, HTTP_PROXY_SOCKS4, HTTP_PROXY_SOCKS5 constants.
+* Fixed possible crash in HttpQueryString if the SAPI does not have a treat_data function registered.
 ]]></notes>
  <contents>
   <dir name="/">

diff --git a/php_http.h b/php_http.h
index 9516a7cd90bed319866760d141f4063227edb7e9..2782a7328b9bfd5845fc6dc1c8624eea7dfa65c9 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -15,7 +15,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_EXT_HTTP_VERSION "0.25.0"
+#define PHP_EXT_HTTP_VERSION "1.0.0RC1"
 
 #ifdef HAVE_CONFIG_H
 #      include "config.h"