X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=60b877c08082ffa7e1cd7fb41617ab32bb7a465a;hp=e376c4646cc92554dda73cd906d34f9d2f8e7155;hb=d87806284b9f6be9aab71ccbf0280d273b57eeb3;hpb=de569025d2a282444293d56d4a1209d70f8b7e33 diff --git a/http_send.c b/http_send.c index e376c464..60b877c0 100644 --- a/http_send.c +++ b/http_send.c @@ -1,15 +1,19 @@ /* - * Copyright (C) 2005-2010 Andre Noll + * Copyright (C) 2005-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file http_send.c paraslash's http sender */ +#include +#include #include #include -#include #include +#include +#include +#include #include "para.h" #include "error.h" @@ -21,6 +25,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 +58,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 +130,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;