X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_info_api.c;h=7cf9cc6eb0a6844b14d3c7b0dddd439db6db8286;hp=95263b3bb17bc4809f7d2c05d4c7e632e5dd9885;hb=c40902a33546532405c17c6216c347874f8cb8ff;hpb=fe073d54f4a2929c77e4669c380041f7f6f3bcbd

diff --git a/http_info_api.c b/http_info_api.c
index 95263b3..7cf9cc6 100644
--- a/http_info_api.c
+++ b/http_info_api.c
@@ -23,35 +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 *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;
 	}
 }
 
@@ -60,7 +58,7 @@ inline char *php_memnstr(char *h, char *n, size_t n_len, char *e)
 {
 	char *p;
 	
-	if (e > h && b_len > 0) {
+	if (e > h && n_len > 0) {
 		while (h != e) {
 			if (*h == *n) {
 				for (p = n; *p == h[p-n]; ++p) {
@@ -99,8 +97,8 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
 	 */
 	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")])))) {
+			(!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");
 		}