Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 53142 invoked from network); 11 Aug 2004 22:35:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 11 Aug 2004 22:35:22 -0000 Received: (qmail 60291 invoked by uid 500); 11 Aug 2004 22:35:21 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 60106 invoked by uid 500); 11 Aug 2004 22:35: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 60092 invoked by uid 500); 11 Aug 2004 22:35:20 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 60089 invoked by uid 99); 11 Aug 2004 22:35:20 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Wed, 11 Aug 2004 15:35:20 -0700 Received: (qmail 53103 invoked by uid 1134); 11 Aug 2004 22:35:19 -0000 Date: 11 Aug 2004 22:35:19 -0000 Message-ID: <20040811223519.53102.qmail@minotaur.apache.org> From: wrowe@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/proxy mod_proxy.c mod_proxy.h X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N wrowe 2004/08/11 15:35:19 Modified: modules/proxy mod_proxy.c mod_proxy.h Log: Added KeepAlive worker option. The scheme handler will override this setting if required, depending on the protocol itself and keepalive_set flag. Submitted by: mturk Revision Changes Path 1.122 +9 -0 httpd-2.0/modules/proxy/mod_proxy.c Index: mod_proxy.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.c,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- mod_proxy.c 11 Aug 2004 22:33:07 -0000 1.121 +++ mod_proxy.c 11 Aug 2004 22:35:19 -0000 1.122 @@ -151,6 +151,15 @@ worker->recv_buffer_size = ival; worker->recv_buffer_size_set = 1; } + else if (!strcasecmp(key, "keepalive")) { + if (!strcasecmp(val, "on")) + worker->keepalive = 1; + else if (!strcasecmp(val, "off")) + worker->keepalive = 0; + else + return "KeepAlive must be On|Off"; + worker->keepalive_set = 1; + } else { return "unknown parameter"; } 1.110 +1 -0 httpd-2.0/modules/proxy/mod_proxy.h Index: mod_proxy.h =================================================================== RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.h,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- mod_proxy.h 11 Aug 2004 22:34:26 -0000 1.109 +++ mod_proxy.h 11 Aug 2004 22:35:19 -0000 1.110 @@ -236,6 +236,7 @@ apr_size_t io_buffer_size; char io_buffer_size_set; char keepalive; + char keepalive_set; proxy_conn_pool *cp; /* Connection pool to use */ void *opaque; /* per scheme worker data */ };