X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=155a06f08491c1eaaa2ad36b64e92e71fc199025;hp=ad2e3d2419616385a7c344c9189ab0b69e0600e9;hb=5773d11d8c9c28fb8b0e3389258f548fc4717892;hpb=28676404f30a0814a8e027d63b3cec4959475c46 diff --git a/http_functions.c b/http_functions.c index ad2e3d2..155a06f 100644 --- a/http_functions.c +++ b/http_functions.c @@ -62,7 +62,7 @@ PHP_FUNCTION(http_date) } /* }}} */ -/* {{{ proto string http_build_url(mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE[, array &new_url]]]) +/* {{{ proto string http_build_url([mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE[, array &new_url]]]]) * * Build an URL. * @@ -77,7 +77,7 @@ PHP_FUNCTION(http_date) *
* - HTTP_URL_REPLACE: (default) set parts of the second url will replace the parts in the first * - HTTP_URL_JOIN_PATH: the path of the second url will be merged into the one of the first - * - HTTP_URL_JOIN_QUERY: the two querystrings will be merged naivly; no replacements are done + * - HTTP_URL_JOIN_QUERY: the two querystrings will be merged recursively * - HTTP_URL_STRIP_USER: the user part will not appear in the result * - HTTP_URL_STRIP_PASS: the password part will not appear in the result * - HTTP_URL_STRIP_AUTH: neither the user nor the password part will appear in the result @@ -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)))) { @@ -128,48 +128,24 @@ PHP_FUNCTION(http_build_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)); - } 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)))) { - if (new_url) { - php_url_free(new_url); + if (z_old_url) { + if (Z_TYPE_P(z_old_url) == IS_ARRAY || Z_TYPE_P(z_old_url) == IS_OBJECT) { + 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)))) { + if (new_url) { + php_url_free(new_url); + } + http_error_ex(HE_WARNING, HTTP_E_URL, "Could not parse URL (%s)", Z_STRVAL_P(z_old_url)); + RETURN_FALSE; } - http_error_ex(HE_WARNING, HTTP_E_URL, "Could not parse URL (%s)", Z_STRVAL_P(z_old_url)); - RETURN_FALSE; } } 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); @@ -178,7 +154,9 @@ PHP_FUNCTION(http_build_url) if (new_url) { php_url_free(new_url); } - php_url_free(old_url); + if (old_url) { + php_url_free(old_url); + } RETURN_STRINGL(url_str, url_len, 0); } @@ -739,7 +717,7 @@ PHP_FUNCTION(http_throttle) */ PHP_FUNCTION(http_redirect) { - int url_len; + int url_len = 0; size_t query_len = 0; zend_bool session = 0, free_params = 0; zval *params = NULL; @@ -1113,6 +1091,27 @@ PHP_FUNCTION(http_parse_cookie) } } +/* {{{ proto object http_parse_params(string param) + * + * Parse parameter list. + */ +PHP_FUNCTION(http_parse_params) +{ + char *param; + int param_len; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", ¶m, ¶m_len)) { + RETURN_FALSE; + } + + object_init(return_value); + if (SUCCESS != http_parse_params(param, HASH_OF(return_value))) { + zval_dtor(return_value); + RETURN_FALSE; + } +} +/* }}} */ + /* {{{ proto array http_get_request_headers(void) * * Get a list of incoming HTTP headers. @@ -1839,7 +1838,7 @@ PHP_FUNCTION(http_request_method_unregister) */ PHP_FUNCTION(http_request_method_exists) { - IF_RETVAL_USED { + if (return_value_used) { zval *method; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &method)) { @@ -1875,7 +1874,7 @@ PHP_FUNCTION(http_request_method_exists) */ PHP_FUNCTION(http_request_method_name) { - IF_RETVAL_USED { + if (return_value_used) { long method; if ((SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &method)) || (method < 0)) {