X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=a46d02883b1dc9bc5d2487bc9a54c4ee2a020b06;hp=ffc84c3687ab283cbe827620f4ea9261bf1e0a63;hb=64b8eb68455c36e7e153014deaf52a6f9d2de39c;hpb=2b7331c5fdb73cb48f7f60a8e4ec88766581ced3

diff --git a/http_functions.c b/http_functions.c
index ffc84c3..a46d028 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -18,30 +18,29 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-
 #include "php.h"
+
+#include "SAPI.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "ext/session/php_session.h"
 #include "ext/standard/php_string.h"
 
-#include "SAPI.h"
-
-#include "phpstr/phpstr.h"
-
 #include "php_http.h"
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_auth_api.h"
-#include "php_http_curl_api.h"
+#include "php_http_request_api.h"
 #include "php_http_cache_api.h"
-#include "php_http_curl_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_EXTERN_MODULE_GLOBALS(http)
 
 /* {{{ proto string http_date([int timestamp])
@@ -327,7 +326,7 @@ PHP_FUNCTION(http_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
@@ -411,6 +410,35 @@ PHP_FUNCTION(ob_etaghandler)
 }
 /* }}} */
 
+/* {{{ 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.
@@ -431,7 +459,7 @@ PHP_FUNCTION(http_redirect)
 	size_t query_len = 0;
 	zend_bool session = 0, permanent = 0;
 	zval *params = NULL;
-	char *query, *url, *URI,
+	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")];
 
@@ -491,7 +519,6 @@ PHP_FUNCTION(http_send_data)
 	}
 
 	convert_to_string_ex(&zdata);
-	http_send_header("Accept-Ranges: bytes");
 	RETURN_SUCCESS(http_send_data(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata)));
 }
 /* }}} */
@@ -513,7 +540,6 @@ PHP_FUNCTION(http_send_file)
 		RETURN_FALSE;
 	}
 
-	http_send_header("Accept-Ranges: bytes");
 	RETURN_SUCCESS(http_send_file(file));
 }
 /* }}} */
@@ -533,7 +559,6 @@ PHP_FUNCTION(http_send_stream)
 	}
 
 	php_stream_from_zval(file, &zstream);
-	http_send_header("Accept-Ranges: bytes");
 	RETURN_SUCCESS(http_send_stream(file));
 }
 /* }}} */
@@ -552,7 +577,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;
@@ -569,7 +594,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'
  *     ),
@@ -580,26 +605,26 @@ 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(zresponse);
-
-	MAKE_STD_ZVAL(zbody);
 	MAKE_STD_ZVAL(zheaders);
 	array_init(zheaders);
 
-	if (SUCCESS != http_split_response(zresponse, zheaders, zbody)) {
+	if (SUCCESS != http_split_response(response, response_len, Z_ARRVAL_P(zheaders), &body, &body_len)) {
 		http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP response");
 		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);
 }
 /* }}} */
 
@@ -608,7 +633,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)) {
@@ -616,11 +641,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)) {
+	if (SUCCESS != http_parse_headers(header, return_value)) {
 		http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP headers");
 		zval_dtor(return_value);
 		RETURN_FALSE;
@@ -630,6 +651,7 @@ 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)
 {
@@ -640,6 +662,43 @@ PHP_FUNCTION(http_get_request_headers)
 }
 /* }}} */
 
+/* {{{ 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, result = 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
 
@@ -677,6 +736,8 @@ PHP_FUNCTION(http_get_request_headers)
  *  - 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
+ *  - ondebug:          mixed, debug callback
  * </pre>
  *
  * The optional third parameter will be filled with some additional information
@@ -780,6 +841,7 @@ PHP_FUNCTION(http_post_data)
 	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;
@@ -790,29 +852,38 @@ PHP_FUNCTION(http_post_data)
 		array_init(info);
 	}
 
+	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_data(URL, postdata, (size_t) postdata_len, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
-		RETURN_PHPSTR_VAL(response);
+	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, *postdata;
+	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 (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|a/!z", &URL, &URL_len, &postdata, &options, &info) != SUCCESS) {
+	if (SUCCESS != http_request_body_fill(&body, Z_ARRVAL_P(fields), files ? Z_ARRVAL_P(files) : NULL)) {
 		RETURN_FALSE;
 	}
 
@@ -822,14 +893,211 @@ PHP_FUNCTION(http_post_array)
 	}
 
 	phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
-	if (SUCCESS == http_post_array(URL, Z_ARRVAL_P(postdata), options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
+	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)
+{
+	zval *resource, *options = NULL, *info = NULL;
+	char *URL;
+	int URL_len;
+	phpstr response;
+	php_stream *stream;
+	php_stream_statbuf ssb;
+	http_request_body body;
+
+	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;
+	}
+
+	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)) {
 		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 */
 
@@ -858,18 +1126,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;
 	}
 
@@ -911,8 +1179,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;
 	}
 	{
@@ -935,7 +1203,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);
@@ -987,6 +1255,7 @@ PHP_FUNCTION(http_build_query)
 
 PHP_FUNCTION(http_test)
 {
+	RETURN_NULL();
 }
 
 /*
@@ -997,4 +1266,3 @@ PHP_FUNCTION(http_test)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
-