"Cache-Control: no-cache" is now disabled by default

git-svn: trunk@2212

clamav-devel/ChangeLog

@@ -1,3 +1,9 @@
+Fri Aug 25 21:23:59 CEST 2006 (tk)
+----------------------------------
+  * freshclam/manager.c: "Cache-Control: no-cache" is now disabled by default.
+			 If you're behind a broken proxy you can recompile
+			 freshclam with --enable-no-cache.
+
 Fri Aug 25 15:39:17 BST 2006 (njh)
 ----------------------------------
   * clamav-milter:	Tidy. Today's work seems to have removed the memory

clamav-devel/clamav-config.h.in

@@ -84,6 +84,9 @@
 /* file i/o buffer size */
 #undef FILEBUFF
 
+/* use "Cache-Control: no-cache" in freshclam */
+#undef FRESHCLAM_NO_CACHE
+
 /* access rights in msghdr */
 #undef HAVE_ACCRIGHTS_IN_MSGHDR
 

clamav-devel/configure

@@ -1481,6 +1481,7 @@ Optional Features:
   --enable-yp-check	  use ypmatch utility instead of /etc/passwd parsing
   --disable-clamav	  disable test for clamav user/group
   --enable-debug	  enable debug code
+  --enable-no-cache	  use "Cache-Control: no-cache" in freshclam
   --enable-experimental	enable experimental code
   --enable-bigstack	  increase thread stack size
   --disable-gethostbyname_r	  disable support for gethostbyname_r
@@ -5881,7 +5882,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5884 "configure"' > conftest.$ac_ext
+  echo '#line 5885 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6514,7 +6515,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:6517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:6518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -8550,7 +8551,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8553 "configure"
+#line 8554 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8648,7 +8649,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8651 "configure"
+#line 8652 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13157,6 +13158,22 @@ _ACEOF
 
 fi
 
+# Check whether --enable-no-cache was given.
+if test "${enable_no_cache+set}" = set; then
+  enableval=$enable_no_cache; enable_nocache=$enableval
+else
+  enable_nocache="no"
+fi
+
+
+if test "$enable_nocache" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define FRESHCLAM_NO_CACHE 1
+_ACEOF
+
+fi
+
 # Check whether --enable-experimental was given.
 if test "${enable_experimental+set}" = set; then
   enableval=$enable_experimental; enable_experimental=$enableval

clamav-devel/configure.in

@@ -291,6 +291,14 @@ if test "$enable_debug" = "yes"; then
   AC_DEFINE(CL_DEBUG,1,[enable debugging])
 fi
 
+AC_ARG_ENABLE(no-cache,
+[  --enable-no-cache	  use "Cache-Control: no-cache" in freshclam],
+enable_nocache=$enableval, enable_nocache="no")
+
+if test "$enable_nocache" = "yes"; then
+  AC_DEFINE(FRESHCLAM_NO_CACHE,1,[use "Cache-Control: no-cache" in freshclam])
+fi
+
 AC_ARG_ENABLE(experimental,
 [  --enable-experimental	enable experimental code],
 enable_experimental=$enableval, enable_experimental="no")

clamav-devel/freshclam/manager.c

@@ -467,7 +467,9 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna
 	"GET %s/%s HTTP/1.1\r\n"
 	"Host: %s\r\n%s"
 	"User-Agent: %s\r\n"
+#ifdef FRESHCLAM_NO_CACHE
 	"Cache-Control: no-cache\r\n"
+#endif
 	"Connection: close\r\n"
 	"\r\n", (remotename != NULL) ? remotename : "", srcfile, hostname, (authorization != NULL) ? authorization : "", agent);