Timout error responses should be send only if the client sent a

request previously. Otherwise, the connection should be just closed.

cherokee/thread.c

@@ -514,7 +514,9 @@ process_polling_connections (cherokee_thread_t *thd)
 
 			/* Most likely a 'Gateway Timeout'
 			 */
-			if (conn->phase <= phase_add_headers) {
+			if ((conn->phase >= phase_processing_header) ||
+			    (conn->phase == phase_reading_header) && (conn->incoming_header.len >= 1))
+			{
 				/* Push a hardcoded error
 				 */
 				send_hardcoded_error (&conn->socket,