Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 55199 invoked from network); 6 May 2009 14:51:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 May 2009 14:51:15 -0000 Received: (qmail 7192 invoked by uid 500); 6 May 2009 14:51:15 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 7105 invoked by uid 500); 6 May 2009 14:51:14 -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 7096 invoked by uid 99); 6 May 2009 14:51:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 May 2009 14:51:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 May 2009 14:51:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 25DFA23888A4; Wed, 6 May 2009 14:50:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r772290 - /httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_proxy.c Date: Wed, 06 May 2009 14:50:53 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090506145053.25DFA23888A4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Wed May 6 14:50:52 2009 New Revision: 772290 URL: http://svn.apache.org/viewvc?rev=772290&view=rev Log: Remove some -trunk foo-nis Modified: httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_proxy.c Modified: httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_proxy.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_proxy.c?rev=772290&r1=772289&r2=772290&view=diff ============================================================================== --- httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_proxy.c (original) +++ httpd/httpd/branches/httpd-2.2-proxy/modules/proxy/mod_proxy.c Wed May 6 14:50:52 2009 @@ -293,9 +293,6 @@ worker->conn_timeout = timeout; worker->conn_timeout_set = 1; } - else if (!strcasecmp(key, "flusher")) { - worker->flusher = apr_pstrdup(p, val); - } else { return "unknown Worker parameter"; } @@ -1006,7 +1003,6 @@ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "Running scheme %s handler (attempt %d)", scheme, attempts); - AP_PROXY_RUN(r, worker, conf, url, attempts); access_status = proxy_run_scheme_handler(r, worker, conf, url, NULL, 0); if (access_status == OK) @@ -1057,7 +1053,6 @@ ap_proxy_post_request(worker, balancer, r, conf); proxy_run_request_status(&access_status, r); - AP_PROXY_RUN_FINISHED(r, attempts, access_status); return access_status; }