Increase default socket timeout to 300 seconds.

diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index 41b03a1..b19ed74 100644 (file)
--- a/doc/source/p-config.sgml
+++ b/doc/source/p-config.sgml
@@ -3,7 +3,7 @@
 
  Purpose     :  Used with other docs and files only.
 
- $Id: p-config.sgml,v 2.38 2009/02/09 16:49:47 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.39 2009/02/12 15:39:22 fabiankeil Exp $
 
  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
  See LICENSE.
@@ -95,7 +95,7 @@
  Sample Configuration File for Privoxy v&p-version;
 </title>
 <para>
- $Id: p-config.sgml,v 2.38 2009/02/09 16:49:47 fabiankeil Exp $
+ $Id: p-config.sgml,v 2.39 2009/02/12 15:39:22 fabiankeil Exp $
 </para>
 <para>
 Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
@@ -2465,7 +2465,7 @@ forward-socks4, forward-socks4a and forward-socks5</title>
   <term>Effect if unset:</term>
   <listitem>
    <para>
-    A default value of 180 seconds is used.
+    A default value of 300 seconds is used.
    </para>
   </listitem>
  </varlistentry>
@@ -2483,12 +2483,12 @@ forward-socks4, forward-socks4a and forward-socks5</title>
   <term>Examples:</term>
   <listitem>
    <para>
-    socket-timeout 180
+    socket-timeout 300
    </para>
   </listitem>
  </varlistentry>
 </variablelist>
-<![%config-file;[<literallayout>@@socket-timeout 180</literallayout>]]>
+<![%config-file;[<literallayout>@@socket-timeout 300</literallayout>]]>
 </sect3>
 
 

diff --git a/loadcfg.c b/loadcfg.c
index d1d95ae..61ba3a7 100644 (file)
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.85 2009/01/22 12:06:26 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.86 2009/02/08 19:18:57 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -35,6 +35,12 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.85 2009/01/22 12:06:26 fabiankeil
  *
  * Revisions   :
  *    $Log: loadcfg.c,v $
+ *    Revision 1.86  2009/02/08 19:18:57  fabiankeil
+ *    Now that we have the match-all.action file, the other action
+ *    files changed their position in config->actions_file[] back
+ *    to the way it was before standard.action got removed and the
+ *    changes from revision 1.84 have to be reverted.
+ *
  *    Revision 1.85  2009/01/22 12:06:26  fabiankeil
  *    Don't keep connections alive when running single-threaded.
  *
@@ -802,7 +808,7 @@ struct configuration_spec * load_config(void)
    config->usermanual                = strdup(USER_MANUAL_URL);
    config->proxy_args                = strdup("");
    config->forwarded_connect_retries = 0;
-   config->socket_timeout            = 180;
+   config->socket_timeout            = 300; /* XXX: Should be a macro. */
    config->feature_flags            &= ~RUNTIME_FEATURE_CGI_TOGGLE;
    config->feature_flags            &= ~RUNTIME_FEATURE_SPLIT_LARGE_FORMS;
    config->feature_flags            &= ~RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS;