X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_message_api.c;h=c28ff6f7945c8a152573cf0ea374f06c0c1e497e;hp=6dd20673b081addab2c92fa72902d6cfa93b7ce1;hb=dc7248a073febcade23e6a1a296ab1b2bb752298;hpb=266dd631dcb4e0652522ad4884ee8a40b88532ec

diff --git a/http_message_api.c b/http_message_api.c
index 6dd2067..c28ff6f 100644
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -144,7 +144,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 	}
 
 	/* header parsing stops at (CR)LF (CR)LF */
-	if (body = http_locate_body(message)) {
+	if ((body = http_locate_body(message))) {
 		zval *c;
 		const char *continue_at = NULL;
 		size_t remaining = message + message_length - body;
@@ -155,12 +155,12 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 			size_t decoded_len;
 
 			/* decode and replace Transfer-Encoding with Content-Length header */
-			if (continue_at = http_encoding_dechunk(body, message + message_length - body, &decoded, &decoded_len)) {
+			if ((continue_at = http_encoding_dechunk(body, message + message_length - body, &decoded, &decoded_len))) {
 				zval *len;
 				char *tmp;
 				int tmp_len;
 
-				tmp_len = (int) spprintf(&tmp, 0, "%lu", (ulong) decoded_len);
+				tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len);
 				MAKE_STD_ZVAL(len);
 				ZVAL_STRINGL(len, tmp, tmp_len, 0);
 
@@ -174,7 +174,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 		} else
 
 		/* message has content-length header */
-		if (c = http_message_header(msg, "Content-Length")) {
+		if ((c = http_message_header(msg, "Content-Length"))) {
 			ulong len = strtoul(Z_STRVAL_P(c), NULL, 10);
 			if (len > remaining) {
 				http_error_ex(HE_NOTICE, HTTP_E_MALFORMED_HEADERS, "The Content-Length header pretends a larger body than actually received (expected %lu bytes; got %lu bytes)", len, remaining);
@@ -185,12 +185,13 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 		} else
 
 		/* message has content-range header */
-		if (c = http_message_header(msg, "Content-Range")) {
+		if ((c = http_message_header(msg, "Content-Range"))) {
 			ulong total = 0, start = 0, end = 0, len = 0;
 			
-			if (!strncasecmp(Z_STRVAL_P(c), "bytes=", lenof("bytes="))) {
+			if (!strncasecmp(Z_STRVAL_P(c), "bytes", lenof("bytes")) && 
+					(Z_STRVAL_P(c)[lenof("bytes")] == ':' || Z_STRVAL_P(c)[lenof("bytes")] == ' ')) {
 				char *total_at = NULL, *end_at = NULL;
-				char *start_at = Z_STRVAL_P(c) + lenof("bytes=");
+				char *start_at = Z_STRVAL_P(c) + sizeof("bytes");
 				
 				start = strtoul(start_at, &end_at, 10);
 				if (end_at) {
@@ -223,7 +224,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 		
 #if defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB)
 		/* check for compressed data */
-		if (c = http_message_header(msg, "Content-Encoding")) {
+		if ((c = http_message_header(msg, "Content-Encoding"))) {
 			char *decoded = NULL;
 			size_t decoded_len = 0;
 #	if defined(HAVE_ZLIB) && !defined(HTTP_HAVE_ZLIB)
@@ -259,12 +260,12 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 #	endif /* HTTP_HAVE_ZLIB */
 			}
 			
-			if (decoded && decoded_len) {
+			if (decoded) {
 				zval *len;
 				char *tmp;
 				int tmp_len;
 				
-				tmp_len = (int) spprintf(&tmp, 0, "%lu", (ulong) decoded_len);
+				tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len);
 				MAKE_STD_ZVAL(len);
 				ZVAL_STRINGL(len, tmp, tmp_len, 0);
 
@@ -287,7 +288,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
 				http_message *next = NULL, *most = NULL;
 
 				/* set current message to parent of most parent following messages and return deepest */
-				if (most = next = http_message_parse(continue_at, message + message_length - continue_at)) {
+				if ((most = next = http_message_parse(continue_at, message + message_length - continue_at))) {
 					while (most->parent) most = most->parent;
 					most->parent = msg;
 					msg = next;
@@ -305,6 +306,7 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_
 	char *key, *data;
 	ulong idx;
 	zval **header;
+	HashPosition pos1;
 
 	phpstr_init_ex(&str, 4096, 0);
 
@@ -330,7 +332,7 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_
 		break;
 	}
 
-	FOREACH_HASH_KEYVAL(&msg->hdrs, key, idx, header) {
+	FOREACH_HASH_KEYVAL(pos1, &msg->hdrs, key, idx, header) {
 		if (key) {
 			zval **single_header;
 
@@ -341,9 +343,12 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_
 				break;
 
 				case IS_ARRAY:
-					FOREACH_VAL(*header, single_header) {
+				{
+					HashPosition pos2;
+					FOREACH_VAL(pos2, *header, single_header) {
 						phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key, Z_STRVAL_PP(single_header));
 					}
+				}
 				break;
 			}
 
@@ -377,7 +382,7 @@ PHP_HTTP_API void _http_message_serialize(http_message *message, char **string,
 		http_message_tostring(message, &buf, &len);
 		phpstr_prepend(&str, buf, len);
 		efree(buf);
-	} while (message = message->parent);
+	} while ((message = message->parent));
 
 	buf = phpstr_data(&str, string, length);
 	if (!string) {
@@ -407,6 +412,10 @@ PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *obj
 			add_assoc_string(&strct, "requestMethod", msg->http.info.request.method, 1);
 			add_assoc_string(&strct, "requestUri", msg->http.info.request.URI, 1);
 		break;
+		
+		case HTTP_MSG_NONE:
+			/* avoid compiler warning */
+		break;
 	}
 	
 	MAKE_STD_ZVAL(headers);
@@ -443,14 +452,16 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 			char *key;
 			ulong idx;
 			zval **val;
+			HashPosition pos1;
 
-			FOREACH_HASH_KEYVAL(&message->hdrs, key, idx, val) {
+			FOREACH_HASH_KEYVAL(pos1, &message->hdrs, key, idx, val) {
 				if (key) {
 					if (Z_TYPE_PP(val) == IS_ARRAY) {
 						zend_bool first = 1;
 						zval **data;
+						HashPosition pos2;
 						
-						FOREACH_VAL(*val, data) {
+						FOREACH_VAL(pos2, *val, data) {
 							http_send_header_ex(key, strlen(key), Z_STRVAL_PP(data), Z_STRLEN_PP(data), first, NULL);
 							first = 0;
 						}
@@ -486,7 +497,7 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 				int port = 0;
 
 				/* check for port */
-				if (colon = strchr(Z_STRVAL_PP(zhost), ':')) {
+				if ((colon = strchr(Z_STRVAL_PP(zhost), ':'))) {
 					port = atoi(colon + 1);
 					host = estrndup(Z_STRVAL_PP(zhost), host_len = (Z_STRVAL_PP(zhost) - colon - 1));
 				} else {