You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2016/06/10 22:12:56 UTC
svn commit: r1747807 - /httpd/httpd/trunk/modules/proxy/proxy_util.c
Author: jailletc36
Date: Fri Jun 10 22:12:55 2016
New Revision: 1747807
URL: http://svn.apache.org/viewvc?rev=1747807&view=rev
Log:
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.
Modified:
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1747807&r1=1747806&r2=1747807&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Fri Jun 10 22:12:55 2016
@@ -3720,17 +3720,6 @@ PROXY_DECLARE(apr_port_t) ap_proxy_port_
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_tra
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);