X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_info_api.c;h=244b6808f76ed5a01deee9d08e18a41cd6535ef0;hp=8e45de36cd8b1179866c59371c403ac40f73dc4a;hb=9c3bc2cb7b5217a91a8defbbe7c5c20f33938d59;hpb=4fcbd8e8ae31611c5197ff2369673b5939fc2b80

diff --git a/http_info_api.c b/http_info_api.c
index 8e45de3..244b680 100644
--- a/http_info_api.c
+++ b/http_info_api.c
@@ -23,37 +23,33 @@ PHP_HTTP_API void _http_info_default_callback(void **nothing, HashTable **header
 	
 	INIT_ZARR(array, *headers);
 	
-	switch (info->type)
-	{
+	switch (info->type) {
 		case IS_HTTP_REQUEST:
 			add_assoc_string(&array, "Request Method", HTTP_INFO(info).request.method, 1);
 			add_assoc_string(&array, "Request Url", HTTP_INFO(info).request.url, 1);
-		break;
+			break;
 		
 		case IS_HTTP_RESPONSE:
 			add_assoc_long(&array, "Response Code", (long) HTTP_INFO(info).response.code);
 			add_assoc_string(&array, "Response Status", HTTP_INFO(info).response.status, 1);
-		break;
+			break;
 	}
 }
 
-PHP_HTTP_API void _http_info_dtor(http_info *info)
+PHP_HTTP_API void _http_info_dtor(http_info *i)
 {
-	http_info_t *i = (http_info_t *) info;
-	
-	switch (info->type)
-	{
+	switch (i->type) {
 		case IS_HTTP_REQUEST:
-			STR_SET(i->request.method, NULL);
-			STR_SET(i->request.url, NULL);
-		break;
+			STR_SET(HTTP_INFO(i).request.method, NULL);
+			STR_SET(HTTP_INFO(i).request.url, NULL);
+			break;
 		
 		case IS_HTTP_RESPONSE:
-			STR_SET(i->response.status, NULL);
-		break;
+			STR_SET(HTTP_INFO(i).response.status, NULL);
+			break;
 		
 		default:
-		break;
+			break;
 	}
 }
 
@@ -63,9 +59,6 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
 	
 	/* sane parameter */
 	if ((!pre_header) || (!*pre_header)) {
-		if (!silent) {
-			http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Empty pre-header HTTP info");
-		}
 		return FAILURE;
 	}
 	
@@ -74,15 +67,16 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
 		end = pre_header + strlen(pre_header);
 	}
 	
-	/* there must be HTTP/1.x in the line
-	 * and nothing than SPACE or NUL after HTTP/1.x 
-	 */
-	if (	(!(http = strstr(pre_header, "HTTP/1."))) || 
-			(!(http < end)) ||
-			(!isdigit(http[lenof("HTTP/1.")])) ||
-			(http[lenof("HTTP/1.1")] && (!isspace(http[lenof("HTTP/1.1")])))) {
+	/* there must be HTTP/1.x in the line */
+	if (!(http = http_locate_str(pre_header, end - pre_header, "HTTP/1.", lenof("HTTP/1.")))) {
+		return FAILURE;
+	}
+	
+	/* and nothing than SPACE or NUL after HTTP/1.x */
+	if (	(!HTTP_IS_CTYPE(digit, http[lenof("HTTP/1.")])) ||
+			(http[lenof("HTTP/1.1")] && (!HTTP_IS_CTYPE(space, http[lenof("HTTP/1.1")])))) {
 		if (!silent) {
-			http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Invalid or missing HTTP/1.x protocol identification");
+			http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Invalid HTTP/1.x protocol identification");
 		}
 		return FAILURE;
 	}