diff -N -c -r -X exclude_files squid-1.0.beta7/src/squid.conf.pre.in squid-1.0.beta7.henrik/src/squid.conf.pre.in
*** squid-1.0.beta7/src/squid.conf.pre.in	Fri May 17 17:56:55 1996
--- squid-1.0.beta7.henrik/src/squid.conf.pre.in	Sun May 19 22:08:40 1996
***************
*** 336,344 ****
  #  TAG: http_stop, gopher_stop, ftp_stop 
  #	Stoplist for URL's.  URL's which contain these strings will be
  #	never be saved in the cache.
  #
! http_stop     /cgi-bin/
! http_stop     ?
  gopher_stop   ?
  
  #  TAG: ftp, gopher, http
--- 336,348 ----
  #  TAG: http_stop, gopher_stop, ftp_stop 
  #	Stoplist for URL's.  URL's which contain these strings will be
  #	never be saved in the cache.
+ # 
+ #	http_stop is only needed if you can't use private objects.
+ #	It is better to use ttl_pattern, since it is then possible for
+ #	a remote server to specify that this may be cached.
  #
! #http_stop     /cgi-bin/
! #http_stop     ?
  gopher_stop   ?
  
  #  TAG: ftp, gopher, http
***************
*** 395,404 ****
  #	be checked instead.  If the absolute value is non-negative,
  #	it will be used.
  #
- #	A negative absolute TTL value in conjunction with a positive
- #	percentage factor has the effect that the TTL is set from 
- #	the pattern match only if a last-modified timestamp is present.
- #
  #	If neither the absolute TTL or percentage factor result in a
  #	TTL for the object, the default TTL from the preceeding section
  #	will be used.
--- 399,404 ----
***************
*** 410,419 ****
  #	        Regular Expression      TTL in        the object's age
  #	        matching URLs           minutes       %age   Max (minutes)
  # ---------     ---------------------   -----------   ------ ------------
! #ttl_pattern    ^http://                    1440        20%      43200
! #ttl_pattern    ^ftp://                    10080        20%      43200
  #ttl_pattern    \.gif$                      2880        50%      43200
! #ttl_pattern    /cgi-bin/                      0         0%      43200
  
  #  TAG: quick_abort
  #	By default the cache continues to retrieve objects from
--- 410,420 ----
  #	        Regular Expression      TTL in        the object's age
  #	        matching URLs           minutes       %age   Max (minutes)
  # ---------     ---------------------   -----------   ------ ------------
! #ttl_pattern    ^http://                      -1        20%      43200
! #ttl_pattern    ^ftp://                       -1        20%      43200
  #ttl_pattern    \.gif$                      2880        50%      43200
! ttl_pattern     /cgi-bin/                      0        20%      43200
! ttl_pattern     ?                              0        20%      43200
  
  #  TAG: quick_abort
  #	By default the cache continues to retrieve objects from
diff -N -c -r -X exclude_files squid-1.0.beta7/src/ttl.c squid-1.0.beta7.henrik/src/ttl.c
*** squid-1.0.beta7/src/ttl.c	Thu May  9 04:32:07 1996
--- squid-1.0.beta7.henrik/src/ttl.c	Sun May 19 22:04:17 1996
***************
*** 172,178 ****
      } else
  	/*      No match, use 50% of age if we have last-modified.      */
  	/*      But limit this to the default TTL.                      */
!     if (last_modified > 0) {
  	ttl = ((now - last_modified) / 2);
  	flags |= TTL_PCTAGE;
  	if (ttl > default_ttl)
--- 172,178 ----
      } else
  	/*      No match, use 50% of age if we have last-modified.      */
  	/*      But limit this to the default TTL.                      */
!     if (!match && last_modified > 0) {
  	ttl = ((now - last_modified) / 2);
  	flags |= TTL_PCTAGE;
  	if (ttl > default_ttl)