From 4b0111dbfd830ac8f420da19a4b3914a8bbca23a Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Fri, 8 Sep 2017 14:53:47 +0000 Subject: [PATCH] Merge r1745039 from trunk: include the scheme in the error message about missing a mod_proxy_submodule (mod_proxy_$usually_a_scheme) Submitted by: covener Reviewed by: jim, ylavic, icing git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807773 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 6 ------ modules/proxy/mod_proxy.c | 5 +++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/STATUS b/STATUS index c74589e708..45a26e21d3 100644 --- a/STATUS +++ b/STATUS @@ -119,12 +119,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1801594 ^/httpd/httpd/trunk . +1: jfclere, jim, covener - *) mod_proxy: Name the scheme in the error message when the - mod_proxy_foo submodule is missing. - trunk patch: http://svn.apache.org/r1745039 - 2.4.x patch svn merge -c 1745039 ^/httpd/httpd/trunk . - +1: jim, ylavic, icing - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 9f5a3ae279..3f916f66df 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -1268,10 +1268,11 @@ static int proxy_handler(request_rec *r) if (DECLINED == access_status) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01144) - "No protocol handler was valid for the URL %s. " + "No protocol handler was valid for the URL %s " + "(scheme '%s'). " "If you are using a DSO version of mod_proxy, make sure " "the proxy submodules are included in the configuration " - "using LoadModule.", r->uri); + "using LoadModule.", r->uri, scheme); access_status = HTTP_INTERNAL_SERVER_ERROR; goto cleanup; } -- 2.40.0