afs: Use nonblocking API for server commands.

[paraslash.git] / http_recv.c

diff --git a/http_recv.c b/http_recv.c
index 3078c5fdf13a67599c65bc3b0c3fac4e8da4053f..636e224158a965ab68c0685c93411fe4767ea991 100644 (file)
--- a/http_recv.c
+++ b/http_recv.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.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -116,12 +116,12 @@ static void http_recv_post_select(struct sched *s, struct task *t)
                phd->status = HTTP_SENT_GET_REQUEST;
                return;
        }
                phd->status = HTTP_SENT_GET_REQUEST;
                return;
        }

-       if (!FD_ISSET(phd->fd, &s->rfds))
-               return;

        if (phd->status == HTTP_SENT_GET_REQUEST) {
        if (phd->status == HTTP_SENT_GET_REQUEST) {

-               ret = recv_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG));
+               ret = read_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds);

                if (ret < 0)
                        goto err;
                if (ret < 0)
                        goto err;

+               if (ret == 0)
+                       return;

                PARA_INFO_LOG("received ok msg, streaming\n");
                phd->status = HTTP_STREAMING;
                return;
                PARA_INFO_LOG("received ok msg, streaming\n");
                phd->status = HTTP_STREAMING;
                return;