Re: Squid GET format

[Sketch <sketchster@xxxxxxxxx>]

On 4/24/06, Henrik Nordstrom <henrik@xxxxxxxxxxxxxxxxxxx> wrote:
> mån 2006-04-24 klockan 11:12 -0400 skrev Sketch:
>
> > Has anyone created a patch that combines customlog and rproxy?
>
> I don't remember it being a problem last time I tried.. checking.. hmm,
> you might be right.
>
> If you start with rproxy and then customlog the edits should be more,
> but fairly trivial each.

Below is the .rej file after attempting to apply the customlog patch
on top of the source already patched by rproxy, can you send a hand
with this?:


***************
*** 2072,2077 ****
      }
      if (http->out.offset == 0) {
        rep = clientBuildReply(http, buf, size);
        if (rep) {
            aclCheck_t *ch;
            int rv;
--- 2084,2090 ----
      }
      if (http->out.offset == 0) {
        rep = clientBuildReply(http, buf, size);
+       http->al.reply = rep;
        if (rep) {
            aclCheck_t *ch;
            int rv;
***************
*** 2094,2100 ****
                http->entry = clientCreateStoreEntry(http,
http->request->method,
                    null_request_flags);
                errorAppendEntry(http->entry, err);
-               httpReplyDestroy(rep);
                memFree(buf, MEM_CLIENT_SOCK_BUF);
                return;
            }
--- 2107,2112 ----
                http->entry = clientCreateStoreEntry(http,
http->request->method,
                    null_request_flags);
                errorAppendEntry(http->entry, err);
                memFree(buf, MEM_CLIENT_SOCK_BUF);
                return;
            }
***************
*** 2129,2135 ****
                    http->entry = clientCreateStoreEntry(http,
http->request->method,
                        null_request_flags);
                    errorAppendEntry(http->entry, err);
-                   httpReplyDestroy(rep);
                    memFree(buf, MEM_CLIENT_SOCK_BUF);
                    return;
                }
--- 2141,2146 ----
                    http->entry = clientCreateStoreEntry(http,
http->request->method,
                        null_request_flags);
                    errorAppendEntry(http->entry, err);
                    memFree(buf, MEM_CLIENT_SOCK_BUF);
                    return;
                }
***************
*** 2177,2183 ****
  #if HEADERS_LOG
        headersLog(0, 0, http->request->method, rep);
  #endif
-       httpReplyDestroy(rep);