Author: jim
Date: Tue Jan 3 06:40:26 2006
New Revision: 365643
URL: http://svn.apache.org/viewcvs?rev=365643&view=rev
Log:
Align with FCGI protocol defines.
Modified:
httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/fcgi_protocol.h
httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c
Modified: httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/fcgi_protocol.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/fcgi_protocol.h?rev=365643&r1=365642&r2=365643&view=diff
==============================================================================
--- httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/fcgi_protocol.h (original)
+++ httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/fcgi_protocol.h Tue Jan 3 06:40:26 2006
@@ -53,6 +53,12 @@
} 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
*/
#define FCGI_KEEP_CONN 1
Modified: httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c?rev=365643&r1=365642&r2=365643&view=diff
==============================================================================
--- httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c Tue Jan 3 06:40:26 2006
@@ -411,19 +411,18 @@
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;