X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=907ee92c5033643f0dd6b058bf3757af7bd820b3;hp=39327d10f4fa76f8292b0457a989f001ec42a466;hb=1382fe5a3ed5209ab05745ca95495885e85ff2a0;hpb=a19f558421040b5396b3d76e6c4878d7eda85aba diff --git a/http_functions.c b/http_functions.c index 39327d1..907ee92 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 @@ -41,15 +36,13 @@ #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 + * Compose a valid HTTP date regarding RFC 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) @@ -61,25 +54,64 @@ 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]]]) + * + * Build an URL. * + * Expexts (part(s) of) an URL as first parameter in form of a string or assoziative array + * like parse_url() returns. Accepts an optional second parameter in the same way as the + * first argument. Accepts an optional third integer parameter, which is a bitmask of + * binary or'ed HTTP_URL_* constants. The optional fourth parameter will be filled + * with the results as associative array like parse_url() would return. + * + * The parts of the second URL will be merged into the first according to the flags argument. + * The following flags are recognized: + * 
+ *	- 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_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
+ *	- HTTP_URL_STRIP_PORT:     no explicit port will be set in the result
+ *	- HTTP_URL_STRIP_PATH:     the path part will not appear in the result
+ *	- HTTP_URL_STRIP_QUERY:    no query string will be present in the result
+ *	- HTTP_URL_STRIP_FRAGMENT: no fragment will be present in the result
+ *
+ * + * Example: + * 
+ *  "ftp",
+ * 				"host"   => "ftp.example.com",
+ * 				"path"   => "files/current/",
+ * 				"query"  => "a=c"
+ * 			),
+ * 			HTTP_URL_STRIP_AUTH | HTTP_URL_JOIN_PATH | HTTP_URL_JOIN_QUERY | HTTP_URL_STRIP_FRAGMENT
+ * 		);
+ * ?>
+ *
* Returns the new URL as string on success or FALSE on failure. */ 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; } @@ -89,6 +121,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,12 +135,13 @@ 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; } } 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 +171,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 +183,47 @@ PHP_FUNCTION(http_build_url) } /* }}} */ +/* {{{ proto string http_build_str(array query [, string prefix[, string arg_separator]]) + * + * Opponent to parse_str(). + * + * Expects an array as first argument which represents the parts of the query string to build. + * Accepts a string as optional second parameter containing a top-level prefix to use. + * The optional third parameter should specify an argument separator to use (by default the + * INI setting arg_separator.output will be used, or "&" if neither is set). + * + * Returns the built query as string on success or FALSE on failure. + */ +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; \ @@ -200,7 +275,7 @@ PHP_FUNCTION(http_build_url) * without qualifier are rated highest. The qualifier will be decreased by * 10% for partial matches (i.e. matching primary language). * - * Expects an array as parameter cotaining the supported languages as values. + * Expects an array as parameter containing the supported languages as values. * If the optional second parameter is supplied, it will be filled with an * array containing the negotiation results. * @@ -249,7 +324,7 @@ PHP_FUNCTION(http_negotiate_language) * Accept-Charset HTTP header. The qualifier is recognized and charsets * without qualifier are rated highest. * - * Expects an array as parameter cotaining the supported charsets as values. + * Expects an array as parameter containing the supported charsets as values. * If the optional second parameter is supplied, it will be filled with an * array containing the negotiation results. * @@ -301,7 +376,7 @@ PHP_FUNCTION(http_negotiate_charset) * Accept HTTP header. The qualifier is recognized and content types * without qualifier are rated highest. * - * Expects an array as parameter cotaining the supported content types as values. + * Expects an array as parameter containing the supported content types as values. * If the optional second parameter is supplied, it will be filled with an * array containing the negotiation results. * @@ -376,7 +451,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)); @@ -412,7 +487,7 @@ PHP_FUNCTION(http_send_content_type) * if the data actually sent came from a file or something similar, that should * be "saved" by the client/user (i.e. by browsers "Save as..." popup window). * - * Expects a string parameter specifying the file name the "Save as..." dialogue + * Expects a string parameter specifying the file name the "Save as..." dialog * should display. Optionally accepts a bool parameter, which, if set to true * and the user agent knows how to handle the content type, will probably not * cause the popup window to be shown. @@ -456,7 +531,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) { @@ -475,7 +550,7 @@ PHP_FUNCTION(http_match_modified) * accepts a bool parameter, which, if set to true, will check the header * usually used to validate HTTP ranges. * - * Retuns TRUE if ETag matches or the header contained the asterisk ("*"), + * Returns TRUE if ETag matches or the header contained the asterisk ("*"), * else FALSE. */ PHP_FUNCTION(http_match_etag) @@ -524,7 +599,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) { @@ -551,7 +626,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 algorythm 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 @@ -580,7 +655,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 algorythm specified with the INI setting "http.etag_mode". + * the hash algorithm specified with the INI setting "http.etag_mode". */ PHP_FUNCTION(ob_etaghandler) { @@ -603,8 +678,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. @@ -629,8 +702,8 @@ PHP_FUNCTION(http_throttle) return; } - HTTP_G(send).throttle_delay = interval; - HTTP_G(send).buffer_size = chunk_size; + HTTP_G->send.throttle_delay = interval; + HTTP_G->send.buffer_size = chunk_size; } /* }}} */ @@ -638,22 +711,24 @@ 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, - * if the client doesn't redirect immediatly, and the request method was + * To be RFC compliant, "Redirecting to URL." will be displayed, + * if the client doesn't redirect immediately, and the request method was * another one than HEAD. * * Returns FALSE on failure, or *exits* on success. @@ -667,13 +742,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) { @@ -681,39 +757,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,12 +783,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); } } @@ -751,7 +801,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)); } /* }}} */ @@ -760,7 +839,7 @@ PHP_FUNCTION(http_redirect) * * Sends raw data with support for (multiple) range requests. * - * Retursn TRUE on success, or FALSE on failure. + * Returns TRUE on success, or FALSE on failure. */ PHP_FUNCTION(http_send_data) { @@ -803,7 +882,7 @@ PHP_FUNCTION(http_send_file) * * Sends an already opened stream with support for (multiple) range requests. * - * Expects a resource parameter referncing the stream to read from. + * Expects a resource parameter referencing the stream to read from. * * Returns TRUE on success, or FALSE on failure. */ @@ -854,7 +933,7 @@ PHP_FUNCTION(http_chunked_decode) * Expects a string parameter containing a single HTTP message or * several consecutive HTTP messages. * - * Returns an hierachical object structure of the parsed messages. + * Returns an hierarchical object structure of the parsed messages. * * Example: * 
@@ -1016,7 +1095,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)
 {
@@ -1033,6 +1115,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.
@@ -1094,7 +1199,6 @@ PHP_FUNCTION(http_match_request_header)
  *  - httpauth:         string, http credentials in "user:pass" format
  *  - httpauthtype:     int, HTTP_AUTH_BASIC, DIGEST and/or NTLM
  *  - compress:         bool, whether to allow gzip/deflate content encoding
- *                      (defaults to true)
  *  - port:             int, use another port as specified in the url
  *  - referer:          string, the referer to send
  *  - useragent:        string, the user agent to send
@@ -1109,13 +1213,30 @@ PHP_FUNCTION(http_match_request_header)
  *  - 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
+ *  - etag:             string, quoted etag for If-(None-)Match header
  *  - timeout:          int, seconds the request may take
  *  - connecttimeout:   int, seconds the connect may take
  *  - onprogress:       mixed, progress callback
+ *  - ssl:              array, with the following options:
+ *                      cert:        string, path to certificate
+ *                      certtype:    string, type of certificate
+ *                      certpasswd:  string, password for certificate
+ *                      key:         string, path to key
+ *                      keytype:     string, type of key
+ *                      keypasswd:   string, pasword for key
+ *                      engine:      string, ssl engine to use
+ *                      version:     int, ssl version to use
+ *                      verifypeer:  bool, whether to verify the peer
+ *                      verifyhost:  bool whether to verify the host
+ *                      cipher_list: string, list of allowed ciphers
+ *                      cainfo:      string
+ *                      capath:      string
+ *                      random_file: string
+ *                      egdsocket:   string
  *
* * The optional third parameter will be filled with some additional information - * in form af an associative array, if supplied, like the following example: + * in form of an associative array, if supplied, like the following example: * 
  * used) {
-		phpstr_free(&formstr);
-		RETURN_NULL();
-	}
-
-	RETURN_PHPSTR_PTR(formstr);
-}
-/* }}} */
-#endif /* !ZEND_ENGINE_2 */
-/* }}} */
-
 /* {{{ */
 #ifdef HTTP_HAVE_ZLIB
 
@@ -1596,13 +1679,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);
 		}
 	}
 }
@@ -1610,7 +1691,7 @@ PHP_FUNCTION(http_deflate)
 
 /* {{{ proto string http_inflate(string data)
  *
- * Uncompress data compressed with either gzip, deflate AKA zlib or raw
+ * Decompress data compressed with either gzip, deflate AKA zlib or raw
  * deflate encoding.
  * 
  * Expects a string as parameter containing the compressed data.
@@ -1635,6 +1716,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_gzhandler 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 */
 /* }}} */
 
@@ -1642,7 +1764,7 @@ PHP_FUNCTION(http_inflate)
  *
  * Check for feature that require external libraries.
  * 
- * Accpepts an optional in parameter specifying which feature to probe for.
+ * Accepts an optional in parameter specifying which feature to probe for.
  * If the parameter is 0 or omitted, the return value contains a bitmask of 
  * all supported features that depend on external libraries.
  *