X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=3d72c7c7396ca3b8f96f63653aec9c021cb90846;hp=b566acf3c0612a48d5796ca01dae5359bb93386e;hb=8187d1acf18bfcf63db7b3a35ecb2ea3358fa2ad;hpb=899a19c03fc05f6fd98687e3eaa86841a4633a10

diff --git a/http_recv.c b/http_recv.c
index b566acf3..3d72c7c7 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -110,44 +110,49 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 	struct receiver_node *rn = t->private_data;
 	struct private_http_recv_data *phd = rn->private_data;
 
+	t->ret = -E_HTTP_RECV_EOF;
+	if (rn->output_eof && *rn->output_eof)
+		goto out;
 	t->ret = 1;
-	if (!s->select_ret) /* we're not interested in timeouts */
-		return;
+	if (!s->select_ret)
+		goto out;
 	if  (phd->status == HTTP_CONNECTED) {
 		char *rq;
 		if (!FD_ISSET(phd->fd, &s->wfds))
-			return; /* nothing to do */
+			goto out;
 		rq = make_request_msg();
 		PARA_NOTICE_LOG("%s", "sending http request\n");
 		t->ret = send_va_buffer(phd->fd, "%s", rq);
 		free(rq);
 		if (t->ret > 0)
 			phd->status = HTTP_SENT_GET_REQUEST;
-		return;
+		goto out;
 	}
 	if (!FD_ISSET(phd->fd, &s->rfds))
-		return; /* nothing to do */
+		goto out;
 	if (phd->status == HTTP_SENT_GET_REQUEST) {
 		t->ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
 		if (t->ret < 0)
-			return;
+			goto out;
 		PARA_NOTICE_LOG("%s", "received ok msg, streaming\n");
+		t->ret = 1;
 		phd->status = HTTP_STREAMING;
-		return;
+		goto out;
 	}
 	t->ret = -E_OVERRUN;
-	/* already streaming */
 	if (rn->loaded >= BUFSIZE)
-		return;
+		goto out;
 	t->ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
 		BUFSIZE - rn->loaded);
 	if (t->ret <= 0) {
-		rn->eof = 1;
 		if (!t->ret)
 			t->ret = -E_HTTP_RECV_EOF;
-		return;
+		goto out;
 	}
 	rn->loaded += t->ret;
+out:
+	if (t->ret < 0)
+		rn->eof = 1;
 }
 
 static void http_recv_close(struct receiver_node *rn)
@@ -180,8 +185,8 @@ static int http_recv_open(struct receiver_node *rn)
 	rn->private_data = para_calloc(sizeof(struct private_http_recv_data));
 	phd = rn->private_data;
 	PARA_NOTICE_LOG("phd = %p, rn = %p\n", phd, rn);
-	ret = -E_HOST_INFO;
-	if (!(he = get_host_info(conf->host_arg)))
+	ret = get_host_info(conf->host_arg, &he);
+	if (!ret < 0)
 		goto err_out;
 	/* get new socket */
 	ret = -E_SOCKET;