X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_functions.c;h=807b0a527cb94ae2f3bfeff483bf066b6eb08d7c;hb=b20ced89bee0617c45447f51ed0baa7046851a65;hp=9b42801830c6ec197a14cf45836da807a747ff6b;hpb=24d2d35cd00eca44a97a6b11340c2790421216fa;p=m6w6%2Fext-http diff --git a/http_functions.c b/http_functions.c index 9b42801..807b0a5 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); @@ -807,20 +781,18 @@ PHP_FUNCTION(http_redirect) FREE_ZVAL(params); } - switch (status) - { + switch (status) { case 300: RETVAL_SUCCESS(http_send_status_header(status, LOC)); efree(LOC); return; - break; case HTTP_REDIRECT_PERM: case HTTP_REDIRECT_FOUND: case HTTP_REDIRECT_POST: case HTTP_REDIRECT_PROXY: case HTTP_REDIRECT_TEMP: - break; + break; case 306: default: @@ -833,7 +805,7 @@ PHP_FUNCTION(http_redirect) } else { status = HTTP_REDIRECT_FOUND; } - break; + break; } RETURN_SUCCESS(http_exit_ex(status, LOC, RED, 1)); @@ -1117,6 +1089,32 @@ 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; + zval *params; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", ¶m, ¶m_len)) { + RETURN_FALSE; + } + + params = ecalloc(1, sizeof(zval)); + array_init(params); + if (SUCCESS != http_parse_params(param, Z_ARRVAL_P(params))) { + zval_dtor(params); + FREE_ZVAL(params); + RETURN_FALSE; + } + object_init(return_value); + add_property_zval(return_value, "params", params); +} +/* }}} */ + /* {{{ proto array http_get_request_headers(void) * * Get a list of incoming HTTP headers. @@ -1250,9 +1248,8 @@ PHP_FUNCTION(http_match_request_header) * - cookies: array, list of cookies as associative array * like array("cookie" => "value") * - encodecookies: bool, whether to urlencode the cookies (default: true) - * - resetcookies: bool, wheter to reset the cookies * - cookiestore: string, path to a file where cookies are/will be stored - * - cookiesession: bool, accept (true) or reset (false) sessioncookies + * - cookiesession: bool, don't load session cookies from cookiestore if TRUE * - resume: int, byte offset to start the download from; * if the server supports ranges * - range: array, array of arrays, each containing two integers, @@ -1722,8 +1719,7 @@ PHP_FUNCTION(http_request_body_encode) RETURN_FALSE; } - switch (body.type) - { + switch (body.type) { case HTTP_REQUEST_BODY_CURLPOST: if (CURLE_OK != (rc = Curl_getFormData(&data, body.data, &size))) { http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Could not encode request body: %s", curl_easy_strerror(rc)); @@ -1754,16 +1750,16 @@ PHP_FUNCTION(http_request_body_encode) } } http_request_body_dtor(&body); - break; + break; case HTTP_REQUEST_BODY_CSTRING: RETVAL_STRINGL(body.data, body.size, 0); - break; + break; default: http_request_body_dtor(&body); RETVAL_FALSE; - break; + break; } } #endif /* HTTP_HAVE_CURL */ @@ -1810,8 +1806,7 @@ PHP_FUNCTION(http_request_method_unregister) RETURN_FALSE; } - switch (Z_TYPE_P(method)) - { + switch (Z_TYPE_P(method)) { case IS_OBJECT: convert_to_string(method); case IS_STRING: @@ -1843,15 +1838,14 @@ 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)) { RETURN_FALSE; } - switch (Z_TYPE_P(method)) - { + switch (Z_TYPE_P(method)) { case IS_OBJECT: convert_to_string(method); case IS_STRING: @@ -1879,7 +1873,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)) {