X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=dfd0643eb13acc9ab303329ef56a4ed52fd643cc;hp=bfdcaab97f0d732d8652bfa56b7deb677e8bb6a1;hb=10c37f199e6be7bdb5cbd8a58cbe30279d2d4d45;hpb=6be753a288ed7a42e0cd19551d85eb8eb14c4566 diff --git a/http_send_api.c b/http_send_api.c index bfdcaab..dfd0643 100644 --- a/http_send_api.c +++ b/http_send_api.c @@ -1,16 +1,13 @@ /* - +----------------------------------------------------------------------+ - | PECL :: http | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, that | - | is bundled with this package in the file LICENSE, and is available | - | through the world-wide-web at http://www.php.net/license/3_0.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Copyright (c) 2004-2005 Michael Wallner | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2005, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ @@ -100,7 +97,7 @@ static inline void _http_send_response_data_plain(void **buffer, const char *dat http_encoding_stream *s = *((http_encoding_stream **) buffer); http_encoding_stream_update(s, data, data_len, &encoded, &encoded_len); - phpstr_chunked_output(&s->storage, data, data_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC); + phpstr_chunked_output(&s->storage, encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC); efree(encoded); #else http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug"); @@ -167,18 +164,19 @@ static inline void _http_send_response_finish(void **buffer TSRMLS_DC) if (HTTP_G(send).gzip_encoding) { #ifdef HTTP_HAVE_ZLIB char *encoded = NULL; - size_t encoded_len; + size_t encoded_len = 0; http_encoding_stream *s = *((http_encoding_stream **) buffer); http_encoding_stream_finish(s, &encoded, &encoded_len); - buffer = &s->storage; - phpstr_chunked_output((phpstr **) buffer, encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC); + phpstr_chunked_output(&s->storage, encoded, encoded_len, 0, _http_flush TSRMLS_CC); STR_FREE(encoded); + efree(s); #else http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug"); #endif + } else { + phpstr_chunked_output((phpstr **) buffer, NULL, 0, 0, _http_flush TSRMLS_CC); } - phpstr_chunked_output((phpstr **) buffer, NULL, 0, 0, _http_flush TSRMLS_CC); } /* }}} */ @@ -340,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); @@ -350,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); @@ -365,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]; @@ -374,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);