summaryrefslogtreecommitdiff
path: root/www/ziproxy/files/patch-ziproxy.conf
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--www/ziproxy/files/patch-ziproxy.conf33
1 files changed, 21 insertions, 12 deletions
diff --git a/www/ziproxy/files/patch-ziproxy.conf b/www/ziproxy/files/patch-ziproxy.conf
index d4225c3764ff..10253c5661e2 100644
--- a/www/ziproxy/files/patch-ziproxy.conf
+++ b/www/ziproxy/files/patch-ziproxy.conf
@@ -1,5 +1,5 @@
---- etc/ziproxy/ziproxy.conf.orig 2009-03-13 17:41:27.000000000 +0300
-+++ etc/ziproxy/ziproxy.conf 2009-04-15 10:41:25.000000000 +0400
+--- etc/ziproxy/ziproxy.conf.orig 2010-03-08 12:23:20.000000000 +0300
++++ etc/ziproxy/ziproxy.conf 2010-03-12 23:51:38.000000000 +0300
@@ -12,12 +12,12 @@
## If you have more than one network interface,
## it's useful for restricting to which interface you want to bind to.
@@ -13,9 +13,18 @@
-# OnlyFrom = "127.0.0.1"
+OnlyFrom = "127.0.0.1"
- ## Inactivity timeout before closing the daemon (0 = no timeout)
- ## default: 0 (no timeout)
-@@ -82,7 +82,7 @@
+ ## Limits the number of simultaneous active user connections.
+ ## This does not affect the connection queue (see: SOMAXCONN).
+@@ -120,7 +120,7 @@
+ ## In order to match a whole site: "http://www.examplehost.xyz/*"
+ ##
+ ## Default: none
+-# TOSMarkAsDiffURL = "/etc/ziproxy/change_tos.list"
++# TOSMarkAsDiffURL = "%%PREFIX%%/etc/ziproxy/change_tos.list"
+
+ ## This is the content-type list of data that should
+ ## have their traffic "differentiated"
+@@ -261,7 +261,7 @@
## HTTP auth file
## Should contain user:pass pairs, lines no longer than 128 chars
## Password is unencrypted
@@ -24,7 +33,7 @@
## Forward everything to another proxy server.
## Modifications/compression is still applied.
-@@ -120,7 +120,7 @@
+@@ -299,7 +299,7 @@
## This option has no effect if BindOutgoing is not used.
## Default: empty, no hosts are exempted.
## See also: BindOutgoingExAddr
@@ -33,7 +42,7 @@
## Defines a specific IP to be bound to for hosts specified in BindOutgoingExList.
## As with BindOutgoing, this IP must be a local IP from the server running Ziproxy.
-@@ -429,7 +429,7 @@
+@@ -664,7 +664,7 @@
## *** THIS IS NOT SUPPOSED TO BE A DEFINITIVE SOLUTION TO INCOMPATIBILITIES ***
##
## Default: empty (no file specified, inactive)
@@ -42,7 +51,7 @@
## This option specifies a file containing a list of URLs which its
## data should be intercepted and replaced by another.
-@@ -448,7 +448,7 @@
+@@ -683,7 +683,7 @@
##
## Default: empty (no file specified, inactive)
## See also: URLReplaceDataCT
@@ -51,7 +60,7 @@
## Same as URLReplaceData, except it will only replace the data
## from matching URLs if the content-type matches
-@@ -462,7 +462,7 @@
+@@ -697,7 +697,7 @@
##
## Default: empty (no file specified, inactive)
## See also: URLReplaceDataCTList, URLReplaceData
@@ -59,8 +68,8 @@
+# URLReplaceDataCT = "%%PREFIX%%/etc/ziproxy/replace_ct.list"
## List of content-types to use with the URLReplaceDataCT option.
- ## Default: empty (no content-type specified, inactive)
-@@ -474,7 +474,7 @@
+ ## This option is required by URLReplaceDataCT.
+@@ -723,7 +723,7 @@
## A "access denied" 403 error will be returned when trying to access
## one of those URLs.
## Default: empty (no file specified, inactive)
@@ -69,7 +78,7 @@
## Custom HTTP Error Messages
## Define here the full path to the HTML file which should be
-@@ -482,21 +482,21 @@
+@@ -731,21 +731,21 @@
## Note: The internal defaults give more precise error messages.
##
## 400 - Bad request (malformed URL, or unknown URL type)