projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ce9c273
)
Rebuild with recent grammar fixes in the ACL section
author
Fabian Keil
<fk@fabiankeil.de>
Sat, 13 Nov 2010 12:48:18 +0000
(12:48 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Sat, 13 Nov 2010 12:48:18 +0000
(12:48 +0000)
config
patch
|
blob
|
history
diff --git
a/config
b/config
index
482a072
..
2675515
100644
(file)
--- a/
config
+++ b/
config
@@
-1,6
+1,6
@@
# Sample Configuration File for Privoxy v3.0.17
#
# Sample Configuration File for Privoxy v3.0.17
#
-# $Id: config,v 1.9
1 2010/11/06 12:56:15
fabiankeil Exp $
+# $Id: config,v 1.9
2 2010/11/06 12:58:42
fabiankeil Exp $
#
# Copyright (C) 2001-2010 Privoxy Developers http://www.privoxy.org/
#
#
# Copyright (C) 2001-2010 Privoxy Developers http://www.privoxy.org/
#
@@
-113,7
+113,6
@@
#
# user-manual /usr/share/doc/privoxy/user-manual
#
#
# user-manual /usr/share/doc/privoxy/user-manual
#
-#
# The User Manual is then available to anyone with
# access to Privoxy, by following the built-in URL:
# http://config.privoxy.org/user-manual/ (or the shortcut:
# The User Manual is then available to anyone with
# access to Privoxy, by following the built-in URL:
# http://config.privoxy.org/user-manual/ (or the shortcut:
@@
-124,7
+123,6
@@
#
# user-manual http://example.com/privoxy/user-manual/
#
#
# user-manual http://example.com/privoxy/user-manual/
#
-#
# WARNING!!!
#
# If set, this option should be the first option in the config
# WARNING!!!
#
# If set, this option should be the first option in the config
@@
-729,13
+727,11
@@
logfile logfile
#
# listen-address 192.168.0.1:8118
#
#
# listen-address 192.168.0.1:8118
#
-#
# Suppose you are running Privoxy on an IPv6-capable machine and
# you want it to listen on the IPv6 address of the loopback device:
#
# listen-address [::1]:8118
#
# Suppose you are running Privoxy on an IPv6-capable machine and
# you want it to listen on the IPv6 address of the loopback device:
#
# listen-address [::1]:8118
#
-#
listen-address 127.0.0.1:8118
#
#
listen-address 127.0.0.1:8118
#
#
@@
-1008,10
+1004,10
@@
enforce-blocks 0
# names. If a DNS name resolves to multiple IP addresses, only
# the first one is used.
#
# names. If a DNS name resolves to multiple IP addresses, only
# the first one is used.
#
-# Some systems allow
s IPv4 client
to connect to IPv6 server
-# socket
. Then the client's IPv4 address will be translated by
+# Some systems allow
IPv4 clients
to connect to IPv6 server
+# socket
s. Then the client's IPv4 address will be translated by the
# system into IPv6 address space with special prefix ::ffff:0:0/96
# system into IPv6 address space with special prefix ::ffff:0:0/96
-# (so called IPv4 mapped IPv6 address).
Privoxy can handle it
+# (so called IPv4 mapped IPv6 address). Privoxy can handle it
# and maps such ACL addresses automatically.
#
# Denying access to particular sites by ACL may have undesired
# and maps such ACL addresses automatically.
#
# Denying access to particular sites by ACL may have undesired
@@
-1278,7
+1274,6
@@
buffer-limit 4096
#
#
#
#
#
#
-#
# 5.3. forwarded-connect-retries
# ===============================
#
# 5.3. forwarded-connect-retries
# ===============================
#
@@
-1558,6
+1553,7
@@
keep-alive-timeout 5
#
#default-server-timeout 60
#
#
#default-server-timeout 60
#
+#
# 6.6. connection-sharing
# ========================
#
# 6.6. connection-sharing
# ========================
#