Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ratequeue: Log request blocking.
[ashd.git]
/
src
/
accesslog.c
diff --git
a/src/accesslog.c
b/src/accesslog.c
index
7328c4d
..
af43373
100644
(file)
--- a/
src/accesslog.c
+++ b/
src/accesslog.c
@@
-223,9
+223,12
@@
static int passdata(struct bufio *in, struct bufio *out, off_t *passed)
total = 0;
while(!bioeof(in)) {
total = 0;
while(!bioeof(in)) {
- if((read = biocopysome(out, in)) < 0)
- return(-1);
- total += read;
+ if((read = biordata(in)) > 0) {
+ if((read = biowritesome(out, in->rbuf.b + in->rh, read)) < 0)
+ return(-1);
+ in->rh += read;
+ total += read;
+ }
if(biorspace(in) && (biofillsome(in) < 0))
return(-1);
}
if(biorspace(in) && (biofillsome(in) < 0))
return(-1);
}
@@
-241,6
+244,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;
@@
-248,10
+252,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;
@@
-265,6
+269,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");