X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=f03398c4100ebfd242bbe48f34ec0d97c3455dba;hp=7f7c4d68647ed9b37eae9a95612fe4f3c2a5d507;hb=98e0618077ab00672dd0e6e134d4722e033d827e;hpb=9287fdda2887622c8fe69f7b63d6803d60827ded diff --git a/http_functions.c b/http_functions.c index 7f7c4d6..f03398c 100644 --- a/http_functions.c +++ b/http_functions.c @@ -6,27 +6,22 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2005, Michael Wallner | + | Copyright (c) 2004-2006, Michael Wallner | +--------------------------------------------------------------------+ */ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - +#define HTTP_WANT_SAPI #define HTTP_WANT_CURL #define HTTP_WANT_ZLIB #include "php_http.h" -#include "SAPI.h" #include "php_ini.h" -#include "ext/standard/info.h" #include "ext/standard/php_string.h" #include "zend_operators.h" -#if defined(HAVE_PHP_SESSION) && !defined(COMPILE_DL_SESSION) +#ifdef HAVE_PHP_SESSION # include "ext/session/php_session.h" #endif @@ -46,8 +41,8 @@ * Compose a valid HTTP date regarding RFC 822/1123 * looking like: "Wed, 22 Dec 2004 11:34:47 GMT" * - * Takes an optional unix timestamp as parameter. - * + * Accepts an optional unix timestamp as parameter. + * * Returns the HTTP date as string. */ PHP_FUNCTION(http_date) @@ -59,14 +54,14 @@ PHP_FUNCTION(http_date) } if (t == -1) { - t = (long) time(NULL); + t = (long) HTTP_GET_REQUEST_TIME(); } RETURN_STRING(http_date(t), 0); } /* }}} */ -/* {{{ proto string http_build_url(mixed url[, mixed parts[, array &new_url]]) +/* {{{ proto string http_build_url(mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE[, array &new_url]]]) * * Returns the new URL as string on success or FALSE on failure. */ @@ -74,10 +69,11 @@ PHP_FUNCTION(http_build_url) { char *url_str = NULL; size_t url_len = 0; + long flags = HTTP_URL_REPLACE; 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/z", &z_old_url, &z_new_url, &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; } @@ -107,7 +103,7 @@ PHP_FUNCTION(http_build_url) } if (z_composed_url) { - http_build_url(old_url, new_url, &composed_url, &url_str, &url_len); + http_build_url(flags, old_url, new_url, &composed_url, &url_str, &url_len); zval_dtor(z_composed_url); array_init(z_composed_url); @@ -137,7 +133,7 @@ PHP_FUNCTION(http_build_url) } php_url_free(composed_url); } else { - http_build_url(old_url, new_url, NULL, &url_str, &url_len); + http_build_url(flags, old_url, new_url, NULL, &url_str, &url_len); } if (new_url) { @@ -149,6 +145,40 @@ PHP_FUNCTION(http_build_url) } /* }}} */ +/* {{{ proto string http_build_str(array query [, string prefix[, string arg_separator]]) + * + * Opponent to parse_str(). + */ +PHP_FUNCTION(http_build_str) +{ + zval *formdata; + char *prefix = NULL, *arg_sep = INI_STR("arg_separator.output"); + int prefix_len = 0, arg_sep_len = strlen(arg_sep); + phpstr formstr; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|ss", &formdata, &prefix, &prefix_len, &arg_sep, &arg_sep_len) != SUCCESS) { + RETURN_FALSE; + } + + if (!arg_sep_len) { + arg_sep = HTTP_URL_ARGSEP; + arg_sep_len = lenof(HTTP_URL_ARGSEP); + } + + phpstr_init(&formstr); + if (SUCCESS != http_urlencode_hash_recursive(HASH_OF(formdata), &formstr, arg_sep, arg_sep_len, prefix, prefix_len)) { + RETURN_FALSE; + } + + if (!formstr.used) { + phpstr_dtor(&formstr); + RETURN_NULL(); + } + + RETURN_PHPSTR_VAL(&formstr); +} +/* }}} */ + #define HTTP_DO_NEGOTIATE(type, supported, rs_array) \ { \ HashTable *result; \ @@ -376,7 +406,7 @@ PHP_FUNCTION(http_send_last_modified) } if (t == -1) { - t = (long) time(NULL); + t = (long) HTTP_GET_REQUEST_TIME(); } RETURN_SUCCESS(http_send_last_modified(t)); @@ -456,7 +486,7 @@ PHP_FUNCTION(http_match_modified) // current time if not supplied (senseless though) if (t == -1) { - t = (long) time(NULL); + t = (long) HTTP_GET_REQUEST_TIME(); } if (for_range) { @@ -524,7 +554,7 @@ PHP_FUNCTION(http_cache_last_modified) HTTP_CHECK_HEADERS_SENT(RETURN_FALSE); - t = (long) time(NULL); + t = (long) HTTP_GET_REQUEST_TIME(); /* 0 or omitted */ if (!last_modified) { @@ -636,21 +666,23 @@ PHP_FUNCTION(http_throttle) * * Redirect to the given url. * - * The supplied url will be expanded with http_build_uri(), the params array will + * The supplied url will be expanded with http_build_url(), the params array will * be treated with http_build_query() and the session identification will be appended * if session is true. * * The HTTP response code will be set according to status. * You can use one of the following constants for convenience: - * - HTTP_REDIRECT 302 Found + * - HTTP_REDIRECT 302 Found for GET/HEAD, else 303 See Other * - HTTP_REDIRECT_PERM 301 Moved Permanently + * - HTTP_REDIRECT_FOUND 302 Found * - HTTP_REDIRECT_POST 303 See Other + * - HTTP_REDIRECT_PROXY 305 Use Proxy * - HTTP_REDIRECT_TEMP 307 Temporary Redirect * * Please see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3 * for which redirect response code to use in which situation. * - * To be RFC compliant, "Redirecting to URI." will be displayed, + * To be RFC compliant, "Redirecting to URL." will be displayed, * if the client doesn't redirect immediatly, and the request method was * another one than HEAD. * @@ -665,13 +697,14 @@ PHP_FUNCTION(http_redirect) size_t query_len = 0; zend_bool session = 0, free_params = 0; zval *params = NULL; - long status = 302; + long status = HTTP_REDIRECT; char *query = NULL, *url = NULL, *URI, *LOC, *RED = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sa!/bl", &url, &url_len, ¶ms, &session, &status) != SUCCESS) { RETURN_FALSE; } +#ifdef HAVE_PHP_SESSION /* append session info */ if (session) { if (!params) { @@ -679,39 +712,13 @@ PHP_FUNCTION(http_redirect) MAKE_STD_ZVAL(params); array_init(params); } -#ifdef HAVE_PHP_SESSION -# ifdef COMPILE_DL_SESSION - if (SUCCESS == zend_get_module_started("session")) { - zval nm_retval, id_retval, func; - - INIT_PZVAL(&func); - INIT_PZVAL(&nm_retval); - INIT_PZVAL(&id_retval); - ZVAL_NULL(&nm_retval); - ZVAL_NULL(&id_retval); - - ZVAL_STRINGL(&func, "session_id", lenof("session_id"), 0); - call_user_function(EG(function_table), NULL, &func, &id_retval, 0, NULL TSRMLS_CC); - ZVAL_STRINGL(&func, "session_name", lenof("session_name"), 0); - call_user_function(EG(function_table), NULL, &func, &nm_retval, 0, NULL TSRMLS_CC); - - if ( Z_TYPE(nm_retval) == IS_STRING && Z_STRLEN(nm_retval) && - Z_TYPE(id_retval) == IS_STRING && Z_STRLEN(id_retval)) { - if (add_assoc_stringl_ex(params, Z_STRVAL(nm_retval), Z_STRLEN(nm_retval)+1, - Z_STRVAL(id_retval), Z_STRLEN(id_retval), 0) != SUCCESS) { - http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not append session information"); - } - } - } -# else if (PS(session_status) == php_session_active) { if (add_assoc_string(params, PS(session_name), PS(id), 1) != SUCCESS) { http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not append session information"); } } -# endif -#endif } +#endif /* treat params array with http_build_query() */ if (params) { @@ -731,12 +738,12 @@ PHP_FUNCTION(http_redirect) if (query_len) { spprintf(&LOC, 0, "Location: %s?%s", URI, query); - if (SG(request_info).request_method && strcmp(SG(request_info).request_method, "HEAD")) { + if (status != 300) { spprintf(&RED, 0, "Redirecting to %s?%s.\n", URI, query, URI, query); } } else { spprintf(&LOC, 0, "Location: %s", URI); - if (SG(request_info).request_method && strcmp(SG(request_info).request_method, "HEAD")) { + if (status != 300) { spprintf(&RED, 0, "Redirecting to %s.\n", URI, URI); } } @@ -749,7 +756,36 @@ PHP_FUNCTION(http_redirect) zval_dtor(params); FREE_ZVAL(params); } - + + 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; + + case 306: + default: + http_error_ex(HE_NOTICE, HTTP_E_RUNTIME, "Unsupported redirection status code: %ld", status); + case HTTP_REDIRECT: + if ( SG(request_info).request_method && + strcasecmp(SG(request_info).request_method, "HEAD") && + strcasecmp(SG(request_info).request_method, "GET")) { + status = HTTP_REDIRECT_POST; + } else { + status = HTTP_REDIRECT_FOUND; + } + break; + } + RETURN_SUCCESS(http_exit_ex(status, LOC, RED, 1)); } /* }}} */ @@ -1014,7 +1050,10 @@ PHP_FUNCTION(http_get_request_headers) * * Get the raw request body (e.g. POST or PUT data). * - * Returns NULL when using the CLI SAPI. + * This function can not be used after http_get_request_body_stream() + * if the request method was another than POST. + * + * Returns the raw request body as string on success or NULL on failure. */ PHP_FUNCTION(http_get_request_body) { @@ -1031,6 +1070,29 @@ PHP_FUNCTION(http_get_request_body) } /* }}} */ +/* {{{ proto resource http_get_request_body_stream(void) + * + * Create a stream to read the raw request body (e.g. POST or PUT data). + * + * This function can only be used once if the request method was another than POST. + * + * Returns the raw request body as stream on success or NULL on failure. + */ +PHP_FUNCTION(http_get_request_body_stream) +{ + php_stream *s; + + NO_ARGS; + + if ((s = http_get_request_body_stream())) { + php_stream_to_zval(s, return_value); + } else { + http_error(HE_WARNING, HTTP_E_RUNTIME, "Failed to create request body stream"); + RETURN_NULL(); + } +} +/* }}} */ + /* {{{ proto bool http_match_request_header(string header, string value[, bool match_case = false]) * * Match an incoming HTTP header. @@ -1462,7 +1524,7 @@ PHP_FUNCTION(http_request_method_unregister) if (is_numeric_string(Z_STRVAL_P(method), Z_STRLEN_P(method), NULL, NULL, 1)) { convert_to_long(method); } else { - ulong mn; + int mn; if (!(mn = http_request_method_exists(1, 0, Z_STRVAL_P(method)))) { RETURN_FALSE; } @@ -1505,7 +1567,7 @@ PHP_FUNCTION(http_request_method_exists) RETURN_LONG((long) http_request_method_exists(1, 0, Z_STRVAL_P(method))); } case IS_LONG: - RETURN_LONG((long) http_request_method_exists(0, Z_LVAL_P(method), NULL)); + RETURN_LONG((long) http_request_method_exists(0, (int) Z_LVAL_P(method), NULL)); default: RETURN_FALSE; } @@ -1530,49 +1592,11 @@ PHP_FUNCTION(http_request_method_name) RETURN_FALSE; } - RETURN_STRING(estrdup(http_request_method_name((ulong) method)), 0); + RETURN_STRING(estrdup(http_request_method_name((int) method)), 0); } } /* }}} */ -/* {{{ Sara Golemons http_build_query() */ -#ifndef ZEND_ENGINE_2 - -/* {{{ proto string http_build_query(mixed formdata [, string prefix[, string arg_separator]]) - Generates a form-encoded query string from an associative array or object. */ -PHP_FUNCTION(http_build_query) -{ - zval *formdata; - char *prefix = NULL, *arg_sep = INI_STR("arg_separator.output"); - int prefix_len = 0, arg_sep_len = strlen(arg_sep); - phpstr *formstr; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|ss", &formdata, &prefix, &prefix_len, &arg_sep, &arg_sep_len) != SUCCESS) { - RETURN_FALSE; - } - - if (!arg_sep_len) { - arg_sep = HTTP_URL_ARGSEP; - arg_sep_len = lenof(HTTP_URL_ARGSEP); - } - - formstr = phpstr_new(); - if (SUCCESS != http_urlencode_hash_recursive(HASH_OF(formdata), formstr, arg_sep, arg_sep_len, prefix, prefix_len)) { - phpstr_free(&formstr); - RETURN_FALSE; - } - - if (!formstr->used) { - phpstr_free(&formstr); - RETURN_NULL(); - } - - RETURN_PHPSTR_PTR(formstr); -} -/* }}} */ -#endif /* !ZEND_ENGINE_2 */ -/* }}} */ - /* {{{ */ #ifdef HTTP_HAVE_ZLIB