X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=http_send.c;h=c8879fec082cf6e662fb2f2f938ecc553ef9a117;hb=8a63543fdfbd3b5d00e4afecfbc397795a49ed04;hp=3959cad4f3b67326d6161a252c5b3a66a74e0394;hpb=383d1bfb5084ea5a475e408d3cc9d2e2a3de5b88;p=paraslash.git

diff --git a/http_send.c b/http_send.c
index 3959cad4..c8879fec 100644
--- a/http_send.c
+++ b/http_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -96,23 +96,20 @@ static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 {
 	struct sender_client *sc, *tmp;
 	struct private_http_sender_data *phsd;
+	int ret;
 
-	if (hss->listen_fd < 0)
-		return;
 	list_for_each_entry_safe(sc, tmp, &hss->client_list, node) {
 		phsd = sc->private_data;
 		switch (phsd->status) {
 		case HTTP_STREAMING: /* nothing to do */
 			break;
 		case HTTP_CONNECTED: /* need to recv get request */
-			if (FD_ISSET(sc->fd, rfds)) {
-				if (recv_pattern(sc->fd, HTTP_GET_MSG, MAXLINE)
-						< 0) {
-					phsd->status = HTTP_INVALID_GET_REQUEST;
-				} else {
-					phsd->status = HTTP_GOT_GET_REQUEST;
-					PARA_INFO_LOG("received get request\n");
-				}
+			ret = read_pattern(sc->fd, HTTP_GET_MSG, MAXLINE, rfds);
+			if (ret < 0)
+				phsd->status = HTTP_INVALID_GET_REQUEST;
+			else if (ret > 0) {
+				phsd->status = HTTP_GOT_GET_REQUEST;
+				PARA_INFO_LOG("received get request\n");
 			}
 			break;
 		case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
@@ -135,7 +132,7 @@ static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 	phsd->status = HTTP_CONNECTED;
 }
 
-static void http_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wfds)
+static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 {
 	struct sender_client *sc, *tmp;
 
@@ -146,6 +143,9 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wf
 		struct private_http_sender_data *phsd = sc->private_data;
 		if (phsd->status == HTTP_CONNECTED) /* need to recv get request */
 			para_fd_set(sc->fd, rfds, max_fileno);
+		if (phsd->status == HTTP_GOT_GET_REQUEST ||
+				phsd->status == HTTP_INVALID_GET_REQUEST)
+			para_fd_set(sc->fd, wfds, max_fileno);
 	}
 }