X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_send_api.c;h=d432b5cf65987974806c9c38be4266d1e9dce64f;hb=930417f55598b5b4c54b44e20935450210454fdf;hp=badfaf702c20e3c7820dc16b570951ed404ae741;hpb=160400377eb70b98b216cd91aadf9243338d3fd5;p=m6w6%2Fext-http

diff --git a/http_send_api.c b/http_send_api.c
index badfaf7..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), (ulong) 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);
@@ -400,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);