X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=52383b06b465d14b8369badbc3606a7753ec90c5;hp=e376c4646cc92554dda73cd906d34f9d2f8e7155;hb=6bcd10bc4ada11a04bc2b7425afe5a8855592cd2;hpb=de569025d2a282444293d56d4a1209d70f8b7e33 diff --git a/http_send.c b/http_send.c index e376c464..52383b06 100644 --- a/http_send.c +++ b/http_send.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2010 Andre Noll + * Copyright (C) 2005-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,7 +8,6 @@ #include #include -#include #include #include "para.h" @@ -21,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" @@ -53,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); @@ -125,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;