X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=aae091d691a543c6846ea6a83d4c090cf34c073e;hp=39327d10f4fa76f8292b0457a989f001ec42a466;hb=fa1a275e2b5e1b9dfb5bcbf97b51ef2b568e433c;hpb=a19f558421040b5396b3d76e6c4878d7eda85aba diff --git a/http_functions.c b/http_functions.c index 39327d1..aae091d 100644 --- a/http_functions.c +++ b/http_functions.c @@ -6,7 +6,7 @@ | 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 | +--------------------------------------------------------------------+ */ @@ -26,7 +26,7 @@ #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 @@ -41,8 +41,6 @@ #include "php_http_send_api.h" #include "php_http_url_api.h" -ZEND_EXTERN_MODULE_GLOBALS(http) - /* {{{ proto string http_date([int timestamp]) * * Compose a valid HTTP date regarding RFC 822/1123 @@ -68,7 +66,7 @@ PHP_FUNCTION(http_date) } /* }}} */ -/* {{{ proto string http_build_url(mixed url[, mixed parts[, array new_url]]) +/* {{{ proto string http_build_url(mixed url[, mixed parts[, array &new_url]]) * * Returns the new URL as string on success or FALSE on failure. */ @@ -89,6 +87,7 @@ PHP_FUNCTION(http_build_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)))) { + http_error_ex(HE_WARNING, HTTP_E_URL, "Could not parse URL (%s)", Z_STRVAL_P(z_new_url)); RETURN_FALSE; } } @@ -102,6 +101,7 @@ PHP_FUNCTION(http_build_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; } } @@ -603,8 +603,6 @@ PHP_FUNCTION(ob_etaghandler) * Provides a basic throttling mechanism, which will yield the current process * resp. thread until the entity has been completely sent, though. * - * Note: This doesn't really work with the FastCGI SAPI. - * * Expects a double parameter specifying the seconds too sleep() after * each chunk sent. Additionally accepts an optional int parameter * representing the chunk size in bytes. @@ -638,13 +636,14 @@ 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_AUTO 303 See Other for POST, else 302 Found * - HTTP_REDIRECT_PERM 301 Moved Permanently * - HTTP_REDIRECT_POST 303 See Other * - HTTP_REDIRECT_TEMP 307 Temporary Redirect @@ -652,7 +651,7 @@ PHP_FUNCTION(http_throttle) * 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. * @@ -667,13 +666,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 = 0; 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) { @@ -681,39 +681,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) { @@ -733,14 +707,10 @@ 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")) { - spprintf(&RED, 0, "Redirecting to %s?%s.\n", URI, query, URI, query); - } + 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")) { - spprintf(&RED, 0, "Redirecting to %s.\n", URI, URI); - } + spprintf(&RED, 0, "Redirecting to %s.\n", URI, URI); } efree(URI); @@ -1464,7 +1434,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; } @@ -1507,7 +1477,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; } @@ -1532,7 +1502,7 @@ 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); } } /* }}} */ @@ -1596,13 +1566,11 @@ PHP_FUNCTION(http_deflate) RETVAL_NULL(); if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &flags)) { - { - char *encoded; - size_t encoded_len; - - if (SUCCESS == http_encoding_deflate(flags, data, data_len, &encoded, &encoded_len)) { - RETURN_STRINGL(encoded, (int) encoded_len, 0); - } + char *encoded; + size_t encoded_len; + + if (SUCCESS == http_encoding_deflate(flags, data, data_len, &encoded, &encoded_len)) { + RETURN_STRINGL(encoded, (int) encoded_len, 0); } } } @@ -1635,6 +1603,47 @@ PHP_FUNCTION(http_inflate) } /* }}} */ +/* {{{ proto string ob_deflatehandler(string data, int mode) + * + * For use with ob_start(). The deflate output buffer handler can only be used once. + * It conflicts with ob_gzhanlder and zlib.output_compression as well and should + * not be used after ext/mbstrings mb_output_handler and ext/sessions URL-Rewriter (AKA + * session.use_trans_sid). + */ +PHP_FUNCTION(ob_deflatehandler) +{ + char *data; + int data_len; + long mode; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &data, &data_len, &mode)) { + RETURN_FALSE; + } + + http_ob_deflatehandler(data, data_len, &Z_STRVAL_P(return_value), (uint *) &Z_STRLEN_P(return_value), mode); + Z_TYPE_P(return_value) = Z_STRVAL_P(return_value) ? IS_STRING : IS_NULL; +} +/* }}} */ + +/* {{{ proto string ob_inflatehandler(string data, int mode) + * + * For use with ob_start(). Same restrictions as with ob_deflatehandler apply. + */ +PHP_FUNCTION(ob_inflatehandler) +{ + char *data; + int data_len; + long mode; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &data, &data_len, &mode)) { + RETURN_FALSE; + } + + http_ob_inflatehandler(data, data_len, &Z_STRVAL_P(return_value), (uint *) &Z_STRLEN_P(return_value), mode); + Z_TYPE_P(return_value) = Z_STRVAL_P(return_value) ? IS_STRING : IS_NULL; +} +/* }}} */ + #endif /* HTTP_HAVE_ZLIB */ /* }}} */