Commit ee94afb4 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 8eeeb39e

STATUS

+0 −4
Changes for STATUS: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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:

modules/generators/mod_cgid.c

+1 −1
Changes for modules/generators/mod_cgid.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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 */