Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 70076 invoked from network); 12 Jun 2007 20:56:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Jun 2007 20:56:20 -0000 Received: (qmail 13784 invoked by uid 500); 12 Jun 2007 20:56:23 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 13757 invoked by uid 500); 12 Jun 2007 20:56:22 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 13746 invoked by uid 99); 12 Jun 2007 20:56:22 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2007 13:56:22 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jun 2007 13:56:18 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B3F161A981D; Tue, 12 Jun 2007 13:55:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r546632 - in /httpd/httpd/trunk: include/httpd.h modules/http/http_core.c modules/ssl/ssl_engine_io.c Date: Tue, 12 Jun 2007 20:55:58 -0000 To: cvs@httpd.apache.org From: pquerna@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070612205558.B3F161A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pquerna Date: Tue Jun 12 13:55:57 2007 New Revision: 546632 URL: http://svn.apache.org/viewvc?view=rev&rev=546632 Log: Fixup style nitpicks: - Empty lines should not have spaces - Declare static functions in http_core.c at the top. Modified: httpd/httpd/trunk/include/httpd.h httpd/httpd/trunk/modules/http/http_core.c httpd/httpd/trunk/modules/ssl/ssl_engine_io.c Modified: httpd/httpd/trunk/include/httpd.h URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/httpd.h?view=diff&rev=546632&r1=546631&r2=546632 ============================================================================== --- httpd/httpd/trunk/include/httpd.h (original) +++ httpd/httpd/trunk/include/httpd.h Tue Jun 12 13:55:57 2007 @@ -1081,7 +1081,7 @@ 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. */ Modified: httpd/httpd/trunk/modules/http/http_core.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_core.c?view=diff&rev=546632&r1=546631&r2=546632 ============================================================================== --- httpd/httpd/trunk/modules/http/http_core.c (original) +++ httpd/httpd/trunk/modules/http/http_core.c Tue Jun 12 13:55:57 2007 @@ -42,6 +42,9 @@ 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 @@ 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 @@ 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) { Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_io.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_io.c?view=diff&rev=546632&r1=546631&r2=546632 ============================================================================== --- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c (original) +++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c Tue Jun 12 13:55:57 2007 @@ -1667,7 +1667,7 @@ /* 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);