Move dontTrustVaryEtag to http.c.

darcs-hash:20061228002505-4cc09-c110a3af41f3e90953459a1dcb68a197f1e39023.gz

http.c

@@ -42,6 +42,7 @@ NetAddressPtr allowedNets = NULL;
 IntListPtr allowedPorts = NULL;
 IntListPtr tunnelAllowedPorts = NULL;
 int expectContinue = 1;
+int dontTrustVaryETag = 0;
 
 AtomPtr atom100Continue;
 
@@ -99,6 +100,8 @@ preinitHttp()
                     "Size of big buffers (max size of headers).");
     CONFIG_VARIABLE_SETTABLE(disableVia, CONFIG_BOOLEAN, configIntSetter,
                              "Don't use Via headers.");
+    CONFIG_VARIABLE(dontTrustVaryETag, CONFIG_BOOLEAN,
+                    "If true, don't trust the ETag when there's Vary.");
     preinitHttpParser();
 }
 

http.h

@@ -138,6 +138,7 @@ extern IntListPtr tunnelAllowedPorts;
 extern int expectContinue;
 extern AtomPtr atom100Continue;
 extern int disableVia;
+extern int dontTrustVaryETag;
 
 void preinitHttp(void);
 void initHttp(void);

server.c

@@ -35,7 +35,6 @@ int pmmFirstSize = 0, pmmSize = 0;
 int serverSlots = 2;
 int serverMaxSlots = 8;
 int dontCacheRedirects = 0;
-int dontTrustVaryETag = 0;
 
 static HTTPServerPtr servers = 0;
 
@@ -74,8 +73,6 @@ preinitServer(void)
                     "Maximum number of connections per broken server.");
     CONFIG_VARIABLE(dontCacheRedirects, CONFIG_BOOLEAN,
                     "If true, don't cache redirects.");
-    CONFIG_VARIABLE(dontTrustVaryETag, CONFIG_BOOLEAN,
-                    "If true, don't trust the ETag when there's Vary.");
 }
 
 static int

server.h

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-extern int serverExpireTime, dontCacheRedirects, dontTrustVaryETag;
+extern int serverExpireTime, dontCacheRedirects;
 
 typedef struct _HTTPServer {
     char *name;