[squid-users] Custom log patch - Squid version 2.5.10 Stable.

Hi,

We want to implement the custom log patch on our existing squids
before upgrading.

The patch installed with the following errors.

patch -p1 < customlog-2_5.patch
patching file src/access_log.c
patching file src/cache_cf.c
Hunk #2 succeeded at 2639 (offset 6 lines).
patching file src/cf.data.pre
Hunk #1 succeeded at 833 (offset -1 lines).
Hunk #2 succeeded at 2511 (offset -10 lines).
patching file src/client_side.c
Hunk #1 succeeded at 850 (offset -21 lines).
Hunk #3 succeeded at 892 (offset -21 lines).
Hunk #4 FAILED at 2020.
Hunk #5 FAILED at 2054.
2 out of 5 hunks FAILED -- saving rejects to file src/client_side.c.rej
patching file src/icp_v2.c
patching file src/logfile.c
patching file src/protos.h
patching file src/structs.h
Hunk #3 succeeded at 620 (offset -4 lines).
Hunk #5 succeeded at 2204 (offset -11 lines).
patching file src/typedefs.h

Here is a cut and paste of the src/client_side.c.rej

Rejects file.

***************
*** 2010,2017 ****
                http->entry = clientCreateStoreEntry(http,
http->request->method,
                    null_request_flags);
                errorAppendEntry(http->entry, err);
- httpReplyDestroy(http->reply);
- http->reply = NULL;
                memFree(buf, MEM_CLIENT_SOCK_BUF);
                return;
            }
--- 2020,2025 ----
                http->entry = clientCreateStoreEntry(http,
http->request->method,
                    null_request_flags);
                errorAppendEntry(http->entry, err);
                memFree(buf, MEM_CLIENT_SOCK_BUF);
                return;
            }
***************
*** 2046,2053 ****
                    http->entry = clientCreateStoreEntry(http,
http->request->method,
                        null_request_flags);
                    errorAppendEntry(http->entry, err);
- httpReplyDestroy(http->reply);
- http->reply = NULL;
                    memFree(buf, MEM_CLIENT_SOCK_BUF);
                    return;
                }
--- 2054,2059 ----
                    http->entry = clientCreateStoreEntry(http,
http->request->method,
                        null_request_flags);
                    errorAppendEntry(http->entry, err);
                    memFree(buf, MEM_CLIENT_SOCK_BUF);
                    return;
                }

Anyone seen this before?

Thanks in advance.

Mark.
Received on Thu Jun 29 2006 - 05:17:52 MDT