Merge r1674606 from trunk:

Fix duplicated APLOGNOs from r1661067 and r1661448.
Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1674653 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 80d16f3eeffd10c73b20cf420aef8925f46abee3..8b6bba3f9ae3c170f1c02e9294275e52615ec466 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -115,11 +115,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: jailletc36, ylavic, covener
 
-  *) Fix duplicated APLOGNOs from r1661067 and r1661448 (backported to 2.4.12
-     resp. as r1662076 and r1670320).
-     trunk patch: http://svn.apache.org/r1674606
-     2.4.x patch: trunk works
-     +1: ylavic, covener, trawick
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/server/core.c b/server/core.c
index b00a8f04fc0fa5d8f0f6b78fcc1ef2135be6d27c..b2cab4089e00643e5618cb355ff0de33a4858b09 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -822,7 +822,7 @@ char *ap_response_code_string(request_rec *r, int error_index)
     response = ap_expr_str_exec(r, expr, &err);
     if (err) {
         ap_log_rerror(
-                APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02830) "core: ErrorDocument: can't "
+                APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02841) "core: ErrorDocument: can't "
                 "evaluate require expression: %s", err);
         return NULL;
     }