Commit 1fa6344c authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Align with FCGI protocol defines. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/fcgi-proxy-dev@365643 13f79535-47bb-0310-9956-ffa450edef68
parent 4ff43539

modules/proxy/fcgi_protocol.h

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ typedef struct { 
    unsigned char reserved;

} fcgi_header;



/*

 * Number of bytes in a fcgi_header.  Future versions of the protocol

 * will not reduce this number.

 */

#define FCGI_HEADER_LEN  8



/*

 * Mask for flags component of FCGI_BeginRequestBody

 */

modules/proxy/mod_proxy_fcgi.c

+2 −3
Original line number Diff line number Diff line
@@ -411,19 +411,18 @@ static apr_status_t dispatch(proxy_conn_rec *conn, request_rec *r, 
            char plen = 0;

            apr_bucket *b;

            fcgi_header rheader;

            int rheader_size = sizeof(fcgi_header);



            memset(readbuf, 0, sizeof(readbuf));



            /* First, we grab the header... */

            readbuflen = rheader_size;

            readbuflen = FCGI_HEADER_LEN;



            rv = apr_socket_recv(conn->sock, (char *)&rheader, &readbuflen);

            if (rv != APR_SUCCESS) {

                break;

            }



            if (readbuflen != rheader_size) {

            if (readbuflen != FCGI_HEADER_LEN) {

                ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,

                             "proxy: FCGI: Failed to read entire header");

                rv = APR_EINVAL;