X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=3e9c95393c5120c82bd91cc4bd84e5ea9c56f60c;hp=50211701b2f3df2c5fd8e919b352b7c967961b3a;hb=d1e6b28f66e243516d01916f9125baee75dd98d6;hpb=ef1f130a1f9ac61a51da10ee56c5bd9ef1b52366 diff --git a/http_send.c b/http_send.c index 50211701..3e9c9539 100644 --- a/http_send.c +++ b/http_send.c @@ -1,15 +1,19 @@ /* - * Copyright (C) 2005-2011 Andre Noll + * Copyright (C) 2005-2014 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" @@ -54,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); @@ -126,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;