X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_send_api.c;h=ae7bc490de7d14f0df203a35af116e36e0a71371;hp=2be92b62dec675c02fd141aaeb65dc3c30ac0391;hb=b0d260940d93ae0553dde04cea651cb4b19df207;hpb=13e641e4455b1f86520de7c6390b2b7659d65e54 diff --git a/http_send_api.c b/http_send_api.c index 2be92b6..ae7bc49 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-2007, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -27,19 +27,20 @@ #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 (OG(ob_nesting_level)) { + php_end_ob_buffer(1, 1 TSRMLS_CC); + } + if (!OG(implicit_flush)) { + sapi_flush(TSRMLS_C); + } http_sleep(HTTP_G->send.throttle_delay); } } @@ -51,13 +52,15 @@ static inline void _http_send_response_start(void **buffer, size_t content_lengt { int encoding; - if ((encoding = http_encoding_response_start(content_length))) { + 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); } /* }}} */ @@ -65,7 +68,7 @@ static inline void _http_send_response_start(void **buffer, size_t content_lengt #define http_send_response_data_plain(b, d, dl) _http_send_response_data_plain((b), (d), (dl) TSRMLS_CC) static inline void _http_send_response_data_plain(void **buffer, const char *data, size_t data_len TSRMLS_DC) { - if (HTTP_G->send.deflate.encoding && *(http_encoding_stream **) buffer) { + if (HTTP_G->send.deflate.response && HTTP_G->send.deflate.encoding) { #ifdef HTTP_HAVE_ZLIB char *encoded; size_t encoded_len; @@ -93,19 +96,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 +118,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(); } } @@ -137,7 +137,7 @@ static inline void _http_send_response_data_fetch(void **buffer, const void *dat #define http_send_response_finish(b) _http_send_response_finish((b) TSRMLS_CC) static inline void _http_send_response_finish(void **buffer TSRMLS_DC) { - if (HTTP_G->send.deflate.encoding && *(http_encoding_stream **) buffer) { + if (HTTP_G->send.deflate.response && HTTP_G->send.deflate.encoding) { #ifdef HTTP_HAVE_ZLIB char *encoded = NULL; size_t encoded_len = 0; @@ -174,21 +174,81 @@ PHP_MINIT_FUNCTION(http_send) } /* }}} */ +/* {{{ http_find_header */ +typedef struct { + const char *h; + size_t l; +} http_response_header_t; + +static int http_find_header(void *data, void *arg) +{ + http_response_header_t *h = arg; + sapi_header_struct *s = data; + + return (!strncasecmp(s->header, h->h, h->l)) && s->header[h->l] == ':'; +} +/* }}} */ + +/* {{{ void http_hide_header(char *) */ +PHP_HTTP_API void _http_hide_header_ex(const char *name, size_t name_len TSRMLS_DC) +{ + http_response_header_t h = {name, name_len}; + zend_llist_del_element(&SG(sapi_headers).headers, (void *) &h, http_find_header); +} +/* }}} */ + +/* {{{ 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 || !*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; + HashPosition pos; + + FOREACH_HASH_VAL(pos, HASH_OF(*val), data) { + zval *orig = *data; + + 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); + } + first = 0; + } + } else { + zval *orig = *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); + } + } +} +/* }}} */ /* {{{ STATUS http_send_header(char *, char *, zend_bool) */ PHP_HTTP_API STATUS _http_send_header_ex(const char *name, size_t name_len, const char *value, size_t value_len, zend_bool replace, char **sent_header TSRMLS_DC) { STATUS ret; - size_t header_len = sizeof(": ") + name_len + value_len + 1; - char *header = emalloc(header_len + 1); - - header[header_len] = '\0'; - header_len = snprintf(header, header_len, "%s: %s", name, value); - ret = http_send_header_string_ex(header, header_len, replace); - if (sent_header) { - *sent_header = header; + + if (value && value_len) { + size_t header_len = sizeof(": ") + name_len + value_len + 1; + char *header = emalloc(header_len + 1); + + header[header_len] = '\0'; + header_len = snprintf(header, header_len, "%s: %s", name, value); + ret = http_send_header_string_ex(header, header_len, replace); + if (sent_header) { + *sent_header = header; + } else { + efree(header); + } } else { - efree(header); + http_hide_header_ex(name, name_len); + ret = SUCCESS; } return ret; } @@ -344,7 +404,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/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size); + range_header_len = snprintf(range_header_str, sizeof(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); @@ -360,8 +420,8 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_s 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", (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); + boundary_len = snprintf(boundary_str, sizeof(boundary_str), "%lu%0.9f", (ulong) HTTP_G->request.time, (float) php_combined_lcg(TSRMLS_C)); + range_header_len = snprintf(range_header_str, sizeof(range_header_str), "Content-Type: multipart/byteranges; boundary=%s", boundary_str); http_send_status_header_ex(206, range_header_str, range_header_len, 1); http_send_response_start(&s, 0); @@ -382,7 +442,7 @@ PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_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); + preface_len = snprintf(preface_str, sizeof(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); http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1); } @@ -447,12 +507,13 @@ 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); + http_hide_header("Content-Disposition"); http_send_content_type(defct, strlen(defct)); - http_send_header_string("Content-Disposition:"); http_error(HE_WARNING, HTTP_E_RESPONSE, "File not found; stat failed"); STR_FREE(defct); @@ -462,8 +523,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); }