From: Jim Jagielski <jim@apache.org>
Date: Tue, 19 Jan 2016 12:50:03 +0000 (+0000)
Subject: OPTIONS/HEAD proxy function should be diff from simple TCP check
X-Git-Tag: 2.5.0-alpha~2367
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=398c5ec65670a7925e479e33644630ef9d3a7aa8;p=thirdparty%2Fapache%2Fhttpd.git

OPTIONS/HEAD proxy function should be diff from simple TCP check

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725499 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c
index 9687c771e59..f3d93a03762 100644
--- a/modules/proxy/mod_proxy_hcheck.c
+++ b/modules/proxy/mod_proxy_hcheck.c
@@ -570,16 +570,16 @@ static apr_status_t hc_check_headers(sctx_t *ctx, apr_pool_t *p, proxy_worker *w
     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(sctx_t *ctx, apr_pool_t *p, proxy_worker *w
             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(sctx_t *ctx, apr_pool_t *p, proxy_worker *w
     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);
 }