From dc08a1050dff8a6a86777577cd55a89b932d97b0 Mon Sep 17 00:00:00 2001 From: Paul Querna Date: Tue, 12 Jun 2007 20:55:57 +0000 Subject: [PATCH] Fixup style nitpicks: - Empty lines should not have spaces - Declare static functions in http_core.c at the top. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@546632 13f79535-47bb-0310-9956-ffa450edef68 --- include/httpd.h | 2 +- modules/http/http_core.c | 7 ++++--- modules/ssl/ssl_engine_io.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/httpd.h b/include/httpd.h index 33037ee3fc..5573e1f0db 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -1081,7 +1081,7 @@ struct conn_rec { int data_in_input_filters; /** Is there data pending in the output filters? */ int data_in_output_filters; - + /** Are there any filters that clogg/buffer the input stream, breaking * the event mpm. */ diff --git a/modules/http/http_core.c b/modules/http/http_core.c index 86f042b220..6206c38d3b 100644 --- a/modules/http/http_core.c +++ b/modules/http/http_core.c @@ -42,6 +42,9 @@ AP_DECLARE_DATA ap_filter_rec_t *ap_chunk_filter_handle; AP_DECLARE_DATA ap_filter_rec_t *ap_http_outerror_filter_handle; AP_DECLARE_DATA ap_filter_rec_t *ap_byterange_filter_handle; +static int ap_process_http_connection(conn_rec *c); + + static const char *set_keep_alive_timeout(cmd_parms *cmd, void *dummy, const char *arg) { @@ -119,8 +122,6 @@ static apr_port_t http_port(const request_rec *r) return DEFAULT_HTTP_PORT; } -static int ap_process_http_connection(conn_rec *c); - static int ap_process_http_async_connection(conn_rec *c) { request_rec *r; @@ -129,7 +130,7 @@ static int ap_process_http_async_connection(conn_rec *c) if (c->clogging_input_filters) { return ap_process_http_connection(c); } - + AP_DEBUG_ASSERT(cs->state == CONN_STATE_READ_REQUEST_LINE); while (cs->state == CONN_STATE_READ_REQUEST_LINE) { diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c index 0500932c95..de9db34829 100644 --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c @@ -1667,7 +1667,7 @@ void ssl_io_filter_init(conn_rec *c, SSL *ssl) /* We insert a clogging input filter. Let the core know. */ c->clogging_input_filters = 1; - + ssl_io_input_add_filter(filter_ctx, c, ssl); SSL_set_bio(ssl, filter_ctx->pbioRead, filter_ctx->pbioWrite); -- 2.40.0