Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a couple of htparser bugs.
[ashd.git]
/
src
/
htparser.c
diff --git
a/src/htparser.c
b/src/htparser.c
index
57b7a26
..
184e7b9
100644
(file)
--- a/
src/htparser.c
+++ b/
src/htparser.c
@@
-296,7
+296,7
@@
static off_t passdata(int src, int dst, struct charbuf *buf, off_t max)
sent = 0;
eof = 0;
sent = 0;
eof = 0;
- while(
!eof || (buf->d > 0
)) {
+ while(
(!eof || (buf->d > 0)) && ((max < 0) || (sent < max)
)) {
if(!eof && (buf->d < buf->s) && ((max < 0) || (sent + buf->d < max))) {
while(1) {
ret = recv(src, buf->b + buf->d, buf->s - buf->d, MSG_DONTWAIT);
if(!eof && (buf->d < buf->s) && ((max < 0) || (sent + buf->d < max))) {
while(1) {
ret = recv(src, buf->b + buf->d, buf->s - buf->d, MSG_DONTWAIT);
@@
-342,8
+342,8
@@
static void serve(struct muth *muth, va_list args)
char *hd;
struct charbuf inbuf, outbuf;
struct hthead *req, *resp;
char *hd;
struct charbuf inbuf, outbuf;
struct hthead *req, *resp;
- off_t sent;
- size_t headoff;
+ off_t
dlen,
sent;
+ s
s
ize_t headoff;
char nmbuf[256];
bufinit(inbuf);
char nmbuf[256];
bufinit(inbuf);
@@
-369,6
+369,10
@@
static void serve(struct muth *muth, va_list args)
goto out;
inbuf.b[headoff] = old;
bufeat(inbuf, headoff);
goto out;
inbuf.b[headoff] = old;
bufeat(inbuf, headoff);
+ /* We strip off the leading slash from the rest string, so
+ * that multiplexers can parse coherently. */
+ if(req->rest[0] == '/')
+ replrest(req, req->rest + 1);
/*
* Add metainformation and then send the request to the root
/*
* Add metainformation and then send the request to the root
@@
-382,6
+386,17
@@
static void serve(struct muth *muth, va_list args)
headappheader(req, "X-Ash-Port", sprintf3("%i", ntohs(((struct sockaddr_in6 *)&name)->sin6_port)));
}
cfd = sendreq(plex, req);
headappheader(req, "X-Ash-Port", sprintf3("%i", ntohs(((struct sockaddr_in6 *)&name)->sin6_port)));
}
cfd = sendreq(plex, req);
+
+ /*
+ * If there is message data, pass it:
+ */
+ if((hd = getheader(req, "content-length")) != NULL) {
+ dlen = atoo(hd);
+ if(dlen > 0)
+ passdata(fd, cfd, &inbuf, dlen);
+ }
+ /* Make sure to send EOF */
+ shutdown(cfd, SHUT_WR);
/*
* Find and decode the response header:
/*
* Find and decode the response header: