From: Eric Covener Date: Thu, 8 Aug 2019 13:09:10 +0000 (+0000) Subject: Merge r1864699 from trunk: X-Git-Tag: 2.4.41~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d96372081603bdb8f1e207acc1edd107daa09edf;p=thirdparty%2Fapache%2Fhttpd.git 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 --- diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 5d9854b11d4..8661a2dbaa8 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -1049,7 +1049,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 86ce69b45ce..7ad803b97c8 100644 --- a/modules/proxy/mod_proxy_ftp.c +++ b/modules/proxy/mod_proxy_ftp.c @@ -1026,7 +1026,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"); }