Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
etc: Add environment option to run init.d/ashd silently.
[ashd.git]
/
src
/
accesslog.c
diff --git
a/src/accesslog.c
b/src/accesslog.c
index
d77a467
..
0c7ef8d
100644
(file)
--- a/
src/accesslog.c
+++ b/
src/accesslog.c
@@
-96,6
+96,16
@@
static void logitem(struct logdata *data, char o, char *d)
qputs(h, out);
}
break;
qputs(h, out);
}
break;
+ case 'p':
+ if(!data->resp || ((h = getheader(data->resp, d)) == NULL)) {
+ putc('-', out);
+ } else {
+ qputs(h, out);
+ }
+ break;
+ case 'P':
+ logitem(data, 'p', sprintf3("X-Ash-%s", d));
+ break;
case 'u':
qputs(data->req->url, out);
break;
case 'u':
qputs(data->req->url, out);
break;
@@
-244,6
+254,7
@@
static void filterreq(struct muth *mt, va_list args)
int pfds[2];
struct hthead *resp;
struct bufio *cl, *hd;
int pfds[2];
struct hthead *resp;
struct bufio *cl, *hd;
+ struct stdiofd *cli, *hdi;
struct logdata data;
hd = NULL;
struct logdata data;
hd = NULL;
@@
-251,10
+262,10
@@
static void filterreq(struct muth *mt, va_list args)
data = defdata;
data.req = req;
gettimeofday(&data.start, NULL);
data = defdata;
data.req = req;
gettimeofday(&data.start, NULL);
- cl = mtbioopen(fd, 1, 600, "r+",
NULL
);
+ cl = mtbioopen(fd, 1, 600, "r+",
&cli
);
if(socketpair(PF_UNIX, SOCK_STREAM, 0, pfds))
goto out;
if(socketpair(PF_UNIX, SOCK_STREAM, 0, pfds))
goto out;
- hd = mtbioopen(pfds[1], 1, 600, "r+",
NULL
);
+ hd = mtbioopen(pfds[1], 1, 600, "r+",
&hdi
);
if(sendreq(ch, req, pfds[0])) {
close(pfds[0]);
goto out;
if(sendreq(ch, req, pfds[0])) {
close(pfds[0]);
goto out;
@@
-268,6
+279,8
@@
static void filterreq(struct muth *mt, va_list args)
shutdown(pfds[1], SHUT_WR);
if((resp = parseresponseb(hd)) == NULL)
goto out;
shutdown(pfds[1], SHUT_WR);
if((resp = parseresponseb(hd)) == NULL)
goto out;
+ cli->sendrights = hdi->rights;
+ hdi->rights = -1;
data.resp = resp;
writerespb(cl, resp);
bioprintf(cl, "\r\n");
data.resp = resp;
writerespb(cl, resp);
bioprintf(cl, "\r\n");
@@
-505,7
+518,7
@@
int main(int argc, char **argv)
pidfile = optarg;
break;
case 'a':
pidfile = optarg;
break;
case 'a':
- format = "%A -
-
[%{%d/%b/%Y:%H:%M:%S %z}t] \"%m %u %v\" %c %o \"%R\" \"%G\"";
+ format = "%A -
%{log-user}P
[%{%d/%b/%Y:%H:%M:%S %z}t] \"%m %u %v\" %c %o \"%R\" \"%G\"";
break;
default:
usage(stderr);
break;
default:
usage(stderr);