#include <string.h>
#include <sys/socket.h>
#include <pwd.h>
+#include <sys/signal.h>
#include <errno.h>
#ifdef HAVE_CONFIG_H
#include "htparser.h"
static int plex;
+static char *pidfile = NULL;
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");
+ } else if((hd = getheader(resp, "content-length")) != NULL) {
writeresp(in, resp);
fprintf(in, "\r\n");
- dlen = passdata(out, in, -1);
- if(dlen != atoo(hd))
+ dlen = atoo(hd);
+ if(passdata(out, in, dlen) != dlen)
break;
} else if(!getheader(resp, "transfer-encoding")) {
headappheader(resp, "Transfer-Encoding", "chunked");
static void usage(FILE *out)
{
- fprintf(out, "usage: htparser [-hSf] [-u USER] [-r ROOT] PORTSPEC... -- ROOT [ARGS...]\n");
+ fprintf(out, "usage: htparser [-hSf] [-u USER] [-r ROOT] [-p PIDFILE] PORTSPEC... -- ROOT [ARGS...]\n");
fprintf(out, "\twhere PORTSPEC is HANDLER[:PAR[=VAL][(,PAR[=VAL])...]] (try HANDLER:help)\n");
fprintf(out, "\tavailable handlers are `plain' and `ssl'.\n");
}
int i, s1;
int daemonize, logsys;
char *root;
+ FILE *pidout;
struct passwd *pwent;
daemonize = logsys = 0;
root = NULL;
pwent = NULL;
- while((c = getopt(argc, argv, "+hSfu:r:")) >= 0) {
+ while((c = getopt(argc, argv, "+hSfu:r:p:")) >= 0) {
switch(c) {
case 'h':
usage(stdout);
case 'r':
root = optarg;
break;
+ case 'p':
+ pidfile = optarg;
+ break;
default:
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);
}
mustart(plexwatch, plex);
+ pidout = NULL;
+ if(pidfile != NULL) {
+ if((pidout = fopen(pidfile, "w")) == NULL) {
+ flog(LOG_ERR, "could not open %s for writing: %s", pidfile, strerror(errno));
+ return(1);
+ }
+ }
if(logsys)
opensyslog();
if(root) {
exit(1);
}
}
+ signal(SIGPIPE, SIG_IGN);
if(daemonize) {
daemon(0, 0);
}
+ if(pidout != NULL) {
+ fprintf(pidout, "%i\n", getpid());
+ fclose(pidout);
+ }
ioloop();
return(0);
}