- add preliminary ext/hash support (currently only for Win32)

[m6w6/ext-http] / http_send_api.c

diff --git a/http_send_api.c b/http_send_api.c
index 6ab4a2f2f3e1010267d6df019c830188b72d2a2e..d432b5cf65987974806c9c38be4266d1e9dce64f 100644 (file)
--- 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);
@@ -348,6 +348,7 @@ 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];
@@ -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);