httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r366086 - /httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c
Date Thu, 05 Jan 2006 05:24:47 GMT
Author: rooneg
Date: Wed Jan  4 21:24:43 2006
New Revision: 366086

URL: http://svn.apache.org/viewcvs?rev=366086&view=rev
Log:
Make sure that we read the padding bytes in all cases.  Also cut
down on some of the crazy verbose logging, since this seems to be
the problem we were trying to find.

* modules/proxy/mod_proxy_fcgi.c
  (dispatch): Remove really verbose logging, move reading of the
   padding bytes down to the end of the FCGI_STDOUT case.

Tested By: iholsman

Modified:
    httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c

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=366086&r1=366085&r2=366086&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 Wed Jan  4 21:24:43
2006
@@ -516,11 +516,6 @@
 
             plen = fheader[6];
 
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
-                "type %d request-id %d clen: %" APR_SIZE_T_FMT " plen %d",
-                type, rid,
-                clen, plen 
-                );
 recv_again:
             if (clen > sizeof(readbuf) - 1) {
                 readbuflen = sizeof(readbuf) - 1;
@@ -537,9 +532,6 @@
                     break;
                 }
                 readbuf[readbuflen] = 0;
-                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
-                    "readbuf (%" APR_SIZE_T_FMT "): %s", 
-                    readbuflen, readbuf );
             }
 
             switch (type) {
@@ -586,15 +578,6 @@
                         clen -= readbuflen;
                         goto recv_again;
                     }
-
-                    if (plen) {
-                        readbuflen = plen;
-
-                        rv = apr_socket_recv(conn->sock, readbuf, &readbuflen);
-                        if (rv != APR_SUCCESS) {
-                            break;
-                        }
-                    }
                 } else {
                     b = apr_bucket_eos_create(c->bucket_alloc);
 
@@ -606,6 +589,15 @@
                     }
 
                     /* XXX Why don't we cleanup here?  (logic from AJP) */
+                }
+
+                if (plen) {
+                    readbuflen = plen;
+
+                    rv = apr_socket_recv(conn->sock, readbuf, &readbuflen);
+                    if (rv != APR_SUCCESS) {
+                        break;
+                    }
                 }
                 break;
 



Mime
View raw message