- fix behaviour of http_build_url() when second parameter is NULL

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index 7927648221c52a624dd977ca0095a6342a795dd3..1455eef04202703f06224bf93285394504abbc3a 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -257,7 +257,7 @@ PHP_MSHUTDOWN_FUNCTION(http_request)
        }
 #define HTTP_CURL_OPT_STRING_EX(keyname, optname, obdc) \
        if (!strcasecmp(key, keyname)) { \
-               zval *copy = http_request_option_cache(request, keyname, zval_copy(IS_STRING, *param)); \
+               zval *copy = http_request_option_cache_ex(request, keyname, strlen(keyname)+1, 0, zval_copy(IS_STRING, *param)); \
                if (obdc) { \
                        HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(copy), return FAILURE); \
                } \
@@ -272,7 +272,7 @@ PHP_MSHUTDOWN_FUNCTION(http_request)
        }
 #define HTTP_CURL_OPT_LONG_EX(keyname, optname) \
        if (!strcasecmp(key, keyname)) { \
-               zval *copy = http_request_option_cache(request, keyname, zval_copy(IS_LONG, *param)); \
+               zval *copy = http_request_option_cache_ex(request, keyname, strlen(keyname)+1, 0, zval_copy(IS_LONG, *param)); \
                HTTP_CURL_OPT(optname, Z_LVAL_P(copy)); \
                key = NULL; \
                continue; \
@@ -557,17 +557,17 @@ 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)) {
+                       if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void *) &prs)) {
                                zend_hash_move_forward(Z_ARRVAL_P(zoption));
-                               if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &pre)) {
+                               if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void *) &pre)) {
                                        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)) {
                                                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);
@@ -629,9 +629,9 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                FOREACH_VAL(pos1, zoption, rr) {
                        if (Z_TYPE_PP(rr) == IS_ARRAY) {
                                zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(rr), &pos2);
-                               if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(rr), (void **) &rb, &pos2)) {
+                               if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(rr), (void *) &rb, &pos2)) {
                                        zend_hash_move_forward_ex(Z_ARRVAL_PP(rr), &pos2);
-                                       if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(rr), (void **) &re, &pos2)) {
+                                       if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(rr), (void *) &re, &pos2)) {
                                                if (    ((Z_TYPE_PP(rb) == IS_LONG) || ((Z_TYPE_PP(rb) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(rb), Z_STRLEN_PP(rb), NULL, NULL, 1))) &&
                                                                ((Z_TYPE_PP(re) == IS_LONG) || ((Z_TYPE_PP(re) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(re), Z_STRLEN_PP(re), NULL, NULL, 1)))) {
                                                        zval *rbl = zval_copy(IS_LONG, *rb), *rel = zval_copy(IS_LONG, *re);
@@ -673,7 +673,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                FOREACH_KEY(pos, zoption, header_key, header_idx) {
                        if (header_key) {
                                zval **header_val;
-                               if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &header_val, &pos)) {
+                               if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void *) &header_val, &pos)) {
                                        char header[1024] = {0};
                                        
                                        ZVAL_ADDREF(*header_val);
@@ -741,7 +741,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                                FOREACH_KEY(pos, zoption, cookie_key, cookie_idx) {
                                        if (cookie_key) {
                                                zval **cookie_val;
-                                               if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &cookie_val, &pos)) {
+                                               if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void *) &cookie_val, &pos)) {
                                                        zval *val = zval_copy(IS_STRING, *cookie_val);
                                                        phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key, Z_STRVAL_P(val));
                                                        zval_free(&val);
@@ -971,7 +971,7 @@ static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *ct
                                size_t out = MIN(len * n, request->body->size - request->body->priv);
                                
                                if (out) {
-                                       memcpy(data, request->body->data + request->body->priv, out);
+                                       memcpy(data, ((char *) request->body->data) + request->body->priv, out);
                                        request->body->priv += out;
                                        return out;
                                }
@@ -1004,7 +1004,9 @@ static int http_curl_progress_callback(void *ctx, double dltotal, double dlnow,
        add_assoc_double(param, "ultotal", ultotal);
        add_assoc_double(param, "ulnow", ulnow);
        
-       call_user_function(EG(function_table), NULL, request->_progress_callback, &retval, 1, &param TSRMLS_CC);
+       with_error_handling(EH_NORMAL, NULL) {
+               call_user_function(EG(function_table), NULL, request->_progress_callback, &retval, 1, &param TSRMLS_CC);
+       } end_error_handling();
        
        zval_ptr_dtor(&param);
        zval_dtor(&retval);
@@ -1105,9 +1107,9 @@ static inline zval *_http_request_option_ex(http_request *r, HashTable *options,
        
        if (!options || 
 #ifdef ZEND_ENGINE_2
-                       (SUCCESS != zend_hash_quick_find(options, key, keylen, h, (void **) &zoption))
+                       (SUCCESS != zend_hash_quick_find(options, key, keylen, h, (void *) &zoption))
 #else
-                       (SUCCESS != zend_hash_find(options, key, keylen, (void **) &zoption))
+                       (SUCCESS != zend_hash_find(options, key, keylen, (void *) &zoption))
 #endif
        ) {
                return NULL;