X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=acff118b1f9edd40b9d678f549a327a85e22c306;hp=4744a827f32fffd80e88d3824bfada3f081621f4;hb=9676c81efbb8f180fa189d71a7ecb50dde4f5646;hpb=2f39230d83bdf816dcae52c7e5a1b019347f0e7b

diff --git a/http_api.c b/http_api.c
index 4744a82..acff118 100644
--- a/http_api.c
+++ b/http_api.c
@@ -33,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;
 }
 
@@ -91,12 +96,15 @@ void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
 	
 	va_start(args, format);
 #ifdef ZEND_ENGINE_2
-	if ((type == E_THROW) || (PG(error_handling) == EH_THROW)) {
-		char *message;
-		
-		vspprintf(&message, 0, format, args);
-		zend_throw_exception(http_exception_get_for_code(code), message, code TSRMLS_CC);
-		efree(message);
+		if ((type == E_THROW) || (PG(error_handling) == EH_THROW)) {
+			char *message;
+			zend_class_entry *ce = http_exception_get_for_code(code);
+			
+			http_try {
+				vspprintf(&message, 0, format, args);
+				zend_throw_exception(ce, message, code TSRMLS_CC);
+				efree(message);
+			} http_catch(ce);
 	} else
 #endif
 	php_verror(NULL, "", type, format, args TSRMLS_CC);
@@ -104,6 +112,41 @@ void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
 }
 /* }}} */
 
+#ifdef ZEND_ENGINE_2
+/* {{{ zval *http_exception_wrap(zval *, zval *, zend_class_entry *) */
+zval *_http_exception_wrap(zval *old_exception, zval *new_exception, zend_class_entry *ce TSRMLS_DC)
+{
+	zval **args, **trace_0, *old_trace_0, *trace = NULL;
+	
+	/* create wrapping exception if requested */
+	if (!new_exception) {
+		MAKE_STD_ZVAL(new_exception);
+		object_init_ex(new_exception, ce);
+		zend_update_property_string(ce, new_exception, "message", lenof("message"), "Exception caused by inner exception(s)" TSRMLS_CC);
+	}
+	
+	/* copy bt arguments */
+	if ((trace = zend_read_property(ZEND_EXCEPTION_GET_DEFAULT(), old_exception, "trace", lenof("trace"), 0 TSRMLS_CC))) {
+		if (Z_TYPE_P(trace) == IS_ARRAY && SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void *) &trace_0)) {
+			old_trace_0 = *trace_0;
+			if (Z_TYPE_PP(trace_0) == IS_ARRAY && SUCCESS == zend_hash_find(Z_ARRVAL_PP(trace_0), "args", sizeof("args"), (void *) &args)) {
+				if ((trace = zend_read_property(ZEND_EXCEPTION_GET_DEFAULT(), new_exception, "trace", lenof("trace"), 0 TSRMLS_CC))) {
+					if (Z_TYPE_P(trace) == IS_ARRAY && SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void *) &trace_0)) {
+						ZVAL_ADDREF(*args);
+						add_assoc_zval(*trace_0, "args", *args);
+					}
+				}
+			}
+		}
+	}
+	
+	zend_update_property(Z_OBJCE_P(new_exception), new_exception, "innerException", lenof("innerException"), old_exception TSRMLS_CC);
+	zval_ptr_dtor(&old_exception);
+	return new_exception;
+}
+/* }}} */
+#endif /* ZEND_ENGINE_2 */
+
 /* {{{ void http_log(char *, char *, char *) */
 void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC)
 {
@@ -111,7 +154,7 @@ void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC)
 	struct tm nowtm;
 	char datetime[20] = {0};
 	
-	now = HTTP_GET_REQUEST_TIME();
+	now = HTTP_G->request.time;
 	strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm));
 
 #define HTTP_LOG_WRITE(file, type, msg) \
@@ -140,7 +183,7 @@ static void http_ob_blackhole(char *output, uint output_len, char **handled_outp
 STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header TSRMLS_DC)
 {
 	if (	(send_header && (SUCCESS != http_send_status_header(status, header))) ||
-			(!send_header && status && (SUCCESS != http_send_status(status)))) {
+			(status && (SUCCESS != http_send_status(status)))) {
 		http_error_ex(HE_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : "");
 		STR_FREE(header);
 		STR_FREE(body);
@@ -161,6 +204,7 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
 		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 404:	http_log(HTTP_G->log.not_found, "404-NOTFOUND", NULL);			break;
 		case 405:	http_log(HTTP_G->log.allowed_methods, "405-ALLOWED", header);	break;
 		default:	http_log(NULL, header, body);									break;
 	}
@@ -203,10 +247,10 @@ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zen
 	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))) {
 		return NULL;
 	}
-	if (check && !(Z_STRVAL_PP(var) && Z_STRLEN_PP(var))) {
+	if (check && !((Z_TYPE_PP(var) == IS_STRING) && Z_STRVAL_PP(var) && Z_STRLEN_PP(var))) {
 		return NULL;
 	}
 	return *var;
@@ -316,7 +360,7 @@ PHP_HTTP_API void _http_parse_params_default_callback(void *arg, const char *key
 /* }}} */
 
 /* {{{ STATUS http_parse_params(const char *, HashTable *) */
-PHP_HTTP_API STATUS _http_parse_params_ex(const char *param, int allow_comma_sep, http_parse_params_callback cb, void *cb_arg TSRMLS_DC)
+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
@@ -357,10 +401,11 @@ PHP_HTTP_API STATUS _http_parse_params_ex(const char *param, int allow_comma_sep
 						st == ST_ASSIGN ? "ASSIGN" :
 						st == ST_ADD ? "ADD":
 						"HUH?"
-				), *c, tk, tv
+				), *c?*c:'0', tk, tv
 		);
 		STR_FREE(tk); STR_FREE(tv);
 #endif
+	continued:
 		switch (st) {
 			case ST_QUOTE:
 			quote:
@@ -397,7 +442,10 @@ PHP_HTTP_API STATUS _http_parse_params_ex(const char *param, int allow_comma_sep
 					case '\0':
 						goto add;
 						break;
-					
+					case ',':
+						if (flags & HTTP_PARAMS_ALLOW_COMMA) {
+							goto add;
+						}
 					default:
 						if (!val) {
 							val = c;
@@ -409,7 +457,7 @@ PHP_HTTP_API STATUS _http_parse_params_ex(const char *param, int allow_comma_sep
 			case ST_KEY:
 				switch (*c) {
 					case ',':
-						if (allow_comma_sep) {
+						if (flags & HTTP_PARAMS_ALLOW_COMMA) {
 							goto allow_comma;
 						}
 					case '\r':
@@ -440,7 +488,7 @@ PHP_HTTP_API STATUS _http_parse_params_ex(const char *param, int allow_comma_sep
 					case '\0':
 					allow_comma:
 						if (key) {
-							keylen = c - key;
+							keylen = c-- - key;
 							st = ST_ADD;
 						}
 						break;
@@ -456,7 +504,7 @@ PHP_HTTP_API STATUS _http_parse_params_ex(const char *param, int allow_comma_sep
 			case ST_ASSIGN:
 				if (*c == '=') {
 					st = ST_VALUE;
-				} else if (!*c || *c == ';') {
+				} else if (!*c || *c == ';' || ((flags & HTTP_PARAMS_ALLOW_COMMA) && *c == ',')) {
 					st = ST_ADD;
 				} else if (*c != ' ') {
 					goto failure;
@@ -482,7 +530,6 @@ PHP_HTTP_API STATUS _http_parse_params_ex(const char *param, int allow_comma_sep
 				keylen = vallen = 0;
 				break;
 		}
-		
 		if (*c) {
 			++c;
 		} else if (st == ST_ADD) {
@@ -496,7 +543,14 @@ PHP_HTTP_API STATUS _http_parse_params_ex(const char *param, int allow_comma_sep
 	return SUCCESS;
 	
 failure:
-	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_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;
 }