X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_functions.c;h=0462c3b760b24aea0b31bd10ac51dea9e5f050a8;hb=50343c32560e80c491911b107fab8217a35850eb;hp=ad2e3d2419616385a7c344c9189ab0b69e0600e9;hpb=28676404f30a0814a8e027d63b3cec4959475c46;p=m6w6%2Fext-http diff --git a/http_functions.c b/http_functions.c index ad2e3d2..0462c3b 100644 --- a/http_functions.c +++ b/http_functions.c @@ -55,14 +55,14 @@ PHP_FUNCTION(http_date) } if (t == -1) { - t = (long) HTTP_GET_REQUEST_TIME(); + t = HTTP_G->request.time; } RETURN_STRING(http_date(t), 0); } /* }}} */ -/* {{{ 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); } @@ -452,7 +430,7 @@ PHP_FUNCTION(http_send_last_modified) } if (t == -1) { - t = (long) HTTP_GET_REQUEST_TIME(); + t = HTTP_G->request.time; } RETURN_SUCCESS(http_send_last_modified(t)); @@ -532,7 +510,7 @@ PHP_FUNCTION(http_match_modified) // current time if not supplied (senseless though) if (t == -1) { - t = (long) HTTP_GET_REQUEST_TIME(); + t = HTTP_G->request.time; } if (for_range) { @@ -587,7 +565,7 @@ PHP_FUNCTION(http_match_etag) * Returns FALSE on failure, or *exits* with "304 Not Modified" if the entity is cached. * * A log entry will be written to the cache log if the INI entry - * http.cache_log is set and the cache attempt was successful. + * http.log.cache is set and the cache attempt was successful. */ PHP_FUNCTION(http_cache_last_modified) { @@ -600,7 +578,7 @@ PHP_FUNCTION(http_cache_last_modified) HTTP_CHECK_HEADERS_SENT(RETURN_FALSE); - t = (long) HTTP_GET_REQUEST_TIME(); + t = HTTP_G->request.time; /* 0 or omitted */ if (!last_modified) { @@ -627,7 +605,7 @@ PHP_FUNCTION(http_cache_last_modified) /* {{{ proto bool http_cache_etag([string etag]) * * Attempts to cache the sent entity by its ETag, either supplied or generated - * by the hash algorithm specified by the INI setting "http.etag_mode". + * by the hash algorithm specified by the INI setting "http.etag.mode". * * If the clients "If-None-Match" header matches the supplied/calculated * ETag, the body is considered cached on the clients side and @@ -636,7 +614,7 @@ PHP_FUNCTION(http_cache_last_modified) * Returns FALSE on failure, or *exits* with "304 Not Modified" if the entity is cached. * * A log entry is written to the cache log if the INI entry - * "http.cache_log" is set and the cache attempt was successful. + * "http.log.cache" is set and the cache attempt was successful. */ PHP_FUNCTION(http_cache_etag) { @@ -656,7 +634,7 @@ PHP_FUNCTION(http_cache_etag) /* {{{ proto string ob_etaghandler(string data, int mode) * * For use with ob_start(). Output buffer handler generating an ETag with - * the hash algorithm specified with the INI setting "http.etag_mode". + * the hash algorithm specified with the INI setting "http.etag.mode". */ PHP_FUNCTION(ob_etaghandler) { @@ -735,11 +713,11 @@ PHP_FUNCTION(http_throttle) * Returns FALSE on failure, or *exits* on success. * * A log entry will be written to the redirect log, if the INI entry - * "http.redirect_log" is set and the redirect attempt was successful. + * "http.log.redirect" is set and the redirect attempt was successful. */ 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; @@ -803,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: @@ -829,7 +805,7 @@ PHP_FUNCTION(http_redirect) } else { status = HTTP_REDIRECT_FOUND; } - break; + break; } RETURN_SUCCESS(http_exit_ex(status, LOC, RED, 1)); @@ -1113,6 +1089,33 @@ PHP_FUNCTION(http_parse_cookie) } } +/* {{{ proto object http_parse_params(string param[, int flags = HTTP_PARAMS_DEFAULT]) + * + * Parse parameter list. + */ +PHP_FUNCTION(http_parse_params) +{ + char *param; + int param_len; + zval *params; + long flags = HTTP_PARAMS_DEFAULT; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", ¶m, ¶m_len, &flags)) { + RETURN_FALSE; + } + + params = ecalloc(1, sizeof(zval)); + array_init(params); + if (SUCCESS != http_parse_params(param, flags, 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. @@ -1246,9 +1249,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, @@ -1668,6 +1670,7 @@ PHP_FUNCTION(http_request) } /* }}} */ +#ifdef HAVE_CURL_GETFORMDATA static char *file_get_contents(char *file, size_t *len TSRMLS_DC) { php_stream *s = NULL; @@ -1718,8 +1721,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)); @@ -1750,18 +1752,19 @@ 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 /* HAVE_CURL_GETFORMDATA */ #endif /* HTTP_HAVE_CURL */ /* }}} HAVE_CURL */ @@ -1806,8 +1809,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: @@ -1839,15 +1841,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: @@ -1875,7 +1876,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)) {