Commit ff541424 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Prevent a hang when a cgi handled by mod_cgid tries to read a 

request body from its stdin but no reqest body is being written to
the cgi.


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

CHANGES

+5 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.18-dev



  *) Prevent a hang when a cgi handled by mod_cgid tries to read a

     request body from its stdin but no reqest body is being written to 

     the cgi.  [Jeff Trawick]



  *) mod_log_config: %c connection status incorrectly logged

     as "-" (non-keepalive) when MaxKeepAliveRequests is set to 0.

     [Bill Stoddard]

modules/generators/mod_cgid.c

+5 −1
Original line number Diff line number Diff line
@@ -962,8 +962,12 @@ static int cgid_handler(request_rec *r) 
                break; 

            } 

        } 

        shutdown(sd, 1); /* done writing; force EOF on child's stdin */

    } 

    /* we're done writing, or maybe we didn't write at all;

     * force EOF on child's stdin so that the cgi detects end (or

     * absence) of data

     */

    shutdown(sd, 1);



    /* Handle script return... */ 

    if (!nph) {