X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=inline;f=http_functions.c;h=82597f4517f4d22aa91d79d8426878065fdcdc3a;hb=7ea5445a6250f29f09d6b97db124cacf457f23c5;hp=8a5e49ed5f260bef1087dece1562edb39784703d;hpb=711cec2bc92f1c844b476b80194ae2b09e5dbea0;p=m6w6%2Fext-http diff --git a/http_functions.c b/http_functions.c index 8a5e49e..82597f4 100644 --- a/http_functions.c +++ b/http_functions.c @@ -21,7 +21,7 @@ #include "ext/standard/php_string.h" #include "zend_operators.h" -#ifdef HAVE_PHP_SESSION +#ifdef HTTP_HAVE_SESSION # include "ext/session/php_session.h" #endif @@ -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); } @@ -250,7 +228,7 @@ PHP_FUNCTION(http_build_str) zval **value; \ \ zend_hash_internal_pointer_reset(Z_ARRVAL_P(supported)); \ - if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(supported), (void **) &value)) { \ + if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(supported), (void *) &value)) { \ RETVAL_ZVAL(*value, 1, 0); \ } else { \ RETVAL_NULL(); \ @@ -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; @@ -750,7 +728,7 @@ PHP_FUNCTION(http_redirect) RETURN_FALSE; } -#ifdef HAVE_PHP_SESSION +#ifdef HTTP_HAVE_SESSION /* append session info */ if (session) { if (!params) { @@ -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)); @@ -1034,6 +1010,7 @@ PHP_FUNCTION(http_parse_headers) array_init(return_value); if (SUCCESS != http_parse_headers(header, return_value)) { zval_dtor(return_value); + http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Failed to parse headers"); RETURN_FALSE; } } @@ -1091,7 +1068,7 @@ PHP_FUNCTION(http_parse_cookie) FOREACH_VAL(pos, allowed_extras_array, entry) { ZVAL_ADDREF(*entry); convert_to_string_ex(entry); - allowed_extras[i] = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry)); + allowed_extras[i++] = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry)); zval_ptr_dtor(entry); } } @@ -1111,6 +1088,57 @@ PHP_FUNCTION(http_parse_cookie) efree(allowed_extras); } } +/* }}} */ + +/* {{{ proto string http_build_cookie(array cookie) + * + * Build a cookie string from an array/object like returned by http_parse_cookie(). + */ +PHP_FUNCTION(http_build_cookie) +{ + char *str = NULL; + size_t len = 0; + zval *strct; + http_cookie_list list; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &strct)) { + RETURN_FALSE; + } + + http_cookie_list_fromstruct(&list, strct); + http_cookie_list_tostring(&list, &str, &len); + http_cookie_list_dtor(&list); + + RETURN_STRINGL(str, len, 0); +} +/* }}} */ + +/* {{{ 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) * @@ -1206,7 +1234,7 @@ PHP_FUNCTION(http_match_request_header) zval **bodyonly; \ \ /* check if only the body should be returned */ \ - if (options && (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), "bodyonly", sizeof("bodyonly"), (void **) &bodyonly)) && zval_is_true(*bodyonly)) { \ + if (options && (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), "bodyonly", sizeof("bodyonly"), (void *) &bodyonly)) && zval_is_true(*bodyonly)) { \ http_message *msg = http_message_parse(PHPSTR_VAL(&request.conv.response), PHPSTR_LEN(&request.conv.response)); \ \ if (msg) { \ @@ -1230,6 +1258,7 @@ PHP_FUNCTION(http_match_request_header) * redirects to a different host * - proxyhost: string, proxy host in "host[:port]" format * - proxyport: int, use another proxy port as specified in proxyhost + * - proxytype: int, HTTP_PROXY_HTTP, SOCKS4 or SOCKS5 * - proxyauth: string, proxy credentials in "user:pass" format * - proxyauthtype: int, HTTP_AUTH_BASIC and/or HTTP_AUTH_NTLM * - httpauth: string, http credentials in "user:pass" format @@ -1244,10 +1273,13 @@ 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, 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, + * specifying the ranges to download if server support is + * given; only recognized if the resume option is empty * - maxfilesize: int, maximum file size that should be downloaded; * has no effect, if the size of the requested entity is not known * - lastmodified: int, timestamp for If-(Un)Modified-Since header @@ -1255,6 +1287,8 @@ PHP_FUNCTION(http_match_request_header) * - timeout: int, seconds the request may take * - connecttimeout: int, seconds the connect may take * - onprogress: mixed, progress callback + * - interface: string, outgoing network interface (ifname, ip or hostname) + * - portrange: array, 2 integers specifying outgoing portrange to try * - ssl: array, with the following options: * cert: string, path to certificate * certtype: string, type of certificate @@ -1499,7 +1533,7 @@ PHP_FUNCTION(http_put_file) RETURN_FALSE; } - if (!(stream = php_stream_open_wrapper(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL))) { + if (!(stream = php_stream_open_wrapper_ex(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT))) { RETURN_FALSE; } if (php_stream_stat(stream, &ssb)) { @@ -1514,12 +1548,8 @@ PHP_FUNCTION(http_put_file) RETVAL_FALSE; - body.type = HTTP_REQUEST_BODY_UPLOADFILE; - body.data = stream; - body.size = ssb.sb.st_size; - http_request_init_ex(&request, NULL, HTTP_PUT, URL); - request.body = &body; + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1); if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { http_request_exec(&request); if (info) { @@ -1527,8 +1557,6 @@ PHP_FUNCTION(http_put_file) } RETVAL_RESPONSE_OR_BODY(request); } - http_request_body_dtor(&body); - request.body = NULL; http_request_dtor(&request); } /* }}} */ @@ -1541,7 +1569,7 @@ PHP_FUNCTION(http_put_file) * opened stream, from which the data to upload should be read. * See http_get() for a full list of available options. * - * Returns the HTTP response(s) as string on success. or FALSE on failure. + * Returns the HTTP response(s) as string on success, or FALSE on failure. */ PHP_FUNCTION(http_put_stream) { @@ -1569,12 +1597,92 @@ PHP_FUNCTION(http_put_stream) RETVAL_FALSE; - body.type = HTTP_REQUEST_BODY_UPLOADFILE; - body.data = stream; - body.size = ssb.sb.st_size; + http_request_init_ex(&request, NULL, HTTP_PUT, URL); + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 0); + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); + } + http_request_dtor(&request); +} +/* }}} */ - http_request_init_ex(&request, NULL, HTTP_POST, URL); - request.body = &body; +/* {{{ proto string http_put_data(string url, string data[, array options[, array &info]]) + * + * Performs an HTTP PUT request on the supplied url. + * + * Expects the second parameter to be a string containing the data to upload. + * See http_get() for a full list of available options. + * + * Returns the HTTP response(s) as string on success, or FALSE on failure. + */ +PHP_FUNCTION(http_put_data) +{ + char *URL, *data; + int URL_len, data_len; + zval *options = NULL, *info = NULL; + http_request_body body; + http_request request; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &data, &data_len, &options, &info)) { + RETURN_FALSE; + } + + if (info) { + zval_dtor(info); + array_init(info); + } + + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, HTTP_PUT, URL); + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, data, data_len, 0); + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); + } + http_request_dtor(&request); +} +/* }}} */ + +/* {{{ proto string http_request(int method, string url[, string body[, array options[, array &info]]]) + * + * Performs a custom HTTP request on the supplied url. + * + * Expects the first parameter to be an integer specifying the request method to use. + * Accepts an optional third string parameter containing the raw request body. + * See http_get() for a full list of available options. + * + * Returns the HTTP response(s) as string on success, or FALSE on failure. + */ +PHP_FUNCTION(http_request) +{ + long meth; + char *URL, *data = NULL; + int URL_len, data_len = 0; + zval *options = NULL, *info = NULL; + http_request_body body; + http_request request; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls|sa/!z", &meth, &URL, &URL_len, &data, &data_len, &options, &info)) { + RETURN_FALSE; + } + + if (info) { + zval_dtor(info); + array_init(info); + } + + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, meth, URL); + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, data, data_len, 0); if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { http_request_exec(&request); if (info) { @@ -1582,10 +1690,38 @@ PHP_FUNCTION(http_put_stream) } RETVAL_RESPONSE_OR_BODY(request); } - request.body = NULL; http_request_dtor(&request); } /* }}} */ + +/* {{{ proto string http_request_body_encode(array fields, array files) + * + * Generate x-www-form-urlencoded resp. form-data encoded request body. + * + * Returns encoded string on success, or FALSE on failure. + */ +PHP_FUNCTION(http_request_body_encode) +{ + zval *fields = NULL, *files = NULL; + HashTable *fields_ht, *files_ht; + http_request_body body; + char *buf; + size_t len; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!", &fields, &files)) { + RETURN_FALSE; + } + + fields_ht = (fields && Z_TYPE_P(fields) == IS_ARRAY) ? Z_ARRVAL_P(fields) : NULL; + files_ht = (files && Z_TYPE_P(files) == IS_ARRAY) ? Z_ARRVAL_P(files) : NULL; + if (http_request_body_fill(&body, fields_ht, files_ht) && (SUCCESS == http_request_body_encode(&body, &buf, &len))) { + RETVAL_STRINGL(buf, len, 0); + } else { + http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not encode request body"); + RETVAL_FALSE; + } + http_request_body_dtor(&body); +} #endif /* HTTP_HAVE_CURL */ /* }}} HAVE_CURL */ @@ -1630,8 +1766,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: @@ -1663,15 +1798,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: @@ -1699,7 +1833,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)) {