Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CA2A818E8A for ; Tue, 19 Jan 2016 12:50:05 +0000 (UTC) Received: (qmail 97572 invoked by uid 500); 19 Jan 2016 12:50:05 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 97505 invoked by uid 500); 19 Jan 2016 12:50:05 -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 97496 invoked by uid 99); 19 Jan 2016 12:50:05 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jan 2016 12:50:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 2391F1804FC for ; Tue, 19 Jan 2016 12:50:05 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.446 X-Spam-Level: X-Spam-Status: No, score=0.446 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id I2PlbSpeQVfk for ; Tue, 19 Jan 2016 12:50:04 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id 411832054B for ; Tue, 19 Jan 2016 12:50:04 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id C3C47E0185 for ; Tue, 19 Jan 2016 12:50:03 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id C1CB83A0572 for ; Tue, 19 Jan 2016 12:50:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1725499 - /httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c Date: Tue, 19 Jan 2016 12:50:03 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160119125003.C1CB83A0572@svn01-us-west.apache.org> Author: jim Date: Tue Jan 19 12:50:03 2016 New Revision: 1725499 URL: http://svn.apache.org/viewvc?rev=1725499&view=rev Log: OPTIONS/HEAD proxy function should be diff from simple TCP check Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c?rev=1725499&r1=1725498&r2=1725499&view=diff ============================================================================== --- httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c (original) +++ httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c Tue Jan 19 12:50:03 2016 @@ -570,16 +570,16 @@ static apr_status_t hc_check_headers(sct hc = hc_get_hcworker(ctx, worker, p); wctx = (wctx_t *)hc->context; - if ((status = hc_get_backend(p, "HCTCP", &backend, hc, ctx)) != OK) { - return backend_cleanup("HCTCP", backend, ctx->s, status); + if ((status = hc_get_backend(p, "HCOH", &backend, hc, ctx)) != OK) { + return backend_cleanup("HCOH", backend, ctx->s, status); } - if ((status = ap_proxy_connect_backend("HCTCP", backend, hc, ctx->s)) != OK) { - return backend_cleanup("HCTCP", backend, ctx->s, status); + if ((status = ap_proxy_connect_backend("HCOH", backend, hc, ctx->s)) != OK) { + return backend_cleanup("HCOH", backend, ctx->s, status); } if (!backend->connection) { - if ((status = ap_proxy_connection_create("HCTCP", backend, &c, ctx->s)) != OK) { - return backend_cleanup("HCTCP", backend, ctx->s, status); + if ((status = ap_proxy_connection_create("HCOH", backend, &c, ctx->s)) != OK) { + return backend_cleanup("HCOH", backend, ctx->s, status); } } switch (hc->s->method) { @@ -605,7 +605,7 @@ static apr_status_t hc_check_headers(sct break; default: - return backend_cleanup("HCTCP", backend, ctx->s, !OK); + return backend_cleanup("HCOH", backend, ctx->s, !OK); break; } @@ -615,7 +615,7 @@ static apr_status_t hc_check_headers(sct r->pool = p; status = hc_read_headers(ctx, r); - return backend_cleanup("HCTCP", backend, ctx->s, status); + return backend_cleanup("HCOH", backend, ctx->s, status); }