* removed debug-code

* renamed network_read_chunkqueue() to network_read() 
* use network_read() instead if src->network_backend_read() as it handles SSL transparently


git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@1269 152afb58-edef-0310-8abb-c4023f1b3aa9

3 files changed, 13 insertions, 19 deletions

diff --git a/src/connections.c b/src/connections.c
index 80e241d8..84216e52 100644
--- a/src/connections.c
+++ b/src/connections.c
@@ -604,9 +604,10 @@ handler_t connection_handle_read_request_header(server *srv, connection *con)  {
 	/* let's see if we need more data later */
 	fdevent_event_del(srv->ev, con->sock);
 
+	con->read_idle_ts = srv->cur_ts;  /* start a read-call() */
 
 	/* read from the network */ 
-	switch (srv->network_backend_read(srv, con, con->sock, con->recv_raw)) {
+	switch (network_read(srv, con, con->sock, con->recv_raw)) {
 	case NETWORK_STATUS_SUCCESS:
 		/* we read everything from the socket, do we have a full header ? */
 
@@ -661,22 +662,21 @@ handler_t connection_handle_read_request_content(server *srv, connection *con)
 	/* let's see if we need more data later */
 	fdevent_event_del(srv->ev, con->sock);
 
-	if (con->request.content_length == -1) return HANDLER_GO_ON;
+	con->read_idle_ts = srv->cur_ts;  /* start a read-call() */
 
-	TRACE("%s", __FUNCTION__);
+	if (con->request.content_length == -1) return HANDLER_GO_ON;
 
 	/* if the content was short enough, it might be read already */
 	if (in->first &&
 	    chunkqueue_length(in) - in->first->offset > 0) {
 
-		/* relax */
-		TRACE("%s", "we still have content in the first chunk");
+		/*  
+		 * looks like the request-header also had some content for us
+		 */
 		
 	} else {
-
-		TRACE("%s", "have to read data");
 		/* read from the network */ 
-		switch (srv->network_backend_read(srv, con, con->sock, in)) {
+		switch (network_read(srv, con, con->sock, in)) {
 		case NETWORK_STATUS_SUCCESS:
 			/* we have data */
 			break;
@@ -695,8 +695,6 @@ handler_t connection_handle_read_request_content(server *srv, connection *con)
 		}
 	}
 
-	TRACE("%lld - %lld", out->bytes_in, con->request.content_length);
-	
 	/* how much data do we want to extract ? */
 	for (c = in->first; c && (out->bytes_in != con->request.content_length); c = c->next) {
 		off_t weWant, weHave, toRead;
@@ -804,7 +802,6 @@ handler_t connection_handle_read_request_content(server *srv, connection *con)
 		in->bytes_out += toRead;
 	}
 
-	TRACE("%lld - %lld", out->bytes_in, con->request.content_length);
 	if (out->bytes_in < con->request.content_length) {
 		/* we have to read more content */
 		fdevent_event_add(srv->ev, con->sock, FDEVENT_IN);
@@ -917,6 +914,7 @@ connection *connection_accept(server *srv, server_socket *srv_socket) {
 			connection_close(srv, con);
 			return NULL;
 		}
+			
 #ifdef USE_OPENSSL
 		/* connect FD to SSL */
 		if (srv_socket->is_ssl) {
@@ -1050,8 +1048,6 @@ int connection_state_machine(server *srv, connection *con) {
 		size_t ostate = con->state;
 		int b;
 
-		TRACE("state: %s", connection_get_state(con->state));
-
 		switch (con->state) {
 		case CON_STATE_CONNECT:
 			if (srv->srvconf.log_state_handling) {
@@ -1286,7 +1282,6 @@ int connection_state_machine(server *srv, connection *con) {
 			 * they might build the connection now or stream the content to the upstream server
 			 * */
 
-			TRACE("%s", "call the send-req-cont backend");
 			switch(r = plugins_call_handle_send_request_content(srv, con)) {
 			case HANDLER_GO_ON:
 				/* everything was forwarded */
@@ -1310,7 +1305,6 @@ int connection_state_machine(server *srv, connection *con) {
 			if (con->recv->is_closed && 
 			    con->recv->bytes_in == con->recv->bytes_out) {
 				/* everything we read is sent */
-				TRACE("%s", "everything is forwarded");
 				connection_set_state(srv, con, CON_STATE_HANDLE_RESPONSE_HEADER);
 			}
 
diff --git a/src/network.c b/src/network.c
index 99a7d799..4b43c00e 100644
--- a/src/network.c
+++ b/src/network.c
@@ -632,17 +632,17 @@ int network_register_fdevents(server *srv) {
 	return 0;
 }
 
-network_status_t network_read_chunkqueue(server *srv, connection *con, chunkqueue *cq) {
+network_status_t network_read(server *srv, connection *con, iosocket *sock, chunkqueue *cq) {
 	server_socket *srv_socket = con->srv_socket;
 
    	if (srv_socket->is_ssl) {
 #ifdef USE_OPENSSL
-		return srv->network_ssl_backend_read(srv, con, con->sock, cq);
+		return srv->network_ssl_backend_read(srv, con, sock, cq);
 #else
 		return NETWORK_STATUS_FATAL_ERROR;
 #endif
 	} else {
-		return srv->network_backend_read(srv, con, con->sock, cq);
+		return srv->network_backend_read(srv, con, sock, cq);
 	}
 }
 
diff --git a/src/network.h b/src/network.h
index f0bf8ae3..b87b13f5 100644
--- a/src/network.h
+++ b/src/network.h
@@ -4,7 +4,7 @@
 #include "server.h"
 
 network_status_t network_write_chunkqueue(server *srv, connection *con, chunkqueue *c);
-network_status_t network_read_chunkqueue(server *srv, connection *con, chunkqueue *c);
+network_status_t network_read(server *srv, connection *con, iosocket *sock, chunkqueue *c);
 
 int network_init(server *srv);
 int network_close(server *srv);