#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
+#include <fcntl.h>
#include <string.h>
#include <sys/socket.h>
#include <pwd.h>
static int plex;
static char *pidfile = NULL;
+static int daemonize, usesyslog;
static void trimx(struct hthead *req)
{
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((hd = getheader(resp, "content-length")) != NULL) {
- dlen = passdata(out, in, -1);
- if(dlen != atoo(hd))
+ if(!strcasecmp(req->method, "head")) {
+ if(!hasheader(req, "connection", "keep-alive"))
+ break;
+ } else if((hd = getheader(resp, "content-length")) != NULL) {
+ dlen = atoo(hd);
+ if(passdata(out, in, dlen) != dlen)
break;
if(!hasheader(req, "connection", "keep-alive"))
break;
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");
- dlen = passdata(out, in, -1);
- if(dlen != atoo(hd))
+ } else if((hd = getheader(resp, "content-length")) != NULL) {
+ writeresp(in, resp);
+ fprintf(in, "\r\n");
+ dlen = atoo(hd);
+ if(passdata(out, in, dlen) != dlen)
break;
} else if(!getheader(resp, "transfer-encoding")) {
headappheader(resp, "Transfer-Encoding", "chunked");
}
}
+static void initroot(void *uu)
+{
+ int fd;
+
+ if(daemonize) {
+ setsid();
+ chdir("/");
+ if((fd = open("/dev/null", O_RDWR)) >= 0) {
+ dup2(fd, 0);
+ dup2(fd, 1);
+ dup2(fd, 2);
+ close(fd);
+ }
+ }
+ if(usesyslog)
+ putenv("ASHD_USESYSLOG=1");
+ else
+ unsetenv("ASHD_USESYSLOG");
+}
+
static void usage(FILE *out)
{
fprintf(out, "usage: htparser [-hSf] [-u USER] [-r ROOT] [-p PIDFILE] PORTSPEC... -- ROOT [ARGS...]\n");
{
int c;
int i, s1;
- int daemonize, logsys;
char *root;
FILE *pidout;
struct passwd *pwent;
- daemonize = logsys = 0;
+ daemonize = usesyslog = 0;
root = NULL;
pwent = NULL;
while((c = getopt(argc, argv, "+hSfu:r:p:")) >= 0) {
daemonize = 1;
break;
case 'S':
- logsys = 1;
+ usesyslog = 1;
break;
case 'u':
if((pwent = getpwnam(optarg)) == NULL) {
usage(stderr);
exit(1);
}
- if((plex = stdmkchild(argv + ++i)) < 0) {
+ if((plex = stdmkchild(argv + ++i, initroot, NULL)) < 0) {
flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno));
return(1);
}
return(1);
}
}
- if(logsys)
+ if(usesyslog)
opensyslog();
if(root) {
if(chroot(root)) {