X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=22542083ee1e88b3a01bbbe46909ae644f1dc281;hp=3f4b7a66072b9af63905daee897931fffcc86b49;hb=dbc4ec02cd319000b5c8589910047cfe6d5738be;hpb=ab7ffb9d04418a394dec4604f88a3aa5d94b9a08

diff --git a/http_api.c b/http_api.c
index 3f4b7a6..2254208 100644
--- a/http_api.c
+++ b/http_api.c
@@ -12,13 +12,9 @@
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
+#define HTTP_WANT_SAPI
 #include "php_http.h"
 
-#include "SAPI.h"
 #include "php_output.h"
 #include "ext/standard/url.h"
 
@@ -37,6 +33,11 @@ PHP_MINIT_FUNCTION(http_support)
 	HTTP_LONG_CONSTANT("HTTP_SUPPORT_ENCODINGS", HTTP_SUPPORT_ENCODINGS);
 	HTTP_LONG_CONSTANT("HTTP_SUPPORT_SSLREQUESTS", HTTP_SUPPORT_SSLREQUESTS);
 	
+	HTTP_LONG_CONSTANT("HTTP_PARAMS_ALLOW_COMMA", HTTP_PARAMS_ALLOW_COMMA);
+	HTTP_LONG_CONSTANT("HTTP_PARAMS_ALLOW_FAILURE", HTTP_PARAMS_ALLOW_FAILURE);
+	HTTP_LONG_CONSTANT("HTTP_PARAMS_RAISE_ERROR", HTTP_PARAMS_RAISE_ERROR);
+	HTTP_LONG_CONSTANT("HTTP_PARAMS_DEFAULT", HTTP_PARAMS_DEFAULT);
+	
 	return SUCCESS;
 }
 
@@ -88,99 +89,6 @@ char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool x
 }
 /* }}} */
 
-/* {{{ */
-void _http_key_list_default_decoder(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC)
-{
-	*decoded = estrndup(encoded, encoded_len);
-	*decoded_len = (size_t) php_url_decode(*decoded, encoded_len);
-}
-/* }}} */
-
-/* {{{ */
-STATUS _http_parse_key_list(const char *list, HashTable *items, char separator, http_key_list_decode_t decode, zend_bool first_entry_is_name_value_pair TSRMLS_DC)
-{
-	const char *key = list, *val = NULL;
-	int vallen = 0, keylen = 0, done = 0;
-	zval array;
-
-	INIT_ZARR(array, items);
-
-	if (!(val = strchr(list, '='))) {
-		return FAILURE;
-	}
-
-#define HTTP_KEYLIST_VAL(array, k, str, len) \
-	{ \
-		char *decoded; \
-		size_t decoded_len; \
-		if (decode) { \
-			decode(str, len, &decoded, &decoded_len TSRMLS_CC); \
-		} else { \
-			decoded_len = len; \
-			decoded = estrndup(str, decoded_len); \
-		} \
-		add_assoc_stringl(array, k, decoded, decoded_len, 0); \
-	}
-#define HTTP_KEYLIST_FIXKEY() \
-	{ \
-			while (isspace(*key)) ++key; \
-			keylen = val - key; \
-			while (isspace(key[keylen - 1])) --keylen; \
-	}
-#define HTTP_KEYLIST_FIXVAL() \
-	{ \
-			++val; \
-			while (isspace(*val)) ++val; \
-			vallen = key - val; \
-			while (isspace(val[vallen - 1])) --vallen; \
-	}
-
-	HTTP_KEYLIST_FIXKEY();
-
-	if (first_entry_is_name_value_pair) {
-		HTTP_KEYLIST_VAL(&array, "name", key, keylen);
-
-		/* just one name=value */
-		if (!(key = strchr(val, separator))) {
-			key = val + strlen(val);
-			HTTP_KEYLIST_FIXVAL();
-			HTTP_KEYLIST_VAL(&array, "value", val, vallen);
-			return SUCCESS;
-		}
-		/* additional info appended */
-		else {
-			HTTP_KEYLIST_FIXVAL();
-			HTTP_KEYLIST_VAL(&array, "value", val, vallen);
-		}
-	}
-
-	do {
-		char *keydup = NULL;
-
-		if (!(val = strchr(key, '='))) {
-			break;
-		}
-
-		/* start at 0 if first_entry_is_name_value_pair==0 */
-		if (zend_hash_num_elements(items)) {
-			++key;
-		}
-
-		HTTP_KEYLIST_FIXKEY();
-		keydup = estrndup(key, keylen);
-		if (!(key = strchr(val, separator))) {
-			done = 1;
-			key = val + strlen(val);
-		}
-		HTTP_KEYLIST_FIXVAL();
-		HTTP_KEYLIST_VAL(&array, keydup, val, vallen);
-		efree(keydup);
-	} while (!done);
-
-	return SUCCESS;
-}
-/* }}} */
-
 /* {{{ void http_error(long, long, char*) */
 void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
 {
@@ -208,12 +116,12 @@ void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC)
 	struct tm nowtm;
 	char datetime[20] = {0};
 	
-	time(&now);
+	now = HTTP_GET_REQUEST_TIME();
 	strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm));
 
 #define HTTP_LOG_WRITE(file, type, msg) \
 	if (file && *file) { \
-	 	php_stream *log = php_stream_open_wrapper(file, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); \
+	 	php_stream *log = php_stream_open_wrapper_ex(file, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT); \
 		 \
 		if (log) { \
 			php_stream_printf(log TSRMLS_CC, "%s\t[%s]\t%s\t<%s>%s", datetime, type, msg, SG(request_info).request_uri, PHP_EOL); \
@@ -223,7 +131,7 @@ void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC)
 	}
 	
 	HTTP_LOG_WRITE(file, ident, message);
-	HTTP_LOG_WRITE(HTTP_G(log).composite, ident, message);
+	HTTP_LOG_WRITE(HTTP_G->log.composite, ident, message);
 }
 /* }}} */
 
@@ -244,27 +152,28 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
 		return FAILURE;
 	}
 	
-	php_end_ob_buffers(0 TSRMLS_CC);
+	if (!OG(ob_lock)) {
+		php_end_ob_buffers(0 TSRMLS_CC);
+	}
 	if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
 		PHPWRITE(body, strlen(body));
 	}
 	
-	switch (status)
-	{
-		case 301:	http_log(HTTP_G(log).redirect, "301-REDIRECT", header);			break;
-		case 302:	http_log(HTTP_G(log).redirect, "302-REDIRECT", header);			break;
-		case 303:	http_log(HTTP_G(log).redirect, "303-REDIRECT", header);			break;
-		case 305:	http_log(HTTP_G(log).redirect, "305-REDIRECT", header);			break;
-		case 307:	http_log(HTTP_G(log).redirect, "307-REDIRECT", header);			break;
-		case 304:	http_log(HTTP_G(log).cache, "304-CACHE", header);				break;
-		case 405:	http_log(HTTP_G(log).allowed_methods, "405-ALLOWED", header);	break;
+	switch (status) {
+		case 301:	http_log(HTTP_G->log.redirect, "301-REDIRECT", header);			break;
+		case 302:	http_log(HTTP_G->log.redirect, "302-REDIRECT", header);			break;
+		case 303:	http_log(HTTP_G->log.redirect, "303-REDIRECT", header);			break;
+		case 305:	http_log(HTTP_G->log.redirect, "305-REDIRECT", header);			break;
+		case 307:	http_log(HTTP_G->log.redirect, "307-REDIRECT", header);			break;
+		case 304:	http_log(HTTP_G->log.cache, "304-CACHE", header);				break;
+		case 405:	http_log(HTTP_G->log.allowed_methods, "405-ALLOWED", header);	break;
 		default:	http_log(NULL, header, body);									break;
 	}
 	
 	STR_FREE(header);
 	STR_FREE(body);
 	
-	if (HTTP_G(force_exit)) {
+	if (HTTP_G->force_exit) {
 		zend_bailout();
 	} else {
 		php_ob_set_internal_handler(http_ob_blackhole, 4096, "blackhole", 0 TSRMLS_CC);
@@ -293,11 +202,13 @@ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zen
 {
 	zval **hsv;
 	zval **var;
-	
-	if ((SUCCESS != zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &hsv)) || (Z_TYPE_PP(hsv) != IS_ARRAY)) {
+#ifdef ZEND_ENGINE_2
+	zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC);
+#endif
+	if ((SUCCESS != zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv)) || (Z_TYPE_PP(hsv) != IS_ARRAY)) {
 		return NULL;
 	}
-	if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(hsv), (char *) key, key_size, (void **) &var)) || (Z_TYPE_PP(var) != IS_STRING)) {
+	if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(hsv), (char *) key, key_size, (void *) &var)) || (Z_TYPE_PP(var) != IS_STRING)) {
 		return NULL;
 	}
 	if (check && !(Z_STRVAL_PP(var) && Z_STRLEN_PP(var))) {
@@ -321,11 +232,11 @@ PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_
 			*body = estrndup(*body, *length);
 		}
 		return SUCCESS;
-	} else if (sapi_module.read_post && !HTTP_G(read_post_data)) {
+	} else if (sapi_module.read_post && !HTTP_G->read_post_data) {
 		char buf[4096];
 		int len;
 		
-		HTTP_G(read_post_data) = 1;
+		HTTP_G->read_post_data = 1;
 		
 		while (0 < (len = sapi_module.read_post(buf, sizeof(buf) TSRMLS_CC))) {
 			*body = erealloc(*body, *length + len + 1);
@@ -354,15 +265,15 @@ PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_
 }
 /* }}} */
 
-/* {{{ php_stream *_http_get_request_body_stream(void) */
+/* {{{ php_stream *http_get_request_body_stream(void) */
 PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D)
 {
 	php_stream *s = NULL;
 	
 	if (SG(request_info).raw_post_data) {
 		s = php_stream_open_wrapper("php://input", "rb", 0, NULL);
-	} else if (sapi_module.read_post && !HTTP_G(read_post_data)) {
-		HTTP_G(read_post_data) = 1;
+	} else if (sapi_module.read_post && !HTTP_G->read_post_data) {
+		HTTP_G->read_post_data = 1;
 		
 		if ((s = php_stream_temp_new())) {
 			char buf[4096];
@@ -385,6 +296,227 @@ PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D)
 }
 /* }}} */
 
+/* {{{ void http_parse_params_default_callback(...) */
+PHP_HTTP_API void _http_parse_params_default_callback(void *arg, const char *key, int keylen, const char *val, int vallen TSRMLS_DC)
+{
+	char *kdup;
+	zval tmp, *entry;
+	HashTable *ht = (HashTable *) arg;
+	
+	if (ht) {
+		INIT_ZARR(tmp, ht);
+		
+		if (vallen) {
+			MAKE_STD_ZVAL(entry);
+			array_init(entry);
+			kdup = estrndup(key, keylen);
+			add_assoc_stringl_ex(entry, kdup, keylen + 1, (char *) val, vallen, 1);
+			efree(kdup);
+			add_next_index_zval(&tmp, entry);
+		} else {
+			add_next_index_stringl(&tmp, (char *) key, keylen, 1);
+		}
+	}
+}
+/* }}} */
+
+/* {{{ STATUS http_parse_params(const char *, HashTable *) */
+PHP_HTTP_API STATUS _http_parse_params_ex(const char *param, int flags, http_parse_params_callback cb, void *cb_arg TSRMLS_DC)
+{
+#define ST_QUOTE	1
+#define ST_VALUE	2
+#define ST_KEY		3
+#define ST_ASSIGN	4
+#define ST_ADD		5
+	
+	int st = ST_KEY, keylen = 0, vallen = 0;
+	char *s, *c, *key = NULL, *val = NULL;
+	
+	for(c = s = estrdup(param);;) {
+#if 0
+		char *tk = NULL, *tv = NULL;
+		
+		if (key) {
+			if (keylen) {
+				tk= estrndup(key, keylen);
+			} else {
+				tk = ecalloc(1, 7);
+				memcpy(tk, key, 3);
+				tk[3]='.'; tk[4]='.'; tk[5]='.';
+			}
+		}
+		if (val) {
+			if (vallen) {
+				tv = estrndup(val, vallen);
+			} else {
+				tv = ecalloc(1, 7);
+				memcpy(tv, val, 3);
+				tv[3]='.'; tv[4]='.'; tv[5]='.';
+			}
+		}
+		fprintf(stderr, "[%6s] %c \"%s=%s\"\n",
+				(
+						st == ST_QUOTE ? "QUOTE" :
+						st == ST_VALUE ? "VALUE" :
+						st == ST_KEY ? "KEY" :
+						st == ST_ASSIGN ? "ASSIGN" :
+						st == ST_ADD ? "ADD":
+						"HUH?"
+				), *c?*c:'0', tk, tv
+		);
+		STR_FREE(tk); STR_FREE(tv);
+#endif
+	continued:
+		switch (st) {
+			case ST_QUOTE:
+			quote:
+				if (*c == '"') {
+					if (*(c-1) == '\\') {
+						memmove(c-1, c, strlen(c)+1);
+						goto quote;
+					} else {
+						goto add;
+					}
+				} else {
+					if (!val) {
+						val = c;
+					}
+					if (!*c) {
+						--val;
+						st = ST_ADD;
+					}
+				}
+				break;
+				
+			case ST_VALUE:
+				switch (*c) {
+					case '"':
+						if (!val) {
+							st = ST_QUOTE;
+						}
+						break;
+					
+					case ' ':
+						break;
+					
+					case ';':
+					case '\0':
+						goto add;
+						break;
+					case ',':
+						if (flags & HTTP_PARAMS_ALLOW_COMMA) {
+							goto add;
+						}
+					default:
+						if (!val) {
+							val = c;
+						}
+						break;
+				}
+				break;
+				
+			case ST_KEY:
+				switch (*c) {
+					case ',':
+						if (flags & HTTP_PARAMS_ALLOW_COMMA) {
+							goto allow_comma;
+						}
+					case '\r':
+					case '\n':
+					case '\t':
+					case '\013':
+					case '\014':
+						goto failure;
+						break;
+					
+					case '=':
+						if (key) {
+							keylen = c - key;
+							st = ST_VALUE;
+						} else {
+							goto failure;
+						}
+						break;
+					
+					case ' ':
+						if (key) {
+							keylen = c - key;
+							st = ST_ASSIGN;
+						}
+						break;
+					
+					case ';':
+					case '\0':
+					allow_comma:
+						if (key) {
+							keylen = c-- - key;
+							st = ST_ADD;
+						}
+						break;
+					
+					default:
+						if (!key) {
+							key = c;
+						}
+						break;
+				}
+				break;
+				
+			case ST_ASSIGN:
+				if (*c == '=') {
+					st = ST_VALUE;
+				} else if (!*c || *c == ';' || ((flags & HTTP_PARAMS_ALLOW_COMMA) && *c == ',')) {
+					st = ST_ADD;
+				} else if (*c != ' ') {
+					goto failure;
+				}
+				break;
+				
+			case ST_ADD:
+			add:
+				if (val) {
+					vallen = c - val;
+					if (st != ST_QUOTE) {
+						while (val[vallen-1] == ' ') --vallen;
+					}
+				} else {
+					val = "";
+					vallen = 0;
+				}
+				
+				cb(cb_arg, key, keylen, val, vallen TSRMLS_CC);
+				
+				st = ST_KEY;
+				key = val = NULL;
+				keylen = vallen = 0;
+				break;
+		}
+		if (*c) {
+			++c;
+		} else if (st == ST_ADD) {
+			goto add;
+		} else {
+			break;
+		}
+	}
+	
+	efree(s);
+	return SUCCESS;
+	
+failure:
+	if (flags & HTTP_PARAMS_RAISE_ERROR) {
+		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Unexpected character (%c) at pos %tu of %zu", *c, c-s, strlen(s));
+	}
+	if (flags & HTTP_PARAMS_ALLOW_FAILURE) {
+		--c;
+		st = ST_ADD;
+		goto continued;
+	}
+	efree(s);
+	return FAILURE;
+}
+/* }}} */
+
 /*
  * Local variables:
  * tab-width: 4