Merged from trunk

diff --cc src/cache_cf.cc
index 888bf9c5ea2b03afdfba799cb915c1af0892ef13,0f4788c25ba5b1c7776f4c1bf49990406233212e..2f5d3d7fb3ab5a3e072a33720af7a1a5bcffa569
--- 1/src/cache_cf.cc
--- 2/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@@ -2254,7 -2254,10 +2254,10 @@@ dump_refreshpattern(StoreEntry * entry
          if (head->flags.refresh_ims)
              storeAppendPrintf(entry, " refresh-ims");
  
 -#if HTTP_VIOLATIONS
+         if (head->flags.store_stale)
+             storeAppendPrintf(entry, " store-stale");
+ 
 +#if USE_HTTP_VIOLATIONS
  
          if (head->flags.override_expire)
              storeAppendPrintf(entry, " override-expire");
@@@ -2300,7 -2303,9 +2303,9 @@@ parse_refreshpattern(refresh_t ** head
      double pct = 0.0;
      time_t max = 0;
      int refresh_ims = 0;
 -#if HTTP_VIOLATIONS
+     int store_stale = 0;
+ 
 +#if USE_HTTP_VIOLATIONS
  
      int override_expire = 0;
      int override_lastmod = 0;
@@@ -2355,7 -2360,9 +2360,9 @@@
      while ((token = strtok(NULL, w_space)) != NULL) {
          if (!strcmp(token, "refresh-ims")) {
              refresh_ims = 1;
 -#if HTTP_VIOLATIONS
+         } else if (!strcmp(token, "store-stale")) {
+             store_stale = 1;
 +#if USE_HTTP_VIOLATIONS
  
          } else if (!strcmp(token, "override-expire"))
              override_expire = 1;
@@@ -2408,7 -2415,10 +2415,10 @@@
      if (refresh_ims)
          t->flags.refresh_ims = 1;
  
 -#if HTTP_VIOLATIONS
+     if (store_stale)
+         t->flags.store_stale = 1;
+ 
 +#if USE_HTTP_VIOLATIONS
  
      if (override_expire)
          t->flags.override_expire = 1;

diff --cc src/cf.data.pre
Simple merge

diff --cc src/cf_gen_defines
index c8ca74772cdd1b2177ebb7562f164812cd5f3330,bbebf6c17e1a9b40f721b392c3a7037a914b175d..7b4361e09a2c1509689381762348ce4fe9b19f7d
--- 1/src/cf_gen_defines
--- 2/src/cf_gen_defines
+++ b/src/cf_gen_defines
@@@ -9,7 -9,8 +9,8 @@@ BEGIN 
        define["FOLLOW_X_FORWARDED_FOR"]="--enable-follow-x-forwarded-for"
        define["FOLLOW_X_FORWARDED_FOR&&DELAY_POOLS"]="--enable-follow-x-forwarded-for and --enable-delay-pools"
        define["FOLLOW_X_FORWARDED_FOR&&ICAP_CLIENT"]="--enable-follow-x-forwarded-for and --enable-icap-client"
 -      define["HTTP_VIOLATIONS"]="--enable-http-violations"
+       define["FOLLOW_X_FORWARDED_FOR&&LINUX_NETFILTER"]="--enable-follow-x-forwarded-for and --enable-linux-netfilter"
 +      define["USE_HTTP_VIOLATIONS"]="--enable-http-violations"
        define["ICAP_CLIENT"]="--enable-icap-client"
        define["SQUID_SNMP"]="--enable-snmp"
        define["USE_ADAPTATION"]="--enable-ecap or --enable-icap-client"

diff --cc src/errorpage.cc
Simple merge

diff --cc src/http.cc
Simple merge

diff --cc src/structs.h
index 12f160fa6931ee06201fc64993800b6f9d13c796,b8ddec90bf4ebc754bb424ad4e13ac60405e76fa..c13757fff0f2dc422a75914538c6908c325592b2
--- 1/src/structs.h
--- 2/src/structs.h
+++ b/src/structs.h
@@@ -1082,7 -1085,8 +1085,8 @@@ struct _refresh_t 
      struct {
          unsigned int icase:1;
          unsigned int refresh_ims:1;
 -#if HTTP_VIOLATIONS
+         unsigned int store_stale:1;
 +#if USE_HTTP_VIOLATIONS
          unsigned int override_expire:1;
          unsigned int override_lastmod:1;
          unsigned int reload_into_ims:1;