From 4bef0baf95850b1ee0fa5f5a8fda20872ce59426 Mon Sep 17 00:00:00 2001 From: rsc Date: Mon, 27 Dec 2004 00:13:04 +0000 Subject: changes from plan 9 --- src/libhttpd/date.c | 1 + src/libhttpd/hio.c | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) (limited to 'src/libhttpd') diff --git a/src/libhttpd/date.c b/src/libhttpd/date.c index 450f60f7..33349578 100644 --- a/src/libhttpd/date.c +++ b/src/libhttpd/date.c @@ -197,6 +197,7 @@ hdate2sec(char *date) strcpy(tm.zone, "GMT"); tm.tzoff = 0; + tm.yday = 0; return tm2sec(&tm); } diff --git a/src/libhttpd/hio.c b/src/libhttpd/hio.c index a89f311d..937997d0 100644 --- a/src/libhttpd/hio.c +++ b/src/libhttpd/hio.c @@ -283,7 +283,7 @@ hload(Hio *h, char *buf) s = strchr(hxfers, buf[1]); if(s == nil) - return 0; + return -1; h->xferenc = s - hxfers; t = h->start; @@ -393,8 +393,8 @@ hprint(Hio *h, char *fmt, ...) return n; } -int -hflush(Hio *h) +static int +_hflush(Hio *h, int dolength) { uchar *s; int w; @@ -417,6 +417,8 @@ hflush(Hio *h) h->pos[1] = '\n'; w = &h->pos[2] - s; } + if(dolength) + fprint(h->fd, "Content-Length: %d\r\n\r\n", w); if(write(h->fd, s, w) != w){ h->state = Herr; h->stop = h->pos; @@ -427,6 +429,18 @@ hflush(Hio *h) return 0; } +int +hflush(Hio *h) +{ + return _hflush(h, 0); +} + +int +hlflush(Hio* h) +{ + return _hflush(h, 1); +} + int hwrite(Hio *h, void *vbuf, int len) { -- cgit v1.2.3