]> granicus.if.org Git - apache/commitdiff
Fix bug introduced in r1591508 which resulted in the final empty
authorJeff Trawick <trawick@apache.org>
Mon, 16 Jun 2014 23:56:06 +0000 (23:56 +0000)
committerJeff Trawick <trawick@apache.org>
Mon, 16 Jun 2014 23:56:06 +0000 (23:56 +0000)
FCGI_STDIN not being sent.  Interaction with latest uWSGI (and
probably other protocol implementations) breaks without this.

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

modules/proxy/mod_proxy_fcgi.c

index d668c5424a17fd3de1725f2633b7b21e68b3c564..71a4e2c21c37d5c4eeb4605be3aecec7395c2242 100644 (file)
@@ -478,7 +478,7 @@ static apr_status_t dispatch(proxy_conn_rec *conn, proxy_dir_conf *conf,
             if (last_stdin) {
                 pfd.reqevents = APR_POLLIN; /* Done with input data */
 
-                if (writebuflen) { /* empty AP_FCGI_STDIN not already sent? */
+                /* signal EOF (empty FCGI_STDIN) */
                     ap_fcgi_fill_in_header(&header, AP_FCGI_STDIN, request_id,
                                            0, 0);
                     ap_fcgi_header_to_array(&header, farray);
@@ -491,7 +491,6 @@ static apr_status_t dispatch(proxy_conn_rec *conn, proxy_dir_conf *conf,
                         *err = "sending empty stdin";
                         break;
                     }
-                }
             }
         }