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 5d9854b11d48b2773e117cb535a020ce99b2a9d1..8661a2dbaa8ee033efe8d0e537cfdb15ef23387b 100644 (file)
--- 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 86ce69b45ce0e0f288598fd5436755ad0c8e9e69..7ad803b97c88a621501ec12497758b218057fe9a 100644 (file)
--- 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");
         }