- up to 2.6.STABLE16

Changed files:
    squid.conf.patch -> 1.8

diff --git a/squid.conf.patch b/squid.conf.patch
index 93cc11f4074bc96c669ac35d25ad69e155609f17..0557e09432f1bd9efab1dd7302caf32af16e064d 100644 (file)
--- a/squid.conf.patch
+++ b/squid.conf.patch
@@ -1,28 +1,27 @@
---- squid.conf.default 2004-08-24 11:51:14.723512904 +0200
-+++ squid.conf 2004-08-24 11:51:29.986192624 +0200
-@@ -688,8 +688,12 @@
+--- squid.conf.default 2007-09-19 14:12:39.156693053 +0200
++++ squid.conf 2007-09-19 14:37:07.342454656 +0200
+@@ -622,7 +622,7 @@
+ # We strongly recommend the following be uncommented to protect innocent
+ # web applications running on the proxy server who think the only
+ # one who can access services on "localhost" is a local user
+-#http_access deny to_localhost
++http_access deny to_localhost
+ #
+ # INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
+ 
+@@ -1832,8 +1832,10 @@
  #     Note that for coss, max-size must be less than COSS_MEMBUF_SZ
  #     (hard coded at 1 MB).
  #
-+#     NOTE: Remeber to initialize cache directories:
-+#           squid -z -F
++#     NOTE: Remeber to initialize cache directories: squid -z -F
 +#
  #Default:
- # cache_dir ufs /var/cache/squid 100 16 256
+-# cache_dir ufs /var/cache/squid 100 16 256
 +cache_dir diskd /var/cache/squid 100 16 256
  
- #  TAG: cache_access_log
- #     Logs the client request activity.  Contains an entry for
-@@ -2025,6 +2030,8 @@
- #
- #Default:
- # cache_effective_user nobody
-+cache_effective_user squid
-+cache_effective_group squid
- 
- #  TAG: visible_hostname
- #     If you want to present a special hostname in error messages, etc,
-@@ -2200,8 +2207,14 @@
+ #  TAG: store_dir_select_algorithm
+ #     Set this to 'round-robin' as an alternative.
+@@ -2068,8 +2070,13 @@
  #     in the habit of using 'squid -k rotate' instead of 'kill -USR1
  #     <pid>'.
  #
@@ -32,19 +31,26 @@
 +#     to do it's job.
 +#
  #Default:
- # logfile_rotate 10
+-# logfile_rotate 10
 +logfile_rotate 0
  
- #  TAG: append_domain
- #     Appends local domain name to hostnames without any dots in
---- squid.conf~        2005-10-20 13:15:15.000000000 +0300
-+++ squid.conf 2005-10-20 13:15:16.000000000 +0300
-@@ -1862,7 +1862,7 @@
- # We strongly recommend the following be uncommented to protect innocent
- # web applications running on the proxy server who think the only
- # one who can access services on "localhost" is a local user
--#http_access deny to_localhost
-+http_access deny to_localhost
+ #  TAG: emulate_httpd_log     on|off
+ #     The Cache can emulate the log file format which many 'httpd'
+@@ -2982,7 +2989,7 @@
+ #     cache_effective_user.
  #
- # INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
+ #Default:
+-# cache_effective_user nobody
++cache_effective_user squid
+ 
+ #  TAG: cache_effective_group
+ #     If you want Squid to run with a specific GID regardless of
+@@ -2994,7 +3001,7 @@
+ #     group.
+ #
+ #Default:
+-# none
++cache_effective_group squid
  
+ #  TAG: httpd_suppress_version_string on|off
+ #     Suppress Squid version string info in HTTP headers and HTML error pages.