- add missing constants to HttpDeflateStream

[m6w6/ext-http] / http_url_api.c

diff --git a/http_url_api.c b/http_url_api.c
index 575c4f57a856b63f42a06623f9ec7944b609101e..2fde306a74154dee0f3ecdedb6b2fd08967b80ea 100644 (file)
--- a/http_url_api.c
+++ b/http_url_api.c
@@ -27,8 +27,6 @@
 #include "php_http_api.h"
 #include "php_http_url_api.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 PHP_HTTP_API char *_http_absolute_url(const char *url TSRMLS_DC)
 {
        char *abs = estrdup(url);
@@ -39,6 +37,8 @@ PHP_HTTP_API char *_http_absolute_url(const char *url TSRMLS_DC)
        if (purl) {
                http_build_url(purl, NULL, NULL, &abs, NULL);
                php_url_free(purl);
+       } else {
+               http_error_ex(HE_WARNING, HTTP_E_URL, "Could not parse URL (%s)", url);
        }
        
        return abs;
@@ -299,7 +299,13 @@ PHP_HTTP_API STATUS _http_urlencode_hash_recursive(HashTable *ht, phpstr *str, c
                                return FAILURE;
                        }
                } else {
-                       zval *cpy, *val = convert_to_type_ex(IS_STRING, *data, &cpy);
+                       zval *val;
+                       
+                       ALLOC_ZVAL(val);
+                       *val = **data;
+                       INIT_PZVAL(val);
+                       zval_copy_ctor(val);
+                       convert_to_string(val);
                        
                        if (PHPSTR_LEN(str)) {
                                phpstr_append(str, arg_sep, arg_sep_len);
@@ -307,7 +313,7 @@ PHP_HTTP_API STATUS _http_urlencode_hash_recursive(HashTable *ht, phpstr *str, c
                        phpstr_append(str, PHPSTR_VAL(&new_prefix), PHPSTR_LEN(&new_prefix));
                        phpstr_appends(str, "=");
                        
-                       if (Z_STRLEN_P(val)) {
+                       if (Z_STRLEN_P(val) && Z_STRVAL_P(val)) {
                                char *encoded_val;
                                int encoded_len;
                                
@@ -316,11 +322,8 @@ PHP_HTTP_API STATUS _http_urlencode_hash_recursive(HashTable *ht, phpstr *str, c
                                efree(encoded_val);
                        }
                        
-                       if (cpy) {
-                               zval_ptr_dtor(&cpy);
-                       }
+                       zval_ptr_dtor(&val);
                }
-               
                phpstr_dtor(&new_prefix);
        }
        return SUCCESS;