X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_headers_api.c;h=0952ffbe32c0162b42aba7774408f86447549998;hp=c04664e9b486afd21ea5971309c7767ee52e1e96;hb=32e91737086db53bb1fd9ed9f79d693c43ec459f;hpb=edc84b40eb2c5be04492fa98fec5833a030782eb

diff --git a/http_headers_api.c b/http_headers_api.c
index c04664e..0952ffb 100644
--- a/http_headers_api.c
+++ b/http_headers_api.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -24,8 +24,6 @@
 #include "php_http_api.h"
 #include "php_http_headers_api.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 #ifndef HTTP_DBG_NEG
 #	define HTTP_DBG_NEG 0
 #endif
@@ -357,10 +355,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 ':':
@@ -372,7 +369,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 */
@@ -429,7 +426,8 @@ PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *header
 				}
 			break;
 		}
-	}
+	} while (header_len > (size_t) (line - begin));
+
 	return SUCCESS;
 }
 /* }}} */