X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=444c8dea144f35a629fef420628bee0f645da9c3;hp=3cb9c9128626e48c4912c4deb665cd352c19f6b5;hb=dc76f745ce61ab266f873e80a39604fa91875c3d;hpb=930417f55598b5b4c54b44e20935450210454fdf

diff --git a/http_headers_api.c b/http_headers_api.c
index 3cb9c91..444c8de 100644
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -15,18 +15,14 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
 
-#include "ext/standard/php_string.h"
+#include "php_http.h"
+
 #include "ext/standard/url.h"
+#include "ext/standard/php_string.h"
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_headers_api.h"
-#include "php_http_info_api.h"
-
-#include <ctype.h>
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
@@ -179,7 +175,7 @@ PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *support
 					++identifier;
 					--ident_len;
 				}
-				while (isspace(identifier[ident_len - 1])) {
+				while (ident_len && isspace(identifier[ident_len - 1])) {
 					identifier[--ident_len] = '\0';
 				}
 				
@@ -361,10 +357,9 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
 		header_len = strlen(header) + 1;
 	}
 	line = header;
-
-	while (header_len >= (size_t) (line - begin)) {
+	
+	if (header_len) do {
 		int value_len = 0;
-		/* note: valgrind may choke on that -- should be safe though */
 		switch (*line++)
 		{
 			case ':':
@@ -376,7 +371,7 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
 			case 0:
 				--value_len; /* we don't have CR so value length is one char less */
 			case '\n':
-				if ((!(*line - 1)) || ((*line != ' ') && (*line != '\t'))) {
+				if ((!*(line - 1)) || ((*line != ' ') && (*line != '\t'))) {
 					http_info i;
 					
 					/* response/request line */
@@ -433,7 +428,8 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
 				}
 			break;
 		}
-	}
+	} while (header_len > (size_t) (line - begin));
+
 	return SUCCESS;
 }
 /* }}} */