X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=eddc0295f229a26c4e826d8656712c4609a35989;hp=086b600f0d043f928e6c2c0f71afa65104045f00;hb=779cfd85fd90d1f9182deade08d5fe3f2f3a1530;hpb=a365b8263a0d7a1673699bdf454677c95b38eb95

diff --git a/http_send.c b/http_send.c
index 086b600f..eddc0295 100644
--- a/http_send.c
+++ b/http_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,9 +8,7 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <osl.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
@@ -22,6 +20,7 @@
 #include "http.h"
 #include "list.h"
 #include "send.h"
+#include "sched.h"
 #include "vss.h"
 #include "close_on_fork.h"
 #include "net.h"
@@ -54,7 +53,7 @@ static struct sender_status http_sender_status, *hss = &http_sender_status;
 
 static int http_send_msg(struct sender_client *sc, const char *msg)
 {
-	int ret = send_buffer(sc->fd, msg);
+	int ret = write_buffer(sc->fd, msg);
 
 	if (ret < 0)
 		shutdown_client(sc, hss);
@@ -126,7 +125,7 @@ static void http_send_chunk(struct sender_client *sc, struct sender_status *ss,
 		ret = queue_chunk_or_shutdown(sc, ss, buf, len);
 		goto out;
 	}
-	ret = write_nonblock(sc->fd, buf, len);
+	ret = xwrite(sc->fd, buf, len);
 	if (ret < 0) {
 		shutdown_client(sc, ss);
 		goto out;