← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/squid3/oneiric-security

« back to all changes in this revision

Viewing changes to src/adaptation/icap/Options.cc

  • Committer: Bazaar Package Importer
  • Author(s): Mahyuddin Susanto
  • Date: 2011-02-15 18:46:13 UTC
  • mfrom: (21.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110215184613-1u3dh5sz4i055flk
Tags: 3.1.10-1ubuntu1
https://launchpad.net/bugs/719283
* Merge from debian unstable. (LP: #719283)  Remaining changes:
  - debian/patches/18-fix-ftbfs-binutils-gold.dpatch: Add library linker into
    LIBS instead to LDFLAGS to fixing FTBFS binutils-gold.
* Drop Ubuntu configuration for ufw which landed in Debian and sync it: 
  - debian/squid3.ufw.profile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/adaptation/icap/Options.cc
89
89
 
90
90
    istag = h->getByName("ISTag");
91
91
 
92
 
    if (h->getByName("Opt-body-type").size())
93
 
        error = "ICAP service returns unsupported OPTIONS body";
 
92
    if (h->getByName("Opt-body-type").size()) {
 
93
        // TODO: add a class to rate-limit such warnings using FadingCounter
 
94
        debugs(93,DBG_IMPORTANT, "WARNING: Ignoring unsupported ICAP " <<
 
95
               "OPTIONS body; type: " << h->getByName("Opt-body-type"));
 
96
        // Do not set error, assuming the response headers are valid.
 
97
    }
94
98
 
95
99
    cfgIntHeader(h, "Max-Connections", max_connections);
96
100