X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=http_recv.c;h=ac942b4f26e5012b3d92ecf655b6311ad2d9c489;hb=181beb316afad036ac01a778544c5dec0a8d51c7;hp=1fb60bad810d86dbbb0098a3714c2caa3d9e835b;hpb=b3c68fd8519a426d6b6285dcb5a865670285e99a;p=paraslash.git

diff --git a/http_recv.c b/http_recv.c
index 1fb60bad..ac942b4f 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -93,7 +93,7 @@ static int http_recv_post_select(struct sched *s, void *context)
 		return 0;
 	if (phd->status == HTTP_CONNECTED) {
 		char *rq;
-		if (!FD_ISSET(rn->fd, &s->wfds))
+		if (!sched_write_ok(rn->fd, s))
 			return 0;
 		rq = make_request_msg();
 		PARA_INFO_LOG("sending http request\n");
@@ -105,7 +105,7 @@ static int http_recv_post_select(struct sched *s, void *context)
 		return 0;
 	}
 	if (phd->status == HTTP_SENT_GET_REQUEST) {
-		ret = read_pattern(rn->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds);
+		ret = read_pattern(rn->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG));
 		if (ret < 0) {
 			PARA_ERROR_LOG("did not receive HTTP OK message\n");
 			goto out;
@@ -120,7 +120,7 @@ static int http_recv_post_select(struct sched *s, void *context)
 	iovcnt = btr_pool_get_buffers(rn->btrp, iov);
 	if (iovcnt == 0)
 		goto out;
-	ret = readv_nonblock(rn->fd, iov, iovcnt, &s->rfds, &num_bytes);
+	ret = readv_nonblock(rn->fd, iov, iovcnt, &num_bytes);
 	if (num_bytes == 0)
 		goto out;
 	if (num_bytes <= iov[0].iov_len) /* only the first buffer was filled */