Added default-server-timeout description.

diff --git a/doc/webserver/developer-manual/coding.html b/doc/webserver/developer-manual/coding.html
index 6898541..15744c6 100644 (file)
--- a/doc/webserver/developer-manual/coding.html
+++ b/doc/webserver/developer-manual/coding.html
@@ -2587,4 +2587,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file

diff --git a/doc/webserver/developer-manual/contact.html b/doc/webserver/developer-manual/contact.html
index 071884d..7230b80 100644 (file)
--- a/doc/webserver/developer-manual/contact.html
+++ b/doc/webserver/developer-manual/contact.html
@@ -538,4 +538,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file

diff --git a/doc/webserver/developer-manual/copyright.html b/doc/webserver/developer-manual/copyright.html
index 5aa0d56..bf10cc7 100644 (file)
--- a/doc/webserver/developer-manual/copyright.html
+++ b/doc/webserver/developer-manual/copyright.html
@@ -295,4 +295,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file

diff --git a/doc/webserver/developer-manual/index.html b/doc/webserver/developer-manual/index.html
index 3f780b3..ab58863 100644 (file)
--- a/doc/webserver/developer-manual/index.html
+++ b/doc/webserver/developer-manual/index.html
@@ -51,7 +51,7 @@ TARGET="_top"
     <BR></P
 ><P
 CLASS="PUBDATE"
->$Id: developer-manual.sgml,v 2.31 2009/10/10 05:48:55 fabiankeil Exp $<BR></P
+>$Id: developer-manual.sgml,v 2.32 2009/11/15 14:24:12 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -685,4 +685,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>

diff --git a/doc/webserver/faq/contact.html b/doc/webserver/faq/contact.html
index a445e41..c1c4268 100644 (file)
--- a/doc/webserver/faq/contact.html
+++ b/doc/webserver/faq/contact.html
@@ -538,4 +538,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file

diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html
index 0f3bfda..e69b829 100644 (file)
--- a/doc/webserver/faq/copyright.html
+++ b/doc/webserver/faq/copyright.html
@@ -298,4 +298,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file

diff --git a/doc/webserver/faq/index.html b/doc/webserver/faq/index.html
index 3c7db0e..f1ed806 100644 (file)
--- a/doc/webserver/faq/index.html
+++ b/doc/webserver/faq/index.html
@@ -48,7 +48,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
->$Id: faq.sgml,v 2.66 2009/10/10 05:48:55 fabiankeil Exp $<BR></P
+>$Id: faq.sgml,v 2.67 2009/11/15 14:24:12 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -996,4 +996,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>

diff --git a/doc/webserver/user-manual/actions-file.html b/doc/webserver/user-manual/actions-file.html
index dd3d384..aa33aa5 100644 (file)
--- a/doc/webserver/user-manual/actions-file.html
+++ b/doc/webserver/user-manual/actions-file.html
@@ -233,7 +233,7 @@ CLASS="FILENAME"
 >    <DIV
 CLASS="TABLE"
 ><A
-NAME="AEN2380"
+NAME="AEN2419"
 ></A
 ><P
 ><B
@@ -501,7 +501,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2479"
+NAME="AEN2518"
 >8.1. Finding the Right Mix</A
 ></H2
 ><P
@@ -536,7 +536,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN2486"
+NAME="AEN2525"
 >8.2. How to Edit</A
 ></H2
 ><P
@@ -907,7 +907,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2593"
+NAME="AEN2632"
 >8.4.1. The Domain Pattern</A
 ></H3
 ><P
@@ -1147,7 +1147,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN2669"
+NAME="AEN2708"
 >8.4.2. The Path Pattern</A
 ></H3
 ><P
@@ -6715,7 +6715,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4300"
+NAME="AEN4339"
 >8.5.34. Summary</A
 ></H3
 ><P
@@ -7017,7 +7017,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4364"
+NAME="AEN4403"
 >8.7.1. match-all.action</A
 ></H3
 ><P
@@ -7115,7 +7115,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4386"
+NAME="AEN4425"
 >8.7.2. default.action</A
 ></H3
 ><P
@@ -7716,7 +7716,7 @@ CLASS="SECT3"
 ><H3
 CLASS="SECT3"
 ><A
-NAME="AEN4499"
+NAME="AEN4538"
 >8.7.3. user.action</A
 ></H3
 ><P
@@ -8252,4 +8252,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file

diff --git a/doc/webserver/user-manual/appendix.html b/doc/webserver/user-manual/appendix.html
index bee2c92..6a96fcb 100644 (file)
--- a/doc/webserver/user-manual/appendix.html
+++ b/doc/webserver/user-manual/appendix.html
@@ -748,7 +748,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5385"
+NAME="AEN5424"
 >14.2. Privoxy's Internal Pages</A
 ></H2
 ><P
@@ -794,7 +794,7 @@ CLASS="APPLICATION"
    Privoxy main page: 
   </P
 ><A
-NAME="AEN5399"
+NAME="AEN5438"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -827,7 +827,7 @@ CLASS="APPLICATION"
     editing of actions files:
   </P
 ><A
-NAME="AEN5407"
+NAME="AEN5446"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -847,7 +847,7 @@ TARGET="_top"
     Show the source code version numbers:
   </P
 ><A
-NAME="AEN5412"
+NAME="AEN5451"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -867,7 +867,7 @@ TARGET="_top"
    Show the browser's request headers:
   </P
 ><A
-NAME="AEN5417"
+NAME="AEN5456"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -887,7 +887,7 @@ TARGET="_top"
    Show which actions apply to a URL and why:
   </P
 ><A
-NAME="AEN5422"
+NAME="AEN5461"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -919,7 +919,7 @@ CLASS="QUOTE"
    place:
   </P
 ><A
-NAME="AEN5430"
+NAME="AEN5469"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -936,7 +936,7 @@ TARGET="_top"
 >   Short cuts. Turn off, then on: 
   </P
 ><A
-NAME="AEN5434"
+NAME="AEN5473"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -950,7 +950,7 @@ TARGET="_top"
    </P
 ></BLOCKQUOTE
 ><A
-NAME="AEN5437"
+NAME="AEN5476"
 ></A
 ><BLOCKQUOTE
 CLASS="BLOCKQUOTE"
@@ -2184,4 +2184,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file

diff --git a/doc/webserver/user-manual/config.html b/doc/webserver/user-manual/config.html
index c7a9455..9e07ef2 100644 (file)
--- a/doc/webserver/user-manual/config.html
+++ b/doc/webserver/user-manual/config.html
@@ -3954,8 +3954,119 @@ CLASS="SECT3"
 ><H4
 CLASS="SECT3"
 ><A
+NAME="DEFAULT-SERVER-TIMEOUT"
+>7.6.5. default-server-timeout</A
+></H4
+><P
+></P
+><DIV
+CLASS="VARIABLELIST"
+><DL
+><DT
+>Specifies:</DT
+><DD
+><P
+>    Assumed server-side keep-alive timeout if not specified by the server.
+   </P
+></DD
+><DT
+>Type of value:</DT
+><DD
+><P
+>    <TT
+CLASS="REPLACEABLE"
+><I
+>Time in seconds.</I
+></TT
+>
+   </P
+></DD
+><DT
+>Default value:</DT
+><DD
+><P
+>None</P
+></DD
+><DT
+>Effect if unset:</DT
+><DD
+><P
+>    Connections for which the server didn't specify the keep-alive
+    timeout are not reused.
+   </P
+></DD
+><DT
+>Notes:</DT
+><DD
+><P
+>    Enabling this option significantly increases the number of connections
+    that are reused, provided the <A
+HREF="#KEEP-ALIVE-TIMEOUT"
+TARGET="_top"
+>keep-alive-timeout</A
+> option
+    is also enabled.
+   </P
+><P
+>    While it also increases the number of connections problems
+    when <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> tries to reuse a connection that already has
+    been closed on the server side, or is closed while <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
+    is trying to reuse it, this should only be a problem if it
+    happens for the first request sent by the client. If it happens
+    for requests on reused client connections, <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+> will simply
+    close the connection and the client is supposed to retry the
+    request without bothering the user.
+   </P
+><P
+>    Enabling this option is therefore only recommended if the
+    <A
+HREF="#CONNECTION-SHARING"
+TARGET="_top"
+>connection-sharing</A
+> option
+    is disabled.
+   </P
+><P
+>    It is an error to specify a value larger than the <A
+HREF="#KEEP-ALIVE-TIMEOUT"
+TARGET="_top"
+>keep-alive-timeout</A
+> value.
+   </P
+><P
+>    This option has no effect if <SPAN
+CLASS="APPLICATION"
+>Privoxy</SPAN
+>
+    has been compiled without keep-alive support.
+   </P
+></DD
+><DT
+>Examples:</DT
+><DD
+><P
+>    default-server-timeout 60
+   </P
+></DD
+></DL
+></DIV
+></DIV
+><DIV
+CLASS="SECT3"
+><H4
+CLASS="SECT3"
+><A
 NAME="CONNECTION-SHARING"
->7.6.5. connection-sharing</A
+>7.6.6. connection-sharing</A
 ></H4
 ><P
 ></P
@@ -4077,7 +4188,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 ><A
 NAME="SOCKET-TIMEOUT"
->7.6.6. socket-timeout</A
+>7.6.7. socket-timeout</A
 ></H4
 ><P
 ></P
@@ -4142,7 +4253,7 @@ CLASS="SECT3"
 CLASS="SECT3"
 ><A
 NAME="MAX-CLIENT-CONNECTIONS"
->7.6.7. max-client-connections</A
+>7.6.8. max-client-connections</A
 ></H4
 ><P
 ></P
@@ -4609,4 +4720,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
\ No newline at end of file
+>

diff --git a/doc/webserver/user-manual/configuration.html b/doc/webserver/user-manual/configuration.html
index cd17225..73feaf0 100644 (file)
--- a/doc/webserver/user-manual/configuration.html
+++ b/doc/webserver/user-manual/configuration.html
@@ -521,4 +521,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file

diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html
index 4fcc673..9f29009 100644 (file)
--- a/doc/webserver/user-manual/copyright.html
+++ b/doc/webserver/user-manual/copyright.html
@@ -102,7 +102,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN5132"
+NAME="AEN5171"
 >12.1. License</A
 ></H2
 ><P
@@ -426,4 +426,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file

diff --git a/doc/webserver/user-manual/filter-file.html b/doc/webserver/user-manual/filter-file.html
index f853ce9..50c2fb0 100644 (file)
--- a/doc/webserver/user-manual/filter-file.html
+++ b/doc/webserver/user-manual/filter-file.html
@@ -366,7 +366,7 @@ CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN4654"
+NAME="AEN4693"
 >9.1. Filter File Tutorial</A
 ></H2
 ><P
@@ -1649,4 +1649,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file

diff --git a/doc/webserver/user-manual/index.html b/doc/webserver/user-manual/index.html
index 1675c53..12b516e 100644 (file)
--- a/doc/webserver/user-manual/index.html
+++ b/doc/webserver/user-manual/index.html
@@ -50,7 +50,7 @@ TARGET="_top"
 ><BR></P
 ><P
 CLASS="PUBDATE"
->$Id: user-manual.sgml,v 2.115 2009/10/10 06:19:34 fabiankeil Exp $<BR></P
+>$Id: user-manual.sgml,v 2.116 2009/11/15 14:24:12 fabiankeil Exp $<BR></P
 ><DIV
 ><DIV
 CLASS="ABSTRACT"
@@ -511,16 +511,21 @@ HREF="config.html#KEEP-ALIVE-TIMEOUT"
 ></DT
 ><DT
 >7.6.5. <A
+HREF="config.html#DEFAULT-SERVER-TIMEOUT"
+>default-server-timeout</A
+></DT
+><DT
+>7.6.6. <A
 HREF="config.html#CONNECTION-SHARING"
 >connection-sharing</A
 ></DT
 ><DT
->7.6.6. <A
+>7.6.7. <A
 HREF="config.html#SOCKET-TIMEOUT"
 >socket-timeout</A
 ></DT
 ><DT
->7.6.7. <A
+>7.6.8. <A
 HREF="config.html#MAX-CLIENT-CONNECTIONS"
 >max-client-connections</A
 ></DT
@@ -542,12 +547,12 @@ HREF="actions-file.html"
 ><DL
 ><DT
 >8.1. <A
-HREF="actions-file.html#AEN2479"
+HREF="actions-file.html#AEN2518"
 >Finding the Right Mix</A
 ></DT
 ><DT
 >8.2. <A
-HREF="actions-file.html#AEN2486"
+HREF="actions-file.html#AEN2525"
 >How to Edit</A
 ></DT
 ><DT
@@ -564,12 +569,12 @@ HREF="actions-file.html#AF-PATTERNS"
 ><DL
 ><DT
 >8.4.1. <A
-HREF="actions-file.html#AEN2593"
+HREF="actions-file.html#AEN2632"
 >The Domain Pattern</A
 ></DT
 ><DT
 >8.4.2. <A
-HREF="actions-file.html#AEN2669"
+HREF="actions-file.html#AEN2708"
 >The Path Pattern</A
 ></DT
 ><DT
@@ -753,7 +758,7 @@ HREF="actions-file.html#SET-IMAGE-BLOCKER"
 ></DT
 ><DT
 >8.5.34. <A
-HREF="actions-file.html#AEN4300"
+HREF="actions-file.html#AEN4339"
 >Summary</A
 ></DT
 ></DL
@@ -772,17 +777,17 @@ HREF="actions-file.html#ACT-EXAMPLES"
 ><DL
 ><DT
 >8.7.1. <A
-HREF="actions-file.html#AEN4364"
+HREF="actions-file.html#AEN4403"
 >match-all.action</A
 ></DT
 ><DT
 >8.7.2. <A
-HREF="actions-file.html#AEN4386"
+HREF="actions-file.html#AEN4425"
 >default.action</A
 ></DT
 ><DT
 >8.7.3. <A
-HREF="actions-file.html#AEN4499"
+HREF="actions-file.html#AEN4538"
 >user.action</A
 ></DT
 ></DL
@@ -798,7 +803,7 @@ HREF="filter-file.html"
 ><DL
 ><DT
 >9.1. <A
-HREF="filter-file.html#AEN4654"
+HREF="filter-file.html#AEN4693"
 >Filter File Tutorial</A
 ></DT
 ><DT
@@ -866,7 +871,7 @@ HREF="copyright.html"
 ><DL
 ><DT
 >12.1. <A
-HREF="copyright.html#AEN5132"
+HREF="copyright.html#AEN5171"
 >License</A
 ></DT
 ><DT
@@ -900,7 +905,7 @@ HREF="appendix.html#REGEX"
 ></DT
 ><DT
 >14.2. <A
-HREF="appendix.html#AEN5385"
+HREF="appendix.html#AEN5424"
 >Privoxy's Internal Pages</A
 ></DT
 ><DD
@@ -979,4 +984,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file

diff --git a/doc/webserver/user-manual/quickstart.html b/doc/webserver/user-manual/quickstart.html
index c8c05cc..8b9b36c 100644 (file)
--- a/doc/webserver/user-manual/quickstart.html
+++ b/doc/webserver/user-manual/quickstart.html
@@ -940,4 +940,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file

diff --git a/doc/webserver/user-manual/startup.html b/doc/webserver/user-manual/startup.html
index fcc9c29..3af75b4 100644 (file)
--- a/doc/webserver/user-manual/startup.html
+++ b/doc/webserver/user-manual/startup.html
@@ -899,4 +899,4 @@ VALIGN="top"
 ></DIV
 ></BODY
 ></HTML
->
+>
\ No newline at end of file