X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_info_api.c;h=369bf69c77c57d2a5b0d9430689f249b35b9e326;hp=793acd11be56a941d88cc4a669c88726ef502695;hb=b23b4edaebd71ff76579b97f3ee353f43e83bd25;hpb=ee9ae56aaf1f9f0ddc95094a56f7331cb14bc0e4

diff --git a/http_info_api.c b/http_info_api.c
index 793acd1..369bf69 100644
--- a/http_info_api.c
+++ b/http_info_api.c
@@ -23,69 +23,42 @@ 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 *i)
 {
-	switch (i->type)
-	{
+	switch (i->type) {
 		case IS_HTTP_REQUEST:
 			STR_SET(HTTP_INFO(i).request.method, NULL);
 			STR_SET(HTTP_INFO(i).request.url, NULL);
-		break;
+			break;
 		
 		case IS_HTTP_RESPONSE:
 			STR_SET(HTTP_INFO(i).response.status, NULL);
-		break;
+			break;
 		
 		default:
-		break;
+			break;
 	}
 }
 
-#if !defined(ZEND_ENGINE_2)
-inline char *php_memnstr(char *h, char *n, size_t n_len, char *e)
-{
-	char *p;
-	
-	if (e > h && n_len > 0) {
-		while (h != e) {
-			if (*h == *n) {
-				for (p = n; *p == h[p-n]; ++p) {
-					if (p == n+n_len-1) {
-						return h;
-					}
-				}
-			}
-			++h;
-		}
-	}
-	
-	return NULL;
-}
-#endif
-
 PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info, zend_bool silent TSRMLS_DC)
 {
 	const char *end, *http;
 	
 	/* sane parameter */
 	if ((!pre_header) || (!*pre_header)) {
-		if (!silent) {
-			http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Empty pre-header HTTP info");
-		}
 		return FAILURE;
 	}
 	
@@ -94,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 = php_memnstr((char *) pre_header, "HTTP/1.", lenof("HTTP/1."), (char *)end))) || 
-			(!(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;
 	}
@@ -123,8 +97,18 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
 		const char *code = http + sizeof("HTTP/1.1");
 		
 		info->type = IS_HTTP_RESPONSE;
-		HTTP_INFO(info).response.code = (code && (end > code)) ? strtol(code, &status, 10) : 0;
-		HTTP_INFO(info).response.status = (status && (end > ++status)) ? estrndup(status, end - status) : ecalloc(1,1);
+		while (' ' == *code) ++code;
+		if (code && end > code) {
+			HTTP_INFO(info).response.code = strtol(code, &status, 10);
+		} else {
+			HTTP_INFO(info).response.code = 0;
+		}
+		if (status && end > status) {
+			while (' ' == *status) ++status;
+			HTTP_INFO(info).response.status = estrndup(status, end - status);
+		} else {
+			HTTP_INFO(info).response.status = ecalloc(1, 1);
+		}
 		
 		return SUCCESS;
 	}
@@ -136,10 +120,17 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
 		info->type = IS_HTTP_REQUEST;
 		if (url && http > url) {
 			HTTP_INFO(info).request.method = estrndup(pre_header, url - pre_header);
-			HTTP_INFO(info).request.url = estrndup(url + 1, http - url - 2);
+			while (' ' == *url) ++url;
+			while (' ' == *(http-1)) --http;
+			if (http > url) {
+				HTTP_INFO(info).request.url = estrndup(url, http - url);
+			} else {
+				efree(HTTP_INFO(info).request.method);
+				return FAILURE;
+			}
 		} else {
-			HTTP_INFO(info).request.method = ecalloc(1,1);
-			HTTP_INFO(info).request.url = ecalloc(1,1);
+			HTTP_INFO(info).request.method = ecalloc(1, 1);
+			HTTP_INFO(info).request.url = ecalloc(1, 1);
 		}
 		
 		return SUCCESS;