From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 10 Jun 2016 22:12:55 +0000 (+0000)
Subject: When  ap_proxy_show_hcmethod has been backported in 2.4.x (r1744951) the function... 
X-Git-Tag: 2.5.0-alpha~1514
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4bc9cc097657aa2c9b0b392213ec6dc6b250c26b;p=thirdparty%2Fapache%2Fhttpd.git

When  ap_proxy_show_hcmethod has been backported in 2.4.x (r1744951) the function has not been placed at the same position in the code (see r1725306).

Move it at the same place in oder to synch 2.4.x and trunk.

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

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index ef9d93fb90d..6fee211e5b9 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -3720,17 +3720,6 @@ PROXY_DECLARE(apr_port_t) ap_proxy_port_of_scheme(const char *scheme)
     return 0;
 }
 
-PROXY_DECLARE (const char *) ap_proxy_show_hcmethod(hcmethod_t method)
-{
-    proxy_hcmethods_t *m = proxy_hcmethods;
-    for (; m->name; m++) {
-        if (m->method == method) {
-            return m->name;
-        }
-    }
-    return "???";
-}
-
 PROXY_DECLARE(apr_status_t) ap_proxy_buckets_lifetime_transform(request_rec *r,
                                                       apr_bucket_brigade *from,
                                                       apr_bucket_brigade *to)
@@ -3853,6 +3842,17 @@ PROXY_DECLARE(apr_status_t) ap_proxy_transfer_between_connections(
     return rv;
 }
 
+PROXY_DECLARE (const char *) ap_proxy_show_hcmethod(hcmethod_t method)
+{
+    proxy_hcmethods_t *m = proxy_hcmethods;
+    for (; m->name; m++) {
+        if (m->method == method) {
+            return m->name;
+        }
+    }
+    return "???";
+}
+
 void proxy_util_register_hooks(apr_pool_t *p)
 {
     APR_REGISTER_OPTIONAL_FN(ap_proxy_retry_worker);