Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 35059 invoked from network); 13 Dec 2004 16:19:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 13 Dec 2004 16:19:10 -0000 Received: (qmail 83880 invoked by uid 500); 13 Dec 2004 16:13:22 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 83758 invoked by uid 500); 13 Dec 2004 16:13:20 -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: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 83693 invoked by uid 99); 13 Dec 2004 16:13:19 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 13 Dec 2004 08:13:15 -0800 Received: (qmail 30502 invoked by uid 65534); 13 Dec 2004 16:13:07 -0000 Date: 13 Dec 2004 16:13:07 -0000 Message-ID: <20041213161307.30500.qmail@minotaur.apache.org> From: pquerna@apache.org To: cvs@httpd.apache.org Subject: svn commit: r111719 - /httpd/httpd/trunk/modules/http/http_core.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: pquerna Date: Mon Dec 13 08:13:06 2004 New Revision: 111719 URL: http://svn.apache.org/viewcvs?view=rev&rev=111719 Log: * Style fixes only. No functional changes. Remove two tabs. Fix an If. Split a String. Modified: httpd/httpd/trunk/modules/http/http_core.c Modified: httpd/httpd/trunk/modules/http/http_core.c Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/http/http_core.c?view=diff&rev=111719&p1=httpd/httpd/trunk/modules/http/http_core.c&r1=111718&p2=httpd/httpd/trunk/modules/http/http_core.c&r2=111719 ============================================================================== --- httpd/httpd/trunk/modules/http/http_core.c (original) +++ httpd/httpd/trunk/modules/http/http_core.c Mon Dec 13 08:13:06 2004 @@ -88,17 +88,22 @@ AP_INIT_TAKE1("KeepAliveTimeout", set_keep_alive_timeout, NULL, RSRC_CONF, "Keep-Alive timeout duration (sec)"), AP_INIT_TAKE1("MaxKeepAliveRequests", set_keep_alive_max, NULL, RSRC_CONF, - "Maximum number of Keep-Alive requests per connection, or 0 for infinite"), + "Maximum number of Keep-Alive requests per connection, " + "or 0 for infinite"), AP_INIT_TAKE1("KeepAlive", set_keep_alive, NULL, RSRC_CONF, "Whether persistent connections should be On or Off"), { NULL } }; static const char *http_method(const request_rec *r) - { return "http"; } +{ + return "http"; +} static apr_port_t http_port(const request_rec *r) - { return DEFAULT_HTTP_PORT; } +{ + return DEFAULT_HTTP_PORT; +} static int ap_process_http_async_connection(conn_rec *c) { @@ -208,14 +213,14 @@ * use a different processing function */ int async_mpm = 0; - if(ap_mpm_query(AP_MPMQ_IS_ASYNC, &async_mpm) == APR_SUCCESS - && async_mpm == 1) { - ap_hook_process_connection(ap_process_http_async_connection,NULL, - NULL,APR_HOOK_REALLY_LAST); + if (ap_mpm_query(AP_MPMQ_IS_ASYNC, &async_mpm) == APR_SUCCESS + && async_mpm == 1) { + ap_hook_process_connection(ap_process_http_async_connection, NULL, + NULL, APR_HOOK_REALLY_LAST); } else { - ap_hook_process_connection(ap_process_http_connection,NULL,NULL, - APR_HOOK_REALLY_LAST); + ap_hook_process_connection(ap_process_http_connection, NULL, NULL, + APR_HOOK_REALLY_LAST); } ap_hook_map_to_storage(ap_send_http_trace,NULL,NULL,APR_HOOK_MIDDLE);