src/patches/squid/squid-3.5-14071.patch

   1 ------------------------------------------------------------
   2 revno: 14071
   3 revision-id: squid3@treenet.co.nz-20160817025501-e66sjxm0bfy3ksn3
   4 parent: squid3@treenet.co.nz-20160805145933-0cpyy47o8955lamx
   5 fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4428
   6 committer: Amos Jeffries <squid3@treenet.co.nz>
   7 branch nick: 3.5
   8 timestamp: Wed 2016-08-17 14:55:01 +1200
   9 message:
  10   Bug 4428: mal-formed Cache-Control:stale-if-error header
  11 ------------------------------------------------------------
  12 # Bazaar merge directive format 2 (Bazaar 0.90)
  13 # revision_id: squid3@treenet.co.nz-20160817025501-e66sjxm0bfy3ksn3
  14 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  15 # testament_sha1: b3b3ef13c45062a97bd5cc88c934019fe4af7a3c
  16 # timestamp: 2016-08-17 02:55:20 +0000
  17 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  18 # base_revision_id: squid3@treenet.co.nz-20160805145933-\
  19 #   0cpyy47o8955lamx
  20 #
  21 # Begin patch
  22 === modified file 'src/HttpHdrCc.cc'
  23 --- src/HttpHdrCc.cc    2016-01-01 00:14:27 +0000
  24 +++ src/HttpHdrCc.cc    2016-08-17 02:55:01 +0000
  25 @@ -257,6 +257,27 @@
  26
  27              /* for all options having values, "=value" after the name */
  28              switch (flag) {
  29 +            case CC_BADHDR:
  30 +                break;
  31 +            case CC_PUBLIC:
  32 +                break;
  33 +            case CC_PRIVATE:
  34 +                if (Private().size())
  35 +                    packerPrintf(p, "=\"" SQUIDSTRINGPH "\"", SQUIDSTRINGPRINT(Private()));
  36 +                break;
  37 +
  38 +            case CC_NO_CACHE:
  39 +                if (noCache().size())
  40 +                    packerPrintf(p, "=\"" SQUIDSTRINGPH "\"", SQUIDSTRINGPRINT(noCache()));
  41 +                break;
  42 +            case CC_NO_STORE:
  43 +                break;
  44 +            case CC_NO_TRANSFORM:
  45 +                break;
  46 +            case CC_MUST_REVALIDATE:
  47 +                break;
  48 +            case CC_PROXY_REVALIDATE:
  49 +                break;
  50              case CC_MAX_AGE:
  51                  packerPrintf(p, "=%d", (int) maxAge());
  52                  break;
  53 @@ -272,8 +293,14 @@
  54              case CC_MIN_FRESH:
  55                  packerPrintf(p, "=%d", (int) minFresh());
  56                  break;
  57 -            default:
  58 -                /* do nothing, directive was already printed */
  59 +            case CC_ONLY_IF_CACHED:
  60 +                break;
  61 +            case CC_STALE_IF_ERROR:
  62 +                packerPrintf(p, "=%d", staleIfError());
  63 +                break;
  64 +            case CC_OTHER:
  65 +            case CC_ENUM_END:
  66 +                // done below after the loop
  67                  break;
  68              }
  69
  70