X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=61fa5196ecae57bb4ad1812375a72dfba8f690b3;hp=6afde9455f8773e917d8403afb1cd068865ad33c;hb=935edd6c43530eb35c79d8ec8e0920f7d07f5f62;hpb=6dd728f3faa5dcedf81f3f9a6cfe2e41993efc0b

diff --git a/http_functions.c b/http_functions.c
index 6afde94..61fa519 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -15,29 +15,34 @@
 
 /* $Id$ */
 
-#define _WINSOCKAPI_
-#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
-
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
 
 #include "php.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"
 
+#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_std_defs.h"
+#include "php_http_cache_api.h"
+#include "php_http_curl_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"
 
-ZEND_DECLARE_MODULE_GLOBALS(http)
+ZEND_EXTERN_MODULE_GLOBALS(http)
 
 /* {{{ proto string http_date([int timestamp])
  *
@@ -61,7 +66,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,
@@ -80,14 +85,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);
 }
 /* }}} */
 
@@ -197,7 +203,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(E_WARNING, HTTP_E_HEADER, "Invalid HTTP status code (100-510): %d", status);
 		RETURN_FALSE;
 	}
 
@@ -243,7 +249,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));
 }
@@ -290,9 +296,9 @@ PHP_FUNCTION(http_match_modified)
 	}
 
 	if (for_range) {
-		RETURN_BOOL(http_modified_match("HTTP_IF_UNMODIFIED_SINCE", t));
+		RETURN_BOOL(http_match_last_modified("HTTP_IF_UNMODIFIED_SINCE", t));
 	}
-	RETURN_BOOL(http_modified_match("HTTP_IF_MODIFIED_SINCE", t));
+	RETURN_BOOL(http_match_last_modified("HTTP_IF_MODIFIED_SINCE", t));
 }
 /* }}} */
 
@@ -313,15 +319,15 @@ PHP_FUNCTION(http_match_etag)
 	}
 
 	if (for_range) {
-		RETURN_BOOL(http_etag_match("HTTP_IF_MATCH", etag));
+		RETURN_BOOL(http_match_etag("HTTP_IF_MATCH", etag));
 	}
-	RETURN_BOOL(http_etag_match("HTTP_IF_NONE_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
@@ -358,7 +364,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)));
 }
 /* }}} */
 
@@ -375,24 +381,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;
@@ -402,20 +406,6 @@ 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);
 }
@@ -456,7 +446,7 @@ PHP_FUNCTION(http_redirect)
 			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");
+			http_error(E_WARNING, HTTP_E_ENCODE, "Could not append session information");
 		}
 	}
 
@@ -467,7 +457,8 @@ PHP_FUNCTION(http_redirect)
 		}
 	}
 
-	URI = http_absolute_uri(url, NULL);
+	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);
@@ -500,7 +491,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)));
 }
 /* }}} */
@@ -522,7 +512,6 @@ PHP_FUNCTION(http_send_file)
 		RETURN_FALSE;
 	}
 
-	http_send_header("Accept-Ranges: bytes");
 	RETURN_SUCCESS(http_send_file(file));
 }
 /* }}} */
@@ -542,7 +531,6 @@ PHP_FUNCTION(http_send_stream)
 	}
 
 	php_stream_from_zval(file, &zstream);
-	http_send_header("Accept-Ranges: bytes");
 	RETURN_SUCCESS(http_send_stream(file));
 }
 /* }}} */
@@ -561,7 +549,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;
@@ -578,9 +566,8 @@ PHP_FUNCTION(http_chunked_decode)
  * <?php
  * array(
  *     0 => array(
- *         'Status' => '200 Ok',
+ *         'Response Status' => '200 Ok',
  *         'Content-Type' => 'text/plain',
-
  *         'Content-Language' => 'en-US'
  *     ),
  *     1 => "Hello World!"
@@ -596,14 +583,14 @@ PHP_FUNCTION(http_split_response)
 		RETURN_FALSE;
 	}
 
-	convert_to_string_ex(&zresponse);
+	convert_to_string(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");
+		http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP response");
 		RETURN_FALSE;
 	}
 
@@ -618,7 +605,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)) {
@@ -626,12 +613,8 @@ 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)) {
+		http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP headers");
 		zval_dtor(return_value);
 		RETURN_FALSE;
 	}
@@ -643,9 +626,7 @@ PHP_FUNCTION(http_parse_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);
@@ -682,6 +663,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
@@ -719,10 +708,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;
@@ -733,8 +722,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;
 	}
@@ -749,10 +739,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;
@@ -763,8 +753,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;
 	}
@@ -779,10 +770,10 @@ 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;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &postdata, &postdata_len, &options, &info) != SUCCESS) {
 		RETURN_FALSE;
@@ -793,8 +784,9 @@ 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);
+	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);
 	} else {
 		RETURN_FALSE;
 	}
@@ -809,10 +801,10 @@ PHP_FUNCTION(http_post_data)
  */
 PHP_FUNCTION(http_post_array)
 {
-	char *URL, *data = NULL;
-	size_t data_len = 0;
-	int URL_len;
 	zval *options = NULL, *info = NULL, *postdata;
+	char *URL;
+	int URL_len;
+	phpstr response;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|a/!z", &URL, &URL_len, &postdata, &options, &info) != SUCCESS) {
 		RETURN_FALSE;
@@ -823,8 +815,9 @@ 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);
+	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)) {
+		RETURN_PHPSTR_VAL(response);
 	} else {
 		RETURN_FALSE;
 	}
@@ -892,7 +885,6 @@ PHP_FUNCTION(http_auth_basic)
  *     }
  *     return false;
  * }
- *
  * if (!http_auth_basic_cb('auth_cb')) {
  *     die('<h1>Authorization failed</h1>');
  * }
@@ -948,43 +940,50 @@ PHP_FUNCTION(http_auth_basic_cb)
 /* {{{ Sara Golemons http_build_query() */
 #ifndef ZEND_ENGINE_2
 
-/* {{{ proto string http_build_query(mixed formdata [, string prefix])
+/* {{{ 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;
-	int prefix_len = 0;
-	smart_str formstr = {0};
+	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|s", &formdata, &prefix, &prefix_len) != SUCCESS) {
+	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) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter 1 expected to be Array or Object.  Incorrect value given.");
+		http_error(E_WARNING, HTTP_E_PARAM, "Parameter 1 expected to be Array or Object.  Incorrect value given.");
 		RETURN_FALSE;
 	}
 
-	if (php_url_encode_hash_ex(HASH_OF(formdata), &formstr, prefix, prefix_len, NULL, 0, NULL, 0, (Z_TYPE_P(formdata) == IS_OBJECT ? formdata : NULL) TSRMLS_CC) == FAILURE) {
-		if (formstr.c) {
-			efree(formstr.c);
-		}
+	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.c) {
+	if (!formstr->used) {
+		phpstr_free(formstr);
 		RETURN_NULL();
 	}
 
-	smart_str_0(&formstr);
-
-	RETURN_STRINGL(formstr.c, formstr.len, 0);
+	RETURN_PHPSTR_PTR(formstr);
 }
 /* }}} */
 #endif /* !ZEND_ENGINE_2 */
 /* }}} */
 
+PHP_FUNCTION(http_test)
+{
+	RETURN_NULL();
+}
+
 /*
  * Local variables:
  * tab-width: 4
@@ -993,3 +992,4 @@ PHP_FUNCTION(http_build_query)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
+