From: Ruediger Pluem <rpluem@apache.org>
Date: Wed, 4 Jan 2023 11:36:19 +0000 (+0000)
Subject: * Log URI causing to exceed the limit to ease analysis
X-Git-Tag: 2.5.0-alpha2-ci-test-only~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cfcf6d610e06ae5ac6a3fccdb99825370ff4a67;p=thirdparty%2Fapache%2Fhttpd.git

* Log URI causing to exceed the limit to ease analysis


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1906380 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/core.c b/server/core.c
index 13c60e8ca1f..75b25ac4e8b 100644
--- a/server/core.c
+++ b/server/core.c
@@ -4125,12 +4125,15 @@ AP_DECLARE(int) ap_is_recursion_limit_exceeded(const request_rec *r)
         if (top->prev) {
             if (++redirects >= rlimit) {
                 /* uuh, too much. */
+                /* As we check before a new internal redirect, top->prev->uri
+                 * should be the original request causing this.
+                 */
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00124)
-                              "Request exceeded the limit of %d internal "
+                              "Request (%s) exceeded the limit of %d internal "
                               "redirects due to probable configuration error. "
                               "Use 'LimitInternalRecursion' to increase the "
                               "limit if necessary. Use 'LogLevel debug' to get "
-                              "a backtrace.", rlimit);
+                              "a backtrace.", top->prev->uri, rlimit);
 
                 /* post backtrace */
                 log_backtrace(r);
@@ -4145,12 +4148,15 @@ AP_DECLARE(int) ap_is_recursion_limit_exceeded(const request_rec *r)
         if (!top->prev && top->main) {
             if (++subreqs >= slimit) {
                 /* uuh, too much. */
+                /* As we check before a new subrequest, top->main->uri should
+                 * be the original request causing this.
+                 */
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00125)
-                              "Request exceeded the limit of %d subrequest "
+                              "Request (%s) exceeded the limit of %d subrequest "
                               "nesting levels due to probable configuration "
                               "error. Use 'LimitInternalRecursion' to increase "
                               "the limit if necessary. Use 'LogLevel debug' to "
-                              "get a backtrace.", slimit);
+                              "get a backtrace.", top->main->uri, slimit);
 
                 /* post backtrace */
                 log_backtrace(r);