X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_send_api.c;h=d432b5cf65987974806c9c38be4266d1e9dce64f;hb=dc7248a073febcade23e6a1a296ab1b2bb752298;hp=2a531078a4b12653b0d6bcbdf5d00a99365531c5;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c;p=m6w6%2Fext-http

diff --git a/http_send_api.c b/http_send_api.c
index 2a53107..d432b5c 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -313,14 +313,14 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 	zend_hash_init(&ranges, 0, NULL, ZVAL_PTR_DTOR, 0);
 	range_status = http_get_request_ranges(&ranges, data_size);
 
-	if (range_status == RANGE_ERR) {
-		zend_hash_destroy(&ranges);
-		http_send_status(416);
-		return FAILURE;
-	}
-	
 	switch (range_status)
 	{
+		case RANGE_ERR:
+		{
+			zend_hash_destroy(&ranges);
+			http_send_status(416);
+			return FAILURE;
+		}
 		case RANGE_OK:
 		{
 			/* Range Request - only send ranges if entity hasn't changed */
@@ -338,7 +338,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 						char range_header_str[256];
 						size_t range_header_len;
 						
-						range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Range: bytes %ld-%ld/%lu", Z_LVAL_PP(begin), Z_LVAL_PP(end), (unsigned long) data_size);
+						range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size);
 						http_send_status_header_ex(206, range_header_str, range_header_len, 1);
 						http_send_response_start(&s, Z_LVAL_PP(end)-Z_LVAL_PP(begin)+1);
 						http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1);
@@ -348,12 +348,13 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 					}
 				} else {
 					/* multi range */
+					HashPosition pos;
 					zval **range, **begin, **end;
 					const char *content_type = HTTP_G(send).content_type;
 					char boundary_str[32], range_header_str[256];
 					size_t boundary_len, range_header_len;
 					
-					boundary_len = snprintf(boundary_str, lenof(boundary_str), "%lu%0.9f", (unsigned long) time(NULL), (float) php_combined_lcg(TSRMLS_C));
+					boundary_len = snprintf(boundary_str, lenof(boundary_str), "%lu%0.9f", (ulong) time(NULL), (float) php_combined_lcg(TSRMLS_C));
 					range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Type: multipart/byteranges; boundary=%s", boundary_str);
 					
 					http_send_status_header_ex(206, range_header_str, range_header_len, 1);
@@ -363,7 +364,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 						content_type = "application/x-octetstream";
 					}
 					
-					FOREACH_HASH_VAL(&ranges, range) {
+					FOREACH_HASH_VAL(pos, &ranges, range) {
 						if (	SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void **) &begin) &&
 								SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void **) &end)) {
 							char preface_str[512];
@@ -372,7 +373,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 #define HTTP_RANGE_PREFACE \
 	HTTP_CRLF "--%s" \
 	HTTP_CRLF "Content-Type: %s" \
-	HTTP_CRLF "Content-Range: bytes %ld-%ld/%lu" \
+	HTTP_CRLF "Content-Range: bytes %ld-%ld/%zu" \
 	HTTP_CRLF HTTP_CRLF
 							
 							preface_len = snprintf(preface_str, lenof(preface_str), HTTP_RANGE_PREFACE, boundary_str, content_type, Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size);
@@ -399,7 +400,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s
 			if (!no_cache && cache_etag) {
 				char *etag = NULL;
 				
-				if (etag = http_etag(data_ptr, data_size, data_mode)) {
+				if ((etag = http_etag(data_ptr, data_size, data_mode))) {
 					char *sent_header = NULL;
 					
 					http_send_etag_ex(etag, strlen(etag), &sent_header);