X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=1082e296460651f289dae088a558421e7505bf8b;hp=c76656ce7f0d084eacfab2535f0732d9e03e00c6;hb=refs%2Fheads%2Fv1.7.x;hpb=f554559b173302ed66167d8224023d05c5dabc81 diff --git a/http_send_api.c b/http_send_api.c index c76656c..1082e29 100644 --- a/http_send_api.c +++ b/http_send_api.c @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2006, Michael Wallner | + | Copyright (c) 2004-2010, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -18,7 +18,6 @@ #include "php_http.h" #include "php_streams.h" -#include "ext/standard/php_lcg.h" #include "php_http_api.h" #include "php_http_cache_api.h" @@ -27,19 +26,24 @@ #include "php_http_headers_api.h" #include "php_http_send_api.h" +/* {{{ http_flush() */ #define http_flush(d, l) _http_flush(NULL, (d), (l) TSRMLS_CC) -/* {{{ static inline void http_flush() */ static inline void _http_flush(void *nothing, const char *data, size_t data_len TSRMLS_DC) { PHPWRITE(data, data_len); - php_end_ob_buffer(1, 1 TSRMLS_CC); - sapi_flush(TSRMLS_C); - -#if 0 - fprintf(stderr, "Flushing after writing %u bytes\n", (uint) data_len); -#endif - + /* we really only need to flush when throttling is enabled, + because we push the data as fast as possible anyway if not */ if (HTTP_G->send.throttle_delay >= HTTP_DIFFSEC) { +#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50399) + php_output_end_all(TSRMLS_C); +#else + if (OG(ob_nesting_level)) { + php_end_ob_buffer(1, 1 TSRMLS_CC); + } + if (!OG(implicit_flush)) { + sapi_flush(TSRMLS_C); + } +#endif http_sleep(HTTP_G->send.throttle_delay); } } @@ -53,11 +57,13 @@ static inline void _http_send_response_start(void **buffer, size_t content_lengt if ((encoding = http_encoding_response_start(content_length, 0))) { #ifdef HTTP_HAVE_ZLIB - *buffer = http_encoding_deflate_stream_init(NULL, + *((http_encoding_stream **) buffer) = http_encoding_deflate_stream_init(NULL, (encoding == HTTP_ENCODING_GZIP) ? HTTP_DEFLATE_TYPE_GZIP : HTTP_DEFLATE_TYPE_ZLIB); #endif } + /* flush headers */ + sapi_flush(TSRMLS_C); } /* }}} */ @@ -93,19 +99,20 @@ static inline void _http_send_response_data_plain(void **buffer, const char *dat #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) { - char *buf; - long got, len = end - begin; + long bsz, got, len = end - begin; + + if (!(bsz = HTTP_G->send.buffer_size)) { + bsz = HTTP_SENDBUF_SIZE; + } switch (mode) { - case SEND_RSRC: - { + case SEND_RSRC: { php_stream *s = (php_stream *) data; - if (SUCCESS == php_stream_seek(s, begin, SEEK_SET)) { - buf = emalloc(HTTP_SENDBUF_SIZE); + char *buf = emalloc(bsz); while (len > 0) { - got = php_stream_read(s, buf, MIN(len, HTTP_SENDBUF_SIZE)); + got = php_stream_read(s, buf, MIN(len, bsz)); http_send_response_data_plain(buffer, buf, got); len -= got; } @@ -114,20 +121,16 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat } break; } - - case SEND_DATA: - { - buf = (char *) data + begin; - + case SEND_DATA: { + const char *buf = ((const char *) data) + begin; while (len > 0) { - got = MIN(len, HTTP_SENDBUF_SIZE); + got = MIN(len, bsz); http_send_response_data_plain(buffer, buf, got); len -= got; buf += got; } break; } - EMPTY_SWITCH_DEFAULT_CASE(); } } @@ -200,31 +203,25 @@ PHP_HTTP_API void _http_hide_header_ex(const char *name, size_t name_len TSRMLS_ /* {{{ void http_send_header_zval(char*, zval **, zend_bool) */ PHP_HTTP_API void _http_send_header_zval_ex(const char *name, size_t name_len, zval **val, zend_bool replace TSRMLS_DC) { - if (!val || Z_TYPE_PP(val) == IS_NULL || (Z_TYPE_PP(val) == IS_STRING && !Z_STRLEN_PP(val))) { + if (!val || !*val || Z_TYPE_PP(val) == IS_NULL || (Z_TYPE_PP(val) == IS_STRING && !Z_STRLEN_PP(val))) { http_hide_header_ex(name, name_len); } else if (Z_TYPE_PP(val) == IS_ARRAY || Z_TYPE_PP(val) == IS_OBJECT) { zend_bool first = replace; - zval **data; + zval **data_ptr; HashPosition pos; - FOREACH_HASH_VAL(pos, HASH_OF(*val), data) { - zval *orig = *data; + FOREACH_HASH_VAL(pos, HASH_OF(*val), data_ptr) { + zval *data = http_zsep(IS_STRING, *data_ptr); - convert_to_string_ex(data); - http_send_header_ex(name, name_len, Z_STRVAL_PP(data), Z_STRLEN_PP(data), first, NULL); - if (orig != *data) { - zval_ptr_dtor(data); - } + http_send_header_ex(name, name_len, Z_STRVAL_P(data), Z_STRLEN_P(data), first, NULL); + zval_ptr_dtor(&data); first = 0; } } else { - zval *orig = *val; + zval *data = http_zsep(IS_STRING, *val); - convert_to_string_ex(val); - http_send_header_ex(name, name_len, Z_STRVAL_PP(val), Z_STRLEN_PP(val), replace, NULL); - if (orig != *val) { - zval_ptr_dtor(val); - } + http_send_header_ex(name, name_len, Z_STRVAL_P(data), Z_STRLEN_P(data), replace, NULL); + zval_ptr_dtor(&data); } } /* }}} */ @@ -401,11 +398,13 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s http_send_status(500); return FAILURE; } else { - 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/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size); - http_send_status_header_ex(206, range_header_str, range_header_len, 1); + phpstr header; + + phpstr_init(&header); + phpstr_appendf(&header, "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size); + phpstr_fix(&header); + http_send_status_header_ex(206, PHPSTR_VAL(&header), PHPSTR_LEN(&header), 1); + phpstr_dtor(&header); 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); @@ -417,36 +416,41 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s 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; + char boundary_str[32]; + size_t boundary_len; + phpstr header, preface; - boundary_len = snprintf(boundary_str, lenof(boundary_str), "%lu%0.9f", (ulong) HTTP_G->request.time, (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); + boundary_len = http_boundary(boundary_str, sizeof(boundary_str)); + phpstr_init(&header); + phpstr_appendf(&header, "Content-Type: multipart/byteranges; boundary=%s", boundary_str); + phpstr_fix(&header); + http_send_status_header_ex(206, PHPSTR_VAL(&header), PHPSTR_LEN(&header), 1); + phpstr_dtor(&header); http_send_response_start(&s, 0); if (!content_type) { content_type = "application/x-octetstream"; } - + + phpstr_init(&preface); 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]; - size_t preface_len; - + #define HTTP_RANGE_PREFACE \ HTTP_CRLF "--%s" \ HTTP_CRLF "Content-Type: %s" \ 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); - http_send_response_data_plain(&s, preface_str, preface_len); + + phpstr_appendf(&preface, HTTP_RANGE_PREFACE, boundary_str, content_type, Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size); + phpstr_fix(&preface); + http_send_response_data_plain(&s, PHPSTR_VAL(&preface), PHPSTR_LEN(&preface)); + phpstr_reset(&preface); http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1); } } + phpstr_dtor(&preface); http_send_response_data_plain(&s, HTTP_CRLF "--", lenof(HTTP_CRLF "--")); http_send_response_data_plain(&s, boundary_str, boundary_len); @@ -485,7 +489,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s } /* send 304 Not Modified if last modified matches */ - if (!no_cache && http_match_last_modified("HTTP_IF_MODIFIED_SINCE", HTTP_G->send.last_modified)) { + if (!no_cache && HTTP_G->send.last_modified && http_match_last_modified("HTTP_IF_MODIFIED_SINCE", HTTP_G->send.last_modified)) { char *sent_header = NULL; http_send_last_modified_ex(HTTP_G->send.last_modified, &sent_header); return http_exit_ex(304, sent_header, NULL, 0); @@ -507,6 +511,7 @@ PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_strea { STATUS status; php_stream_statbuf ssb; + int orig_flags; if ((!file) || php_stream_stat(file, &ssb)) { char *defct = sapi_get_default_content_type(TSRMLS_C); @@ -522,8 +527,11 @@ PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_strea return FAILURE; } + orig_flags = file->flags; + file->flags |= PHP_STREAM_FLAG_NO_BUFFER; status = http_send_ex(file, ssb.sb.st_size, SEND_RSRC, no_cache); - + file->flags = orig_flags; + if (close_stream) { php_stream_close(file); }