summaryrefslogtreecommitdiffstats
path: root/modules/proxy/proxy_util.c
diff options
context:
space:
mode:
authorChristophe Jaillet <jailletc36@apache.org>2016-06-11 00:12:55 +0200
committerChristophe Jaillet <jailletc36@apache.org>2016-06-11 00:12:55 +0200
commit4bc9cc097657aa2c9b0b392213ec6dc6b250c26b (patch)
treed599627b173d6c44e5ec9a619c56342e0dabb371 /modules/proxy/proxy_util.c
parentmod_proxy_http2: fix flow control when frontend connection is HTTP/1.1, patch... (diff)
downloadapache2-4bc9cc097657aa2c9b0b392213ec6dc6b250c26b.tar.xz
apache2-4bc9cc097657aa2c9b0b392213ec6dc6b250c26b.zip
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
Diffstat (limited to '')
-rw-r--r--modules/proxy/proxy_util.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index ef9d93fb90..6fee211e5b 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);