From: Michael Wallner Date: Sat, 29 Apr 2006 18:54:46 +0000 (+0000) Subject: - fix behaviour of http_build_url() when second parameter is NULL X-Git-Tag: RELEASE_1_0_0~32 X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=4e2ecc5ed84649ce20fd1f11319626e0b1befa0a;ds=sidebyside - fix behaviour of http_build_url() when second parameter is NULL --- diff --git a/http_functions.c b/http_functions.c index c7b2dbf..aa8e51b 100644 --- a/http_functions.c +++ b/http_functions.c @@ -112,13 +112,13 @@ PHP_FUNCTION(http_build_url) zval *z_old_url = NULL, *z_new_url = NULL, *z_composed_url = NULL; php_url *old_url = NULL, *new_url = NULL, *composed_url = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z/z/lz", &z_old_url, &z_new_url, &flags, &z_composed_url) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!/z!/lz", &z_old_url, &z_new_url, &flags, &z_composed_url) != SUCCESS) { RETURN_FALSE; } if (z_new_url) { if (Z_TYPE_P(z_new_url) == IS_ARRAY || Z_TYPE_P(z_new_url) == IS_OBJECT) { - new_url = array2url(HASH_OF(z_new_url)); + new_url = http_url_from_struct(NULL, HASH_OF(z_new_url)); } else { convert_to_string(z_new_url); if (!(new_url = php_url_parse_ex(Z_STRVAL_P(z_new_url), Z_STRLEN_P(z_new_url)))) { @@ -130,7 +130,7 @@ PHP_FUNCTION(http_build_url) if (z_old_url) { if (Z_TYPE_P(z_old_url) == IS_ARRAY || Z_TYPE_P(z_old_url) == IS_OBJECT) { - old_url = array2url(HASH_OF(z_old_url)); + old_url = http_url_from_struct(NULL, HASH_OF(z_old_url)); } else { convert_to_string(z_old_url); if (!(old_url = php_url_parse_ex(Z_STRVAL_P(z_old_url), Z_STRLEN_P(z_old_url)))) { @@ -145,33 +145,7 @@ PHP_FUNCTION(http_build_url) if (z_composed_url) { http_build_url(flags, old_url, new_url, &composed_url, &url_str, &url_len); - - zval_dtor(z_composed_url); - array_init(z_composed_url); - if (composed_url->scheme) { - add_assoc_string(z_composed_url, "scheme", composed_url->scheme, 1); - } - if (composed_url->user) { - add_assoc_string(z_composed_url, "user", composed_url->user, 1); - } - if (composed_url->pass) { - add_assoc_string(z_composed_url, "pass", composed_url->pass, 1); - } - if (composed_url->host) { - add_assoc_string(z_composed_url, "host", composed_url->host, 1); - } - if (composed_url->port) { - add_assoc_long(z_composed_url, "port", composed_url->port); - } - if (composed_url->path) { - add_assoc_string(z_composed_url, "path", composed_url->path, 1); - } - if (composed_url->query) { - add_assoc_string(z_composed_url, "query", composed_url->query, 1); - } - if (composed_url->fragment) { - add_assoc_string(z_composed_url, "fragment", composed_url->fragment, 1); - } + http_url_tostruct(composed_url, z_composed_url); php_url_free(composed_url); } else { http_build_url(flags, old_url, new_url, NULL, &url_str, &url_len); diff --git a/package2.xml b/package2.xml index 2e373b1..af1eff6 100644 --- a/package2.xml +++ b/package2.xml @@ -50,6 +50,7 @@ HttpResponse * Fixed possible crash in progress/onfinish request callbacks * Fixed http_redirect() and http_build_url() without arguments * Enabled recursive query string merging in http_build_url() with HTTP_URL_JOIN_QUERY +* Fixed behaviour of http_build_url() when second parameter is NULL ]]> diff --git a/php_http_url_api.h b/php_http_url_api.h index a4c5df0..cc7951d 100644 --- a/php_http_url_api.h +++ b/php_http_url_api.h @@ -43,11 +43,14 @@ PHP_HTTP_API STATUS _http_urlencode_hash_ex(HashTable *hash, zend_bool override_ #define http_urlencode_hash_recursive(ht, s, as, al, pr, pl) _http_urlencode_hash_recursive((ht), (s), (as), (al), (pr), (pl) TSRMLS_CC) PHP_HTTP_API STATUS _http_urlencode_hash_recursive(HashTable *ht, phpstr *str, const char *arg_sep, size_t arg_sep_len, const char *prefix, size_t prefix_len TSRMLS_DC); -#define array2url(ht) _array2url((ht) TSRMLS_CC) -static inline php_url *_array2url(HashTable *ht TSRMLS_DC) +#define http_url_from_struct(u, ht) _http_url_from_struct((u), (ht) TSRMLS_CC) +static inline php_url *_http_url_from_struct(php_url *url, HashTable *ht TSRMLS_DC) { zval **e; - php_url *url = ecalloc(1, sizeof(php_url)); + + if (!url) { + url = ecalloc(1, sizeof(php_url)); + } if ((SUCCESS == zend_hash_find(ht, "scheme", sizeof("scheme"), (void *) &e)) && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { @@ -92,6 +95,56 @@ static inline php_url *_array2url(HashTable *ht TSRMLS_DC) return url; } +#define http_url_tostruct(u, strct) _http_url_tostruct((u), (strct) TSRMLS_CC) +static inline HashTable *_http_url_tostruct(php_url *url, zval *strct TSRMLS_DC) +{ + zval arr; + + if (strct) { + switch (Z_TYPE_P(strct)) + { + default: + zval_dtor(strct); + array_init(strct); + case IS_ARRAY: + case IS_OBJECT: + INIT_ZARR(arr, HASH_OF(strct)); + } + } else { + INIT_PZVAL(&arr); + array_init(&arr); + } + + if (url) { + if (url->scheme) { + add_assoc_string(&arr, "scheme", url->scheme, 1); + } + if (url->user) { + add_assoc_string(&arr, "user", url->user, 1); + } + if (url->pass) { + add_assoc_string(&arr, "pass", url->pass, 1); + } + if (url->host) { + add_assoc_string(&arr, "host", url->host, 1); + } + if (url->port) { + add_assoc_long(&arr, "port", (long) url->port); + } + if (url->path) { + add_assoc_string(&arr, "path", url->path, 1); + } + if (url->query) { + add_assoc_string(&arr, "query", url->query, 1); + } + if (url->fragment) { + add_assoc_string(&arr, "fragment", url->fragment, 1); + } + } + + return Z_ARRVAL(arr); +} + #endif /*