X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=bfdcaab97f0d732d8652bfa56b7deb677e8bb6a1;hp=82c3f7fd6ca3ec25e3cca267fdbaedf835ccf623;hb=6be753a288ed7a42e0cd19551d85eb8eb14c4566;hpb=5c5ddf9042732a05100245844fe2fb70bfe6d495 diff --git a/http_send_api.c b/http_send_api.c index 82c3f7f..bfdcaab 100644 --- a/http_send_api.c +++ b/http_send_api.c @@ -38,7 +38,7 @@ ZEND_EXTERN_MODULE_GLOBALS(http); #define http_flush(d, l) _http_flush((d), (l) SRMLS_CC) /* {{{ static inline void http_flush() */ -static inline void _http_flush(const char *data, size_t data_len, TSRMLS_DC) +static inline void _http_flush(const char *data, size_t data_len TSRMLS_DC) { PHPWRITE(data, data_len); php_end_ob_buffer(1, 1 TSRMLS_CC); @@ -70,46 +70,51 @@ static inline void _http_flush(const char *data, size_t data_len, TSRMLS_DC) } /* }}} */ -/* {{{ http_send_start_response */ -#define http_send_start_response(b, cl) _http_send_start_response((b), (cl) TSRMLS_CC) -static void _http_send_response_start(void *buffer, size_t content_length TSRMLS_DC) +/* {{{ http_send_response_start */ +#define http_send_response_start(b, cl) _http_send_response_start((b), (cl) TSRMLS_CC) +static inline void _http_send_response_start(void **buffer, size_t content_length TSRMLS_DC) { if (http_encoding_response_start(content_length)) { #ifdef HTTP_HAVE_ZLIB char *encoded; - size_t *encoded_len; - http_encoding_stream *s = (http_encoding_stream *) buffer; + size_t encoded_len; + http_encoding_stream *s = emalloc(sizeof(http_encoding_stream)); - http_encoding_stream_init(s, HTTP_G(gzip).encoding == HTTP_ENCODING_GZIP, -1, &encoded, &encoded_len); - phpstr_chunked_output(s.storage, encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC); + http_encoding_stream_init(s, HTTP_G(send).gzip_encoding == HTTP_ENCODING_GZIP, -1, &encoded, &encoded_len); + phpstr_chunked_output(&s->storage, encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC); STR_FREE(encoded); + *buffer = s; #endif } } +/* }}} */ +/* {{{ http_send_response_data_plain */ #define http_send_response_data_plain(b, d, dl) _http_send_response_data_plain((b), (d), (dl) TSRMLS_CC) -static void _http_send_response_data_plain(void *buffer, const char *data, size_t data_len TSRMLS_DC) +static inline void _http_send_response_data_plain(void **buffer, const char *data, size_t data_len TSRMLS_DC) { if (HTTP_G(send).gzip_encoding) { #ifdef HTTP_HAVE_ZLIB char *encoded; size_t encoded_len; + http_encoding_stream *s = *((http_encoding_stream **) buffer); - http_encoding_stream_update(buffer, data, data_len, &encoded, &encoded_len); - phpstr_chunked_output(&(((http_encoding_stream *) buffer)->storage), data, data_len, HTTP_G(send).buffer_size, _http_flush); + 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); 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"); #endif } else { - phpstr_chunked_output(&buffer, data, data_len, HTTP_G(send).buffer_size, _http_flush); + phpstr_chunked_output((phpstr **) buffer, data, data_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC); } } +/* }}} */ #define HTTP_CHUNK_AVAIL(len, cs) ((len -= cs) >= 0) /* {{{ http_send_response_data_fetch */ -#define http_send_response_data_fetch(b, t, d, l, b, e) _http_send_response_data_fetch((b), (t), (d), (l), (b), (e) TSRMLS_CC) -static void _http_send_response_data_fetch(void *buffer, const void *data, size_t data_len, http_send_mode mode, size_t begin, size_t end TSRMLS_DC) +#define http_send_response_data_fetch(b, d, l, m, s, e) _http_send_response_data_fetch((b), (d), (l), (m), (s), (e) TSRMLS_CC) +static inline void _http_send_response_data_fetch(void **buffer, const void *data, size_t data_len, http_send_mode mode, size_t begin, size_t end TSRMLS_DC) { long len = end - begin, chunk_size = 40960; @@ -117,24 +122,21 @@ static void _http_send_response_data_fetch(void *buffer, const void *data, size_ { case SEND_RSRC: { - char *buf; php_stream *s = (php_stream *) data; - if (php_stream_seek(s, begin, SEEK_SET)) { - return FAILURE; - } - - buf = emalloc(chunk_size); + if (SUCCESS == php_stream_seek(s, begin, SEEK_SET)) { + char *buf = emalloc(chunk_size); - while (HTTP_CHUNK_AVAIL(len, chunk_size)) { - http_send_response_data_plain(buffer, buf, php_stream_read(s, buf, chunk_size)); - } - /* read & write left over */ - if (len) { - http_send_response_data_plain(buffer, buf, php_stream_read(s, buf, chunk_size + len)); + while (HTTP_CHUNK_AVAIL(len, chunk_size)) { + http_send_response_data_plain(buffer, buf, php_stream_read(s, buf, chunk_size)); + } + /* read & write left over */ + if (len) { + http_send_response_data_plain(buffer, buf, php_stream_read(s, buf, chunk_size + len)); + } + + efree(buf); } - - efree(buf); } break; @@ -153,29 +155,30 @@ static void _http_send_response_data_fetch(void *buffer, const void *data, size_ } break; - EMPTY_DEFAULT_SWITCH_CASE(); + EMPTY_SWITCH_DEFAULT_CASE(); } } /* }}} */ /* {{{ http_send_response_finish */ #define http_send_response_finish(b) _http_send_response_finish((b) TSRMLS_CC) -static void _http_send_response_finish(void *buffer TSRMLS_DC) +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; + http_encoding_stream *s = *((http_encoding_stream **) buffer); - http_encoding_stream_finish(buffer, &encoded, &encoded_len); - buffer = ((http_encoding_stream *) buffer)->storage; - phpstr_chunked_output(buffer, encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush); + 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); STR_FREE(encoded); #else http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug"); #endif } - phpstr_chunked_output(buffer, NULL, 0, 0, _http_flush); + phpstr_chunked_output((phpstr **) buffer, NULL, 0, 0, _http_flush TSRMLS_CC); } /* }}} */ @@ -294,14 +297,10 @@ PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename, size_t /* {{{ STATUS http_send(void *, size_t, http_send_mode) */ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_send_mode data_mode, zend_bool no_cache TSRMLS_DC) { + void *s = NULL; HashTable ranges; http_range_status range_status; - int cache_etag = http_interrupt_etag_handler(); -#ifdef HTTP_HAVE_ZLIB - http_encoding_stream s; -#else - phpstr *s = NULL; -#endif + int cache_etag = http_interrupt_ob_etaghandler(); if (!data_ptr) { return FAILURE; @@ -325,6 +324,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s switch (range_status) { case RANGE_OK: + { /* Range Request - only send ranges if entity hasn't changed */ if ( http_match_etag_ex("HTTP_IF_MATCH", HTTP_G(send).unquoted_etag, 0) && http_match_last_modified_ex("HTTP_IF_UNMODIFIED_SINCE", HTTP_G(send).last_modified, 0) && @@ -334,17 +334,17 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s /* single range */ zval **range, **begin, **end; - if ( SUCCESS == zend_hash_index_find(ranges, 0, (void **) &range) && + if ( SUCCESS == zend_hash_index_find(&ranges, 0, (void **) &range) && 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 range_header_str[256]; size_t range_header_len; - range_header_len = snprintf(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/%lu", Z_LVAL_PP(begin), Z_LVAL_PP(end), (unsigned long) 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)); - http_send_response_data_fetch(s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1); - http_send_response_finish(s); + 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); + http_send_response_finish(&s); zend_hash_destroy(&ranges); return SUCCESS; } @@ -352,15 +352,14 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s /* multi range */ zval **range, **begin, **end; const char *content_type = HTTP_G(send).content_type; - char *boundary_str, *range_header_str; + char boundary_str[32], range_header_str[256]; size_t boundary_len, range_header_len; - boundary_len = spprintf(&boundary_str, 0, "%lu%0.9f", (unsigned long) time(NULL), (float) php_combined_lcg(TSRMLS_C)) - range_header_len = spprintf(&range_header_str, 0, "Content-Type: multipart/byteranges; boundary=%s", boundary_str); + boundary_len = snprintf(boundary_str, lenof(boundary_str), "%lu%0.9f", (unsigned long) 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, range_header_len, 1); - efree(range_header_str); - http_send_response_start(s, 0); + http_send_status_header_ex(206, range_header_str, range_header_len, 1); + http_send_response_start(&s, 0); if (!content_type) { content_type = "application/x-octetstream"; @@ -368,34 +367,34 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s FOREACH_HASH_VAL(&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 **) &begin)) { + SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void **) &end)) { char preface_str[512]; size_t preface_len; #define HTTP_RANGE_PREFACE \ - HTTP_CRLF "%s" \ + HTTP_CRLF "--%s" \ HTTP_CRLF "Content-Type: %s" \ - HTTP_CRLF "Content-Range: %ld-%ld/%lu" \ + HTTP_CRLF "Content-Range: bytes %ld-%ld/%lu" \ 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); - http_send_response_data_plain(s, preface, preface_len); - http_send_response_data_fetch(s, data_ptr, data_len, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1); + http_send_response_data_plain(&s, preface_str, preface_len); + http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1); } } - http_send_response_data_plain(s, HTTP_CRLF, lenof(HTTP_CRLF)); - http_send_response_data_plain(s, boundary_str, boundary_len); - http_send_response_data_plain(s, "--", lenof("--")); - - efree(boundary_str); + http_send_response_data_plain(&s, HTTP_CRLF "--", lenof(HTTP_CRLF "--")); + http_send_response_data_plain(&s, boundary_str, boundary_len); + http_send_response_data_plain(&s, "--", lenof("--")); - http_send_response_finish(s); + http_send_response_finish(&s); zend_hash_destroy(&ranges); return SUCCESS; } } + } case RANGE_NO: + { zend_hash_destroy(&ranges); /* send 304 Not Modified if etag matches - DON'T return on ETag generation failure */ @@ -423,11 +422,13 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s } /* send full response */ - http_send_response_start(s, data_size); - http_send_response_data_fetch(s, data_ptr, data_size, data_mode, 0, data_size); - http_send_response_finish(s); + http_send_response_start(&s, data_size); + http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, 0, data_size); + http_send_response_finish(&s); return SUCCESS; + } } + return FAILURE; } /* }}} */