X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=3f6f2a6ef524c75e9b5071b9ba8e52cd55338eba;hp=e74d20d9564d515f9dab4547bbb39f4bb6106aa6;hb=ffc893b125c6cc9b385a68a357b08ba2cc4e91f6;hpb=0ef9c0b48c3ef484004231878a6c8c1e9c33a2b3

diff --git a/http_send_api.c b/http_send_api.c
index e74d20d..3f6f2a6 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -263,33 +263,33 @@ PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename, size_t
 /* {{{ STATUS http_send_ranges(HashTable *, void *, size_t, http_send_mode) */
 PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_t size, http_send_mode mode TSRMLS_DC)
 {
-	long **begin, **end;
-	zval **zrange;
+	zval **zbegin, **zend, **zrange;
 
 	/* single range */
 	if (zend_hash_num_elements(ranges) == 1) {
 		char range_header[256] = {0};
 
 		if (SUCCESS != zend_hash_index_find(ranges, 0, (void **) &zrange) ||
-			SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &begin) ||
-			SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &end)) {
+			SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &zbegin) ||
+			SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &zend)) {
 			http_send_status(500);
 			return FAILURE;
 		}
-
+		
 		/* Send HTTP 206 Partial Content */
 		http_send_status(206);
 
 		/* send content range header */
-		snprintf(range_header, 255, "Content-Range: bytes %ld-%ld/%lu", **begin, **end, (ulong) size);
+		snprintf(range_header, 255, "Content-Range: bytes %ld-%ld/%lu", Z_LVAL_PP(zbegin), Z_LVAL_PP(zend), (ulong) size);
 		http_send_header_string(range_header);
 
 		/* send requested chunk */
-		return http_send_chunk(data, **begin, **end + 1, mode);
+		return http_send_chunk(data, Z_LVAL_PP(zbegin), Z_LVAL_PP(zend) + 1, mode);
 	}
 
 	/* multi range */
 	else {
+		size_t preface_len;
 		char bound[23] = {0}, preface[1024] = {0},
 			multi_header[68] = "Content-Type: multipart/byteranges; boundary=";
 
@@ -303,12 +303,12 @@ PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_
 
 		/* send each requested chunk */
 		FOREACH_HASH_VAL(ranges, zrange) {
-			if (SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &begin) ||
-				SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &end)) {
+			if (SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &zbegin) ||
+				SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &zend)) {
 				break;
 			}
 
-			snprintf(preface, 1023,
+			preface_len = snprintf(preface, 1023,
 				HTTP_CRLF "%s"
 				HTTP_CRLF "Content-Type: %s"
 				HTTP_CRLF "Content-Range: bytes %ld-%ld/%lu"
@@ -317,13 +317,13 @@ PHP_HTTP_API STATUS _http_send_ranges(HashTable *ranges, const void *data, size_
 
 				bound,
 				HTTP_G(send).content_type ? HTTP_G(send).content_type : "application/x-octetstream",
-				**begin,
-				**end,
+				Z_LVAL_PP(zbegin),
+				Z_LVAL_PP(zend),
 				(ulong) size
 			);
 
-			PHPWRITE(preface, strlen(preface));
-			http_send_chunk(data, **begin, **end + 1, mode);
+			PHPWRITE(preface, preface_len);
+			http_send_chunk(data, Z_LVAL_PP(zbegin), Z_LVAL_PP(zend) + 1, mode);
 		}
 
 		/* write boundary once more */