* Fixed Bug #7192: Build against libcurl >= 7.15.2 fails

diff --git a/http_request_api.c b/http_request_api.c
index 922f7a9e986bf389b7f36e658bf6db08fb8eced2..6d21d9b7107e0e33e02179822552e816870ddf65 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -557,7 +557,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                
 #if HTTP_CURL_VERSION(7,15,2)
                if ((zoption = http_request_option(request, options, "portrange", IS_ARRAY))) {
-                       zval *prs, *pre;
+                       zval **prs, **pre;
                        
                        zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
                        if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &prs)) {
@@ -566,8 +566,9 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                                        zval *prs_cpy = zval_copy(IS_LONG, *prs), *pre_cpy = zval_copy(IS_LONG, *pre);
                                        
                                        if (Z_LVAL_P(prs_cpy) && Z_LVAL_P(pre_cpy)) {
+                                               fprintf(stderr, "Using portrange: %ld-%ld\n", Z_LVAL_P(prs_cpy), Z_LVAL_P(pre_cpy));
                                                HTTP_CURL_OPT(CURLOPT_LOCALPORT, MIN(Z_LVAL_P(prs_cpy), Z_LVAL_P(pre_cpy)));
-                                               HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, ABS(Z_LVAL_P(prs_cpy)-Z_LVAL_P(pre_cpy))+1L);
+                                               HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, labs(Z_LVAL_P(prs_cpy)-Z_LVAL_P(pre_cpy))+1L);
                                        }
                                        zval_free(&prs_cpy);
                                        zval_free(&pre_cpy);

diff --git a/package2.xml b/package2.xml
index 3fba4a9007ad3e7c3d42c5e269a3732c8db757d8..cc99e7d72e15b0a285f95f6ef73c360422746eb3 100644 (file)
--- a/package2.xml
+++ b/package2.xml
@@ -37,7 +37,7 @@ HttpResponse
  </lead>
  <date>2006-00-00</date>
  <version>
-  <release>1.0.0RC1</release>
+  <release>1.0.0RC2</release>
   <api>1.0.0</api>
  </version>
  <stability>
@@ -46,11 +46,7 @@ HttpResponse
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-* Fixed possible crash in HttpQueryString if the SAPI does not have a treat_data function registered.
-* Fixed http_build_str() to urlencode square brackets ("[]").
-* Fixed HttpQueryString::xlate()
-* Fixed builds where include/php/ext/iconv does not have php_have_*.h files
-* Fixed PHP-4 build.
+* Fixed Bug #7192: Build against libcurl >= 7.15.2 fails
 ]]></notes>
  <contents>
   <dir name="/">

diff --git a/php_http.h b/php_http.h
index 2782a7328b9bfd5845fc6dc1c8624eea7dfa65c9..7244c85c5dd3199303baadd30191d2bb6f0f0c0e 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 "1.0.0RC1"
+#define PHP_EXT_HTTP_VERSION "1.0.0RC2-dev"
 
 #ifdef HAVE_CONFIG_H
 #      include "config.h"