Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
htparser: Add a `Server' header if none previously present.
[ashd.git]
/
src
/
htparser.c
diff --git
a/src/htparser.c
b/src/htparser.c
index
0824902
..
33ceb49
100644
(file)
--- a/
src/htparser.c
+++ b/
src/htparser.c
@@
-22,6
+22,7
@@
#include <string.h>
#include <sys/socket.h>
#include <pwd.h>
#include <string.h>
#include <sys/socket.h>
#include <pwd.h>
+#include <sys/signal.h>
#include <errno.h>
#ifdef HAVE_CONFIG_H
#include <errno.h>
#ifdef HAVE_CONFIG_H
@@
-271,11
+272,17
@@
void serve(FILE *in, struct conn *conn)
if((resp = parseresp(out)) == NULL)
break;
replstr(&resp->ver, req->ver);
if((resp = parseresp(out)) == NULL)
break;
replstr(&resp->ver, req->ver);
+
+ if(!getheader(resp, "server"))
+ headappheader(resp, "Server", sprintf3("ashd/%s", VERSION));
if(!strcmp(req->ver, "HTTP/1.0")) {
writeresp(in, resp);
fprintf(in, "\r\n");
if(!strcmp(req->ver, "HTTP/1.0")) {
writeresp(in, resp);
fprintf(in, "\r\n");
- if((hd = getheader(resp, "content-length")) != NULL) {
+ if(!strcasecmp(req->method, "head")) {
+ if(!hasheader(req, "connection", "keep-alive"))
+ break;
+ } else if((hd = getheader(resp, "content-length")) != NULL) {
dlen = passdata(out, in, -1);
if(dlen != atoo(hd))
break;
dlen = passdata(out, in, -1);
if(dlen != atoo(hd))
break;
@@
-288,7
+295,10
@@
void serve(FILE *in, struct conn *conn)
if(hasheader(req, "connection", "close") || hasheader(resp, "connection", "close"))
break;
} else if(!strcmp(req->ver, "HTTP/1.1")) {
if(hasheader(req, "connection", "close") || hasheader(resp, "connection", "close"))
break;
} else if(!strcmp(req->ver, "HTTP/1.1")) {
- if((hd = getheader(resp, "content-length")) != NULL) {
+ if(!strcasecmp(req->method, "head")) {
+ writeresp(in, resp);
+ fprintf(in, "\r\n");
+ } else if((hd = getheader(resp, "content-length")) != NULL) {
writeresp(in, resp);
fprintf(in, "\r\n");
dlen = passdata(out, in, -1);
writeresp(in, resp);
fprintf(in, "\r\n");
dlen = passdata(out, in, -1);
@@
-453,7
+463,7
@@
int main(int argc, char **argv)
usage(stderr);
exit(1);
}
usage(stderr);
exit(1);
}
- if((plex = stdmkchild(argv + ++i)) < 0) {
+ if((plex = stdmkchild(argv + ++i
, NULL, NULL
)) < 0) {
flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno));
return(1);
}
flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno));
return(1);
}
@@
-483,6
+493,7
@@
int main(int argc, char **argv)
exit(1);
}
}
exit(1);
}
}
+ signal(SIGPIPE, SIG_IGN);
if(daemonize) {
daemon(0, 0);
}
if(daemonize) {
daemon(0, 0);
}