From d5ffc4eb85d71c901c85119cf873e343349e97e2 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Tue, 5 Jul 2016 23:20:42 +0200 Subject: Imported Upstream version 2.4.23 --- modules/http2/h2_conn_io.h | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'modules/http2/h2_conn_io.h') diff --git a/modules/http2/h2_conn_io.h b/modules/http2/h2_conn_io.h index b8be671d..4ccf0070 100644 --- a/modules/http2/h2_conn_io.h +++ b/modules/http2/h2_conn_io.h @@ -39,16 +39,15 @@ typedef struct { apr_int64_t bytes_written; int buffer_output; - char *buffer; - apr_size_t buflen; - apr_size_t bufsize; + apr_size_t pass_threshold; + + char *scratch; + apr_size_t ssize; + apr_size_t slen; } h2_conn_io; apr_status_t h2_conn_io_init(h2_conn_io *io, conn_rec *c, - const struct h2_config *cfg, - apr_pool_t *pool); - -int h2_conn_io_is_buffered(h2_conn_io *io); + const struct h2_config *cfg); /** * Append data to the buffered output. @@ -59,12 +58,7 @@ apr_status_t h2_conn_io_write(h2_conn_io *io, const char *buf, size_t length); -/** - * Append a bucket to the buffered output. - * @param io the connection io - * @param b the bucket to append - */ -apr_status_t h2_conn_io_writeb(h2_conn_io *io, apr_bucket *b); +apr_status_t h2_conn_io_pass(h2_conn_io *io, apr_bucket_brigade *bb); /** * Append an End-Of-Connection bucket to the output that, once destroyed, @@ -79,11 +73,4 @@ apr_status_t h2_conn_io_write_eoc(h2_conn_io *io, struct h2_session *session); */ apr_status_t h2_conn_io_flush(h2_conn_io *io); -/** - * Check the amount of buffered output and pass it on if enough has accumulated. - * @param io the connection io - * @param flush if a flush bucket should be appended to any output - */ -apr_status_t h2_conn_io_consider_pass(h2_conn_io *io); - #endif /* defined(__mod_h2__h2_conn_io__) */ -- cgit v1.2.3