43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
|
From b66f9e4fdae9a75955a478da83a5637afaa6cf38 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eric Covener <covener@apache.org>
|
||
|
|
Date: Thu, 8 Aug 2019 13:09:10 +0000
|
||
|
|
Subject: [PATCH 2/2] Merge r1864699 from trunk:
|
||
|
|
|
||
|
|
lognos
|
||
|
|
|
||
|
|
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1864702 13f79535-47bb-0310-9956-ffa450edef68
|
||
|
|
---
|
||
|
|
modules/proxy/mod_proxy.c | 2 +-
|
||
|
|
modules/proxy/mod_proxy_ftp.c | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
|
||
|
|
index af56af9..eee6a0f 100644
|
||
|
|
--- a/modules/proxy/mod_proxy.c
|
||
|
|
+++ b/modules/proxy/mod_proxy.c
|
||
|
|
@@ -1055,7 +1055,7 @@ static int proxy_handler(request_rec *r)
|
||
|
|
char *end;
|
||
|
|
maxfwd = apr_strtoi64(str, &end, 10);
|
||
|
|
if (maxfwd < 0 || maxfwd == APR_INT64_MAX || *end) {
|
||
|
|
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO()
|
||
|
|
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(10188)
|
||
|
|
"Max-Forwards value '%s' could not be parsed", str);
|
||
|
|
return ap_proxyerror(r, HTTP_BAD_REQUEST,
|
||
|
|
"Max-Forwards request header could not be parsed");
|
||
|
|
diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c
|
||
|
|
index 8f6f853..1557301 100644
|
||
|
|
--- a/modules/proxy/mod_proxy_ftp.c
|
||
|
|
+++ b/modules/proxy/mod_proxy_ftp.c
|
||
|
|
@@ -1024,7 +1024,7 @@ static int proxy_ftp_handler(request_rec *r, proxy_worker *worker,
|
||
|
|
/* We break the URL into host, port, path-search */
|
||
|
|
if (r->parsed_uri.hostname == NULL) {
|
||
|
|
if (APR_SUCCESS != apr_uri_parse(p, url, &uri)) {
|
||
|
|
- ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO()
|
||
|
|
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(10189)
|
||
|
|
"URI cannot be parsed: %s", url);
|
||
|
|
return ap_proxyerror(r, HTTP_BAD_REQUEST, "URI cannot be parsed");
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|