From: Jim Jagielski <jim@apache.org>
Date: Thu, 11 Jun 2015 13:18:30 +0000 (+0000)
Subject: Merge r1667386 from trunk:
X-Git-Tag: 2.4.14~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db512721d262f89da79a7b38946d474fb48b0720;p=apache

Merge r1667386 from trunk:

Followup to r1667385, my sandbox was out of date.


Submitted by: covener
Reviewed/backported by: jim


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

diff --git a/STATUS b/STATUS
index 25768fcaa0..b0509be167 100644
--- a/STATUS
+++ b/STATUS
@@ -106,10 +106,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_cgid: Fix APLOGNO
-     trunk patch: http://svn.apache.org/r1667386
-     2.4.x patch: trunk works (minus next-number)
-     +1: jailletc36, jim, ylavic
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 2a0e94db5a..4cebd04571 100644
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -1255,7 +1255,7 @@ static int connect_to_daemon(int *sdptr, request_rec *r,
             apr_time_sec(apr_time_now() - ap_scoreboard_image->global->restart_time) > 
                 DEFAULT_CONNECT_STARTUP_DELAY) {
             return log_scripterror(r, conf, HTTP_SERVICE_UNAVAILABLE, connect_errno, 
-                                   apr_pstrcat(r->pool, APLOGNO(02831) "ScriptSock ", sockname, " does not exist", NULL));
+                                   apr_pstrcat(r->pool, APLOGNO(02833) "ScriptSock ", sockname, " does not exist", NULL));
         }
 
         /* gotta try again, but make sure the cgid daemon is still around */