X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=1a1c8715c0d2a41a402fbc562644837ac778c67f;hp=8b79f42497beffd47140e6b272bbb9fb291c0169;hb=18415c72d3b9f92b74dab623a88d5abf054c7bd0;hpb=a19a05825d04d634834f7898ec1a5247fdd6095c

diff --git a/http_functions.c b/http_functions.c
index 8b79f42..1a1c871 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -18,22 +18,32 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-
 #include "php.h"
+
+#include "SAPI.h"
 #include "php_ini.h"
-#include "snprintf.h"
 #include "ext/standard/info.h"
-#include "ext/session/php_session.h"
 #include "ext/standard/php_string.h"
-#include "ext/standard/php_smart_str.h"
-
-#include "SAPI.h"
+#if defined(HAVE_PHP_SESSION) && !defined(COMPILE_DL_SESSION)
+#	include "ext/session/php_session.h"
+#endif
 
 #include "php_http.h"
+#include "php_http_std_defs.h"
 #include "php_http_api.h"
-#include "php_http_curl_api.h"
+#include "php_http_auth_api.h"
+#include "php_http_request_api.h"
+#include "php_http_cache_api.h"
+#include "php_http_request_api.h"
+#include "php_http_date_api.h"
+#include "php_http_headers_api.h"
+#include "php_http_message_api.h"
+#include "php_http_send_api.h"
+#include "php_http_url_api.h"
+
+#include "phpstr/phpstr.h"
 
-ZEND_DECLARE_MODULE_GLOBALS(http)
+ZEND_EXTERN_MODULE_GLOBALS(http)
 
 /* {{{ proto string http_date([int timestamp])
  *
@@ -57,7 +67,7 @@ PHP_FUNCTION(http_date)
 }
 /* }}} */
 
-/* {{{ proto string http_absolute_uri(string url[, string proto])
+/* {{{ proto string http_absolute_uri(string url[, string proto[, string host[, int port]]])
  *
  * This function returns an absolute URI constructed from url.
  * If the url is already abolute but a different proto was supplied,
@@ -76,14 +86,15 @@ PHP_FUNCTION(http_date)
  */
 PHP_FUNCTION(http_absolute_uri)
 {
-	char *url = NULL, *proto = NULL;
-	int url_len = 0, proto_len = 0;
+	char *url = NULL, *proto = NULL, *host = NULL;
+	int url_len = 0, proto_len = 0, host_len = 0;
+	long port = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &url, &url_len, &proto, &proto_len) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ssl", &url, &url_len, &proto, &proto_len, &host, &host_len, &port) != SUCCESS) {
 		RETURN_FALSE;
 	}
 
-	RETURN_STRING(http_absolute_uri(url, proto), 0);
+	RETURN_STRING(http_absolute_uri_ex(url, url_len, proto, proto_len, host, host_len, port), 0);
 }
 /* }}} */
 
@@ -193,7 +204,7 @@ PHP_FUNCTION(http_send_status)
 		RETURN_FALSE;
 	}
 	if (status < 100 || status > 510) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid HTTP status code (100-510): %d", status);
+		http_error_ex(HE_WARNING, HTTP_E_HEADER, "Invalid HTTP status code (100-510): %d", status);
 		RETURN_FALSE;
 	}
 
@@ -239,7 +250,7 @@ PHP_FUNCTION(http_send_content_type)
 	}
 
 	if (!ct_len) {
-		RETURN_SUCCESS(http_send_content_type("application/x-octetstream", sizeof("application/x-octetstream") - 1));
+		RETURN_SUCCESS(http_send_content_type("application/x-octetstream", lenof("application/x-octetstream")));
 	}
 	RETURN_SUCCESS(http_send_content_type(ct, ct_len));
 }
@@ -265,7 +276,7 @@ PHP_FUNCTION(http_send_content_disposition)
 }
 /* }}} */
 
-/* {{{ proto bool http_match_modified([int timestamp])
+/* {{{ proto bool http_match_modified([int timestamp[, for_range = false]])
  *
  * Matches the given timestamp against the clients "If-Modified-Since" resp.
  * "If-Unmodified-Since" HTTP headers.
@@ -274,8 +285,9 @@ PHP_FUNCTION(http_send_content_disposition)
 PHP_FUNCTION(http_match_modified)
 {
 	long t = -1;
+	zend_bool for_range = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &t) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lb", &t, &for_range) != SUCCESS) {
 		RETURN_FALSE;
 	}
 
@@ -284,11 +296,14 @@ PHP_FUNCTION(http_match_modified)
 		t = (long) time(NULL);
 	}
 
-	RETURN_BOOL(http_modified_match("HTTP_IF_MODIFIED_SINCE", t) || http_modified_match("HTTP_IF_UNMODIFIED_SINCE", t));
+	if (for_range) {
+		RETURN_BOOL(http_match_last_modified("HTTP_IF_UNMODIFIED_SINCE", t));
+	}
+	RETURN_BOOL(http_match_last_modified("HTTP_IF_MODIFIED_SINCE", t));
 }
 /* }}} */
 
-/* {{{ proto bool http_match_etag(string etag)
+/* {{{ proto bool http_match_etag(string etag[, for_range = false])
  *
  * This matches the given ETag against the clients
  * "If-Match" resp. "If-None-Match" HTTP headers.
@@ -298,18 +313,22 @@ PHP_FUNCTION(http_match_etag)
 {
 	int etag_len;
 	char *etag;
+	zend_bool for_range = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &etag, &etag_len) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &etag, &etag_len, &for_range) != SUCCESS) {
 		RETURN_FALSE;
 	}
 
-	RETURN_BOOL(http_etag_match("HTTP_IF_NONE_MATCH", etag) || http_etag_match("HTTP_IF_MATCH", etag));
+	if (for_range) {
+		RETURN_BOOL(http_match_etag("HTTP_IF_MATCH", etag));
+	}
+	RETURN_BOOL(http_match_etag("HTTP_IF_NONE_MATCH", etag));
 }
 /* }}} */
 
 /* {{{ proto bool http_cache_last_modified([int timestamp_or_expires]])
  *
- * If timestamp_or_exires is greater than 0, it is handled as timestamp
+ * If timestamp_or_expires is greater than 0, it is handled as timestamp
  * and will be sent as date of last modification.  If it is 0 or omitted,
  * the current time will be sent as Last-Modified date.  If it's negative,
  * it is handled as expiration time in seconds, which means that if the
@@ -346,7 +365,7 @@ PHP_FUNCTION(http_cache_last_modified)
 		send_modified = last_modified;
 	}
 
-	RETURN_SUCCESS(http_cache_last_modified(last_modified, send_modified, HTTP_DEFAULT_CACHECONTROL, sizeof(HTTP_DEFAULT_CACHECONTROL) - 1));
+	RETURN_SUCCESS(http_cache_last_modified(last_modified, send_modified, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL)));
 }
 /* }}} */
 
@@ -363,24 +382,22 @@ PHP_FUNCTION(http_cache_last_modified)
  */
 PHP_FUNCTION(http_cache_etag)
 {
-	char *etag;
+	char *etag = NULL;
 	int etag_len = 0;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &etag, &etag_len) != SUCCESS) {
 		RETURN_FALSE;
 	}
 
-	RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, sizeof(HTTP_DEFAULT_CACHECONTROL) - 1));
+	RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL)));
 }
 /* }}} */
 
-/* {{{ proto string ob_httpetaghandler(string data, int mode)
+/* {{{ proto string ob_etaghandler(string data, int mode)
  *
  * For use with ob_start().
- * Note that this has to be started as first output buffer.
- * WARNING: Don't use with http_send_*().
  */
-PHP_FUNCTION(ob_httpetaghandler)
+PHP_FUNCTION(ob_etaghandler)
 {
 	char *data;
 	int data_len;
@@ -390,25 +407,40 @@ PHP_FUNCTION(ob_httpetaghandler)
 		RETURN_FALSE;
 	}
 
-	if (mode & PHP_OUTPUT_HANDLER_START) {
-		if (HTTP_G(etag_started)) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "ob_httpetaghandler can only be used once");
-			RETURN_STRINGL(data, data_len, 1);
-		}
-		http_send_header("Cache-Control: " HTTP_DEFAULT_CACHECONTROL);
-		HTTP_G(etag_started) = 1;
-	}
-
-    if (OG(ob_nesting_level) > 1) {
-        php_error_docref(NULL TSRMLS_CC, E_WARNING, "ob_httpetaghandler must be started prior to other output buffers");
-        RETURN_STRINGL(data, data_len, 1);
-    }
-
 	Z_TYPE_P(return_value) = IS_STRING;
 	http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), mode);
 }
 /* }}} */
 
+/* {{{ proto void http_throttle(double sec[, long bytes = 2097152])
+ *
+ * Use with http_send() API.
+ *
+ * Example:
+ * <pre>
+ * <?php
+ * // ~ 20 kbyte/s
+ * # http_throttle(1, 20000);
+ * # http_throttle(0.5, 10000);
+ * # http_throttle(0.1, 2000);
+ * http_send_file('document.pdf');
+ * ?>
+ * </pre>
+ */
+PHP_FUNCTION(http_throttle)
+{
+	long chunk_size;
+	double interval;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "dl", &interval, &chunk_size)) {
+		return;
+	}
+
+	HTTP_G(send).throttle_delay = interval;
+	HTTP_G(send).buffer_size = chunk_size;
+}
+/* }}} */
+
 /* {{{ proto void http_redirect([string url[, array params[, bool session,[ bool permanent]]]])
  *
  * Redirect to a given url.
@@ -426,51 +458,95 @@ PHP_FUNCTION(ob_httpetaghandler)
 PHP_FUNCTION(http_redirect)
 {
 	int url_len;
-	zend_bool session = 0, permanent = 0;
+	size_t query_len = 0;
+	zend_bool session = 0, permanent = 0, free_params = 0;
 	zval *params = NULL;
-	smart_str qstr = {0};
-	char *url, *URI, LOC[HTTP_URI_MAXLEN + 9], RED[HTTP_URI_MAXLEN * 2 + 34];
+	char *query = NULL, *url = NULL, *URI,
+		LOC[HTTP_URI_MAXLEN + sizeof("Location: ")],
+		RED[HTTP_URI_MAXLEN * 2 + sizeof("Redirecting to <a href=\"%s?%s\">%s?%s</a>.\n")];
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sa!/bb", &url, &url_len, &params, &session, &permanent) != SUCCESS) {
 		RETURN_FALSE;
 	}
 
 	/* append session info */
-	if (session && (PS(session_status) == php_session_active)) {
+	if (session) {
 		if (!params) {
+			free_params = 1;
 			MAKE_STD_ZVAL(params);
 			array_init(params);
 		}
-		if (add_assoc_string(params, PS(session_name), PS(id), 1) != SUCCESS) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not append session information");
+#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
 	}
 
 	/* treat params array with http_build_query() */
 	if (params) {
-		if (php_url_encode_hash_ex(Z_ARRVAL_P(params), &qstr, NULL,0,NULL,0,NULL,0,NULL TSRMLS_CC) != SUCCESS) {
-			if (qstr.c) {
-				efree(qstr.c);
+		if (SUCCESS != http_urlencode_hash_ex(Z_ARRVAL_P(params), 0, NULL, 0, &query, &query_len)) {
+			if (free_params) {
+				zval_dtor(params);
+				FREE_ZVAL(params);
+			}
+			if (query) {
+				efree(query);
 			}
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not encode query parameters");
 			RETURN_FALSE;
 		}
-		smart_str_0(&qstr);
 	}
 
-	URI = http_absolute_uri(url, NULL);
-	if (qstr.c) {
-		snprintf(LOC, HTTP_URI_MAXLEN + strlen("Location: "), "Location: %s?%s", URI, qstr.c);
-		sprintf(RED, "Redirecting to <a href=\"%s?%s\">%s?%s</a>.\n", URI, qstr.c, URI, qstr.c);
-		efree(qstr.c);
+	URI = http_absolute_uri(url);
+
+	if (query_len) {
+		snprintf(LOC, HTTP_URI_MAXLEN + sizeof("Location: "), "Location: %s?%s", URI, query);
+		sprintf(RED, "Redirecting to <a href=\"%s?%s\">%s?%s</a>.\n", URI, query, URI, query);
 	} else {
-		snprintf(LOC, HTTP_URI_MAXLEN + strlen("Location: "), "Location: %s", URI);
+		snprintf(LOC, HTTP_URI_MAXLEN + sizeof("Location: "), "Location: %s", URI);
 		sprintf(RED, "Redirecting to <a href=\"%s\">%s</a>.\n", URI, URI);
 	}
+	
 	efree(URI);
+	if (query) {
+		efree(query);
+	}
+	if (free_params) {
+		zval_dtor(params);
+		FREE_ZVAL(params);
+	}
 
-	if ((SUCCESS == http_send_header(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))) {
-		php_body_write(RED, strlen(RED) TSRMLS_CC);
+	if ((SUCCESS == http_send_header_string(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))) {
+		if (SG(request_info).request_method && strcmp(SG(request_info).request_method, "HEAD")) {
+			PHPWRITE(RED, strlen(RED));
+		}
 		RETURN_TRUE;
 	}
 	RETURN_FALSE;
@@ -491,8 +567,7 @@ PHP_FUNCTION(http_send_data)
 	}
 
 	convert_to_string_ex(&zdata);
-	http_send_header("Accept-Ranges: bytes");
-	RETURN_SUCCESS(http_send_data(zdata));
+	RETURN_SUCCESS(http_send_data(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata)));
 }
 /* }}} */
 
@@ -503,15 +578,17 @@ PHP_FUNCTION(http_send_data)
  */
 PHP_FUNCTION(http_send_file)
 {
-	zval *zfile;
+	char *file;
+	int flen = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zfile) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &file, &flen) != SUCCESS) {
+		RETURN_FALSE;
+	}
+	if (!flen) {
 		RETURN_FALSE;
 	}
 
-	convert_to_string_ex(&zfile);
-	http_send_header("Accept-Ranges: bytes");
-	RETURN_SUCCESS(http_send_file(zfile));
+	RETURN_SUCCESS(http_send_file(file));
 }
 /* }}} */
 
@@ -530,7 +607,6 @@ PHP_FUNCTION(http_send_stream)
 	}
 
 	php_stream_from_zval(file, &zstream);
-	http_send_header("Accept-Ranges: bytes");
 	RETURN_SUCCESS(http_send_stream(file));
 }
 /* }}} */
@@ -549,7 +625,7 @@ PHP_FUNCTION(http_chunked_decode)
 		RETURN_FALSE;
 	}
 
-	if (SUCCESS == http_chunked_decode(encoded, encoded_len, &decoded, &decoded_len)) {
+	if (NULL != http_chunked_decode(encoded, encoded_len, &decoded, &decoded_len)) {
 		RETURN_STRINGL(decoded, decoded_len, 0);
 	} else {
 		RETURN_FALSE;
@@ -566,7 +642,7 @@ PHP_FUNCTION(http_chunked_decode)
  * <?php
  * array(
  *     0 => array(
- *         'Status' => '200 Ok',
+ *         'Response Status' => '200 Ok',
  *         'Content-Type' => 'text/plain',
  *         'Content-Language' => 'en-US'
  *     ),
@@ -577,26 +653,25 @@ PHP_FUNCTION(http_chunked_decode)
  */
 PHP_FUNCTION(http_split_response)
 {
-	zval *zresponse, *zbody, *zheaders;
+	char *response, *body;
+	int response_len;
+	size_t body_len;
+	zval *zheaders;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zresponse) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &response, &response_len) != SUCCESS) {
 		RETURN_FALSE;
 	}
 
-	convert_to_string_ex(&zresponse);
-
-	MAKE_STD_ZVAL(zbody);
 	MAKE_STD_ZVAL(zheaders);
 	array_init(zheaders);
 
-	if (SUCCESS != http_split_response(zresponse, zheaders, zbody)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP response");
+	if (SUCCESS != http_split_response(response, response_len, Z_ARRVAL_P(zheaders), &body, &body_len)) {
 		RETURN_FALSE;
 	}
 
 	array_init(return_value);
 	add_index_zval(return_value, 0, zheaders);
-	add_index_zval(return_value, 1, zbody);
+	add_index_stringl(return_value, 1, body, body_len, 0);
 }
 /* }}} */
 
@@ -605,7 +680,7 @@ PHP_FUNCTION(http_split_response)
  */
 PHP_FUNCTION(http_parse_headers)
 {
-	char *header, *rnrn;
+	char *header;
 	int header_len;
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &header, &header_len)) {
@@ -613,12 +688,7 @@ PHP_FUNCTION(http_parse_headers)
 	}
 
 	array_init(return_value);
-
-	if (rnrn = strstr(header, HTTP_CRLF HTTP_CRLF)) {
-		header_len = rnrn - header + 2;
-	}
-	if (SUCCESS != http_parse_headers(header, header_len, return_value)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP header");
+	if (SUCCESS != http_parse_headers(header, return_value)) {
 		zval_dtor(return_value);
 		RETURN_FALSE;
 	}
@@ -627,18 +697,54 @@ PHP_FUNCTION(http_parse_headers)
 
 /* {{{ proto array http_get_request_headers(void)
  *
+ * Get a list of incoming HTTP headers.
  */
 PHP_FUNCTION(http_get_request_headers)
 {
-	if (ZEND_NUM_ARGS()) {
-		WRONG_PARAM_COUNT;
-	}
+	NO_ARGS;
 
 	array_init(return_value);
 	http_get_request_headers(return_value);
 }
 /* }}} */
 
+/* {{{ proto string http_get_request_body(void)
+ *
+ * Get the raw request body (e.g. POST or PUT data).
+ */
+PHP_FUNCTION(http_get_request_body)
+{
+	char *body;
+	size_t length;
+
+	NO_ARGS;
+
+	if (SUCCESS == http_get_request_body(&body, &length)) {
+		RETURN_STRINGL(body, (int) length, 0);
+	} else {
+		RETURN_NULL();
+	}
+}
+/* }}} */
+
+/* {{{ proto bool http_match_request_header(string header, string value[, bool match_case = false])
+ *
+ * Match an incoming HTTP header.
+ */
+PHP_FUNCTION(http_match_request_header)
+{
+	char *header, *value;
+	int header_len, value_len;
+	zend_bool match_case = 0;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|b", &header, &header_len, &value, &value_len, &match_case)) {
+		RETURN_FALSE;
+	}
+
+	RETURN_BOOL(http_match_request_header_ex(header, value, match_case));
+}
+/* }}} */
+
 /* {{{ HAVE_CURL */
 #ifdef HTTP_HAVE_CURL
 
@@ -669,6 +775,14 @@ PHP_FUNCTION(http_get_request_headers)
  *  - cookies:          array, list of cookies as associative array
  *                      like array("cookie" => "value")
  *  - cookiestore:      string, path to a file where cookies are/will be stored
+ *  - resume:           int, byte offset to start the download from;
+ *                      if the server supports ranges
+ *  - 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
+ *  - timeout:          int, seconds the request may take
+ *  - connecttimeout:   int, seconds the connect may take
+ *  - onprogress:       mixed, progress callback
  * </pre>
  *
  * The optional third parameter will be filled with some additional information
@@ -706,10 +820,10 @@ PHP_FUNCTION(http_get_request_headers)
  */
 PHP_FUNCTION(http_get)
 {
-	char *URL, *data = NULL;
-	size_t data_len = 0;
-	int URL_len;
 	zval *options = NULL, *info = NULL;
+	char *URL;
+	int URL_len;
+	phpstr response;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a/!z", &URL, &URL_len, &options, &info) != SUCCESS) {
 		RETURN_FALSE;
@@ -720,8 +834,9 @@ PHP_FUNCTION(http_get)
 		array_init(info);
 	}
 
-	if (SUCCESS == http_get(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
-		RETURN_STRINGL(data, data_len, 0);
+	phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
+	if (SUCCESS == http_get(URL, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
+		RETURN_PHPSTR_VAL(response);
 	} else {
 		RETURN_FALSE;
 	}
@@ -736,10 +851,10 @@ PHP_FUNCTION(http_get)
  */
 PHP_FUNCTION(http_head)
 {
-	char *URL, *data = NULL;
-	size_t data_len = 0;
-	int URL_len;
 	zval *options = NULL, *info = NULL;
+	char *URL;
+	int URL_len;
+	phpstr response;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a/!z", &URL, &URL_len, &options, &info) != SUCCESS) {
 		RETURN_FALSE;
@@ -750,8 +865,9 @@ PHP_FUNCTION(http_head)
 		array_init(info);
 	}
 
-	if (SUCCESS == http_head(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
-		RETURN_STRINGL(data, data_len, 0);
+	phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
+	if (SUCCESS == http_head(URL, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
+		RETURN_PHPSTR_VAL(response);
 	} else {
 		RETURN_FALSE;
 	}
@@ -766,10 +882,11 @@ PHP_FUNCTION(http_head)
  */
 PHP_FUNCTION(http_post_data)
 {
-	char *URL, *postdata, *data = NULL;
-	size_t data_len = 0;
-	int postdata_len, URL_len;
 	zval *options = NULL, *info = NULL;
+	char *URL, *postdata;
+	int postdata_len, URL_len;
+	phpstr response;
+	http_request_body body;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &postdata, &postdata_len, &options, &info) != SUCCESS) {
 		RETURN_FALSE;
@@ -780,28 +897,125 @@ PHP_FUNCTION(http_post_data)
 		array_init(info);
 	}
 
-	if (SUCCESS == http_post_data(URL, postdata, (size_t) postdata_len, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
-		RETURN_STRINGL(data, data_len, 0);
+	body.type = HTTP_REQUEST_BODY_CSTRING;
+	body.data = postdata;
+	body.size = postdata_len;
+
+	phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
+	if (SUCCESS == http_post(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
+		RETVAL_PHPSTR_VAL(response);
 	} else {
-		RETURN_FALSE;
+		RETVAL_FALSE;
 	}
 }
 /* }}} */
 
-/* {{{ proto string http_post_array(string url, array data[, array options[, array &info]])
+/* {{{ proto string http_post_fields(string url, array data[, array files[, array options[, array &info]]])
  *
  * Performs an HTTP POST request, posting www-form-urlencoded array data.
  * Returns the HTTP response as string.
  * See http_get() for a full list of available options.
  */
-PHP_FUNCTION(http_post_array)
+PHP_FUNCTION(http_post_fields)
+{
+	zval *options = NULL, *info = NULL, *fields, *files = NULL;
+	char *URL;
+	int URL_len;
+	phpstr response;
+	http_request_body body;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|aa/!z", &URL, &URL_len, &fields, &files, &options, &info) != SUCCESS) {
+		RETURN_FALSE;
+	}
+
+	if (SUCCESS != http_request_body_fill(&body, Z_ARRVAL_P(fields), files ? Z_ARRVAL_P(files) : NULL)) {
+		RETURN_FALSE;
+	}
+
+	if (info) {
+		zval_dtor(info);
+		array_init(info);
+	}
+
+	phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
+	if (SUCCESS == http_post(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
+		RETVAL_PHPSTR_VAL(response);
+	} else {
+		RETVAL_FALSE;
+	}
+	http_request_body_dtor(&body);
+}
+/* }}} */
+
+/* {{{ proto string http_put_file(string url, string file[, array options[, array &info]])
+ *
+ * Performs an HTTP PUT request, uploading file.
+ * Returns the HTTP response as string.
+ * See http_get() for a full list of available options.
+ */
+PHP_FUNCTION(http_put_file)
+{
+	char *URL, *file;
+	int URL_len, f_len;
+	zval *options = NULL, *info = NULL;
+	phpstr response;
+	php_stream *stream;
+	php_stream_statbuf ssb;
+	http_request_body body;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &file, &f_len, &options, &info)) {
+		RETURN_FALSE;
+	}
+
+	if (!(stream = php_stream_open_wrapper(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL))) {
+		RETURN_FALSE;
+	}
+	if (php_stream_stat(stream, &ssb)) {
+		php_stream_close(stream);
+		RETURN_FALSE;
+	}
+
+	if (info) {
+		zval_dtor(info);
+		array_init(info);
+	}
+
+	body.type = HTTP_REQUEST_BODY_UPLOADFILE;
+	body.data = stream;
+	body.size = ssb.sb.st_size;
+
+	phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
+	if (SUCCESS == http_put(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
+		RETVAL_PHPSTR_VAL(response);
+	} else {
+		RETVAL_FALSE;
+	}
+	http_request_body_dtor(&body);
+}
+/* }}} */
+
+/* {{{ proto string http_put_stream(string url, resource stream[, array options[, array &info]])
+ *
+ * Performs an HTTP PUT request, uploading stream.
+ * Returns the HTTP response as string.
+ * See http_get() for a full list of available options.
+ */
+PHP_FUNCTION(http_put_stream)
 {
-	char *URL, *data = NULL;
-	size_t data_len = 0;
+	zval *resource, *options = NULL, *info = NULL;
+	char *URL;
 	int URL_len;
-	zval *options = NULL, *info = NULL, *postdata;
+	phpstr response;
+	php_stream *stream;
+	php_stream_statbuf ssb;
+	http_request_body body;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|a/!z", &URL, &URL_len, &postdata, &options, &info) != SUCCESS) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sr|a/!z", &URL, &URL_len, &resource, &options, &info)) {
+		RETURN_FALSE;
+	}
+
+	php_stream_from_zval(stream, &resource);
+	if (php_stream_stat(stream, &ssb)) {
 		RETURN_FALSE;
 	}
 
@@ -810,14 +1024,125 @@ PHP_FUNCTION(http_post_array)
 		array_init(info);
 	}
 
-	if (SUCCESS == http_post_array(URL, Z_ARRVAL_P(postdata), HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
-		RETURN_STRINGL(data, data_len, 0);
+	body.type = HTTP_REQUEST_BODY_UPLOADFILE;
+	body.data = stream;
+	body.size = ssb.sb.st_size;
+
+	phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
+	if (SUCCESS == http_put(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
+		RETURN_PHPSTR_VAL(response);
 	} else {
+		RETURN_NULL();
+	}
+}
+/* }}} */
+
+/* {{{ proto long http_request_method_register(string method)
+ *
+ * Register a custom request method.
+ */
+PHP_FUNCTION(http_request_method_register)
+{
+	char *method;
+	int *method_len;
+	unsigned long existing;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len)) {
+		RETURN_FALSE;
+	}
+	if (existing = http_request_method_exists(1, 0, method)) {
+		RETURN_LONG((long) existing);
+	}
+
+	RETVAL_LONG((long) http_request_method_register(method));
+}
+/* }}} */
+
+/* {{{ proto bool http_request_method_unregister(mixed method)
+ *
+ * Unregister a previously registered custom request method.
+ */
+PHP_FUNCTION(http_request_method_unregister)
+{
+	zval *method;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &method)) {
 		RETURN_FALSE;
 	}
+
+	switch (Z_TYPE_P(method))
+	{
+		case IS_OBJECT:
+			convert_to_string(method);
+		case IS_STRING:
+#include "zend_operators.h"
+			if (is_numeric_string(Z_STRVAL_P(method), Z_STRLEN_P(method), NULL, NULL, 1)) {
+				convert_to_long(method);
+			} else {
+				unsigned long mn;
+				if (!(mn = http_request_method_exists(1, 0, Z_STRVAL_P(method)))) {
+					RETURN_FALSE;
+				}
+				zval_dtor(method);
+				ZVAL_LONG(method, (long)mn);
+			}
+		case IS_LONG:
+			RETURN_SUCCESS(http_request_method_unregister(Z_LVAL_P(method)));
+		default:
+			RETURN_FALSE;
+	}
 }
 /* }}} */
 
+/* {{{ proto long http_request_method_exists(mixed method)
+ *
+ * Check if a request method is registered (or available by default).
+ */
+PHP_FUNCTION(http_request_method_exists)
+{
+	IF_RETVAL_USED {
+		zval *method;
+
+		if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &method)) {
+			RETURN_FALSE;
+		}
+
+		switch (Z_TYPE_P(method))
+		{
+			case IS_OBJECT:
+				convert_to_string(method);
+			case IS_STRING:
+				if (is_numeric_string(Z_STRVAL_P(method), Z_STRLEN_P(method), NULL, NULL, 1)) {
+					convert_to_long(method);
+				} else {
+					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));
+			default:
+				RETURN_FALSE;
+		}
+	}
+}
+/* }}} */
+
+/* {{{ proto string http_request_method_name(long method)
+ *
+ * Get the literal string representation of a standard or registered request method.
+ */
+PHP_FUNCTION(http_request_method_name)
+{
+	IF_RETVAL_USED {
+		long method;
+
+		if ((SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &method)) || (method < 0)) {
+			RETURN_FALSE;
+		}
+
+		RETURN_STRING(estrdup(http_request_method_name((unsigned long) method)), 0);
+	}
+}
+/* }}} */
 #endif
 /* }}} HAVE_CURL */
 
@@ -846,18 +1171,18 @@ PHP_FUNCTION(http_auth_basic)
 		realm = "Restricted";
 	}
 
-	if (SUCCESS != http_auth_credentials(&suser, &spass)) {
-		http_auth_header("Basic", realm);
+	if (SUCCESS != http_auth_basic_credentials(&suser, &spass)) {
+		http_auth_basic_header(realm);
 		RETURN_FALSE;
 	}
 
 	if (strcasecmp(suser, user)) {
-		http_auth_header("Basic", realm);
+		http_auth_basic_header(realm);
 		RETURN_FALSE;
 	}
 
 	if (strcmp(spass, pass)) {
-		http_auth_header("Basic", realm);
+		http_auth_basic_header(realm);
 		RETURN_FALSE;
 	}
 
@@ -879,7 +1204,6 @@ PHP_FUNCTION(http_auth_basic)
  *     }
  *     return false;
  * }
- *
  * if (!http_auth_basic_cb('auth_cb')) {
  *     die('<h1>Authorization failed</h1>');
  * }
@@ -900,8 +1224,8 @@ PHP_FUNCTION(http_auth_basic_cb)
 		realm = "Restricted";
 	}
 
-	if (SUCCESS != http_auth_credentials(&user, &pass)) {
-		http_auth_header("Basic", realm);
+	if (SUCCESS != http_auth_basic_credentials(&user, &pass)) {
+		http_auth_basic_header(realm);
 		RETURN_FALSE;
 	}
 	{
@@ -924,7 +1248,7 @@ PHP_FUNCTION(http_auth_basic_cb)
 		efree(zparams[1]);
 
 		if (!result) {
-			http_auth_header("Basic", realm);
+			http_auth_basic_header(realm);
 		}
 
 		RETURN_BOOL(result);
@@ -932,6 +1256,51 @@ PHP_FUNCTION(http_auth_basic_cb)
 }
 /* }}}*/
 
+/* {{{ 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, "z|ss", &formdata, &prefix, &prefix_len, &arg_sep, &arg_sep_len) != SUCCESS) {
+		RETURN_FALSE;
+	}
+
+	if (Z_TYPE_P(formdata) != IS_ARRAY && Z_TYPE_P(formdata) != IS_OBJECT) {
+		http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Parameter 1 expected to be Array or Object.  Incorrect value given.");
+		RETURN_FALSE;
+	}
+
+	if (!arg_sep_len) {
+		arg_sep = HTTP_URL_ARGSEP;
+	}
+
+	formstr = phpstr_new();
+	if (SUCCESS != http_urlencode_hash_implementation_ex(HASH_OF(formdata), formstr, arg_sep, prefix, prefix_len, NULL, 0, NULL, 0, (Z_TYPE_P(formdata) == IS_OBJECT ? formdata : NULL))) {
+		phpstr_free(formstr);
+		RETURN_FALSE;
+	}
+
+	if (!formstr->used) {
+		phpstr_free(formstr);
+		RETURN_NULL();
+	}
+
+	RETURN_PHPSTR_PTR(formstr);
+}
+/* }}} */
+#endif /* !ZEND_ENGINE_2 */
+/* }}} */
+
+PHP_FUNCTION(http_test)
+{
+}
 
 /*
  * Local variables:
@@ -941,3 +1310,4 @@ PHP_FUNCTION(http_auth_basic_cb)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
+