- added patch which allows to unify referer and access log files

Changed files:
    squid-empty-referer.patch -> 1.1
    squid.spec -> 1.138

diff --git a/squid-empty-referer.patch b/squid-empty-referer.patch
new file mode 100644 (file)
index 0000000..a7608b4
--- /dev/null
+++ b/squid-empty-referer.patch
@@ -0,0 +1,20 @@
+diff -Nur squid-2.5.STABLE3.orig/src/client_side.c squid-2.5.STABLE3/src/client_side.c
+--- squid-2.5.STABLE3.orig/src/client_side.c   Mon Sep  8 15:44:34 2003
++++ squid-2.5.STABLE3/src/client_side.c        Mon Sep  8 17:00:06 2003
+@@ -988,11 +988,16 @@
+ #if USE_USERAGENT_LOG
+     if ((str = httpHeaderGetStr(req_hdr, HDR_USER_AGENT)))
+       logUserAgent(fqdnFromAddr(http->conn->log_addr), str);
++    else
++      logUserAgent(fqdnFromAddr(http->conn->log_addr), "-");
+ #endif
+ #if USE_REFERER_LOG
+     if ((str = httpHeaderGetStr(req_hdr, HDR_REFERER)))
+       logReferer(fqdnFromAddr(http->conn->log_addr), str,
+           http->log_uri);
++    else
++      logReferer(fqdnFromAddr(http->conn->log_addr), "-",
++      http->log_uri);
+ #endif
+ #if FORW_VIA_DB
+     if (httpHeaderHas(req_hdr, HDR_X_FORWARDED_FOR)) {

diff --git a/squid.spec b/squid.spec
index 31d1f30c3263133fcfb7d19bb05b444a75c1e651..ecbbbf41c2a465dcea7db5b2e0939a080b0933ec 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -7,7 +7,7 @@ Summary(uk):    Squid - 
 Summary(zh_CN):        SQUID ¸ßËÙ»º³å´úÀí·þÎñÆ÷
 Name:          squid
 Version:       2.5.STABLE3
-Release:       6
+Release:       7
 Epoch:         7
 License:       GPL v2
 Group:         Networking/Daemons
@@ -75,6 +75,7 @@ Patch180:     %{name}-crash-on-ENOSPC.patch
 Patch190:      %{name}-newssl.patch
 Patch200:      %{name}-sasl.patch
 Patch210:      http://piorun.ds.pg.gda.pl/~blues/patches/squid-more_FD-new.patch
+Patch220:      %{name}-empty-referer.patch
 BuildRequires: autoconf
 BuildRequires: cyrus-sasl-devel >= 2.1.0
 BuildRequires: openldap-devel
@@ -496,6 +497,7 @@ z pakietu Samba 2.2.4 lub wy
 %patch190 -p1
 %patch200 -p1
 %patch210 -p1
+%patch220 -p1
 
 %build
 %{__aclocal}