← Back to branch summary

~clint-fewbar/ubuntu/precise/squid3/ignore-sighup-early

« back to all changes in this revision

Viewing changes to src/HttpHeaderTools.cc

  • Committer: Bazaar Package Importer
  • Author(s): Luigi Gangitano
  • Date: 2011-01-21 18:43:56 UTC
  • mfrom: (1.4.5 upstream)
  • mto: This revision was merged to the branch mainline in revision 26.
  • Revision ID: james.westby@ubuntu.com-20110121184356-4zn7gwuzws6lpnuc
Tags: 3.1.10-1
http://bugs.debian.org/609881
http://bugs.debian.org/607379
http://bugs.debian.org/594713
http://bugs.debian.org/597687
http://bugs.debian.org/605088
* New upstream release (Closes: #609881)
  - Removed patches integrated upstream
    + 16-CVE-2010-3072
    + 17-CVE-2010-2951
  - Fixes TCP DNS lookups failure on IPv6-disabled systems (Closes: #607379)
  - Fixes HTTPS not working if IPv6 is disabled (Closes: #594713)

* debian/rules
  - Enable ZPH feature (Closes: #597687)

* debian/squid3.ufw.profile
  - Added UFW profile, thanks to Alessio Treglia (Closes: #605088)

* debian/control
  - Added versioned dependency on squid-langpack

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/HttpHeaderTools.cc
145
145
httpHeaderHasConnDir(const HttpHeader * hdr, const char *directive)
146
146
{
147
147
    String list;
148
 
    http_hdr_type ht;
149
148
    int res;
150
149
    /* what type of header do we have? */
151
150
 
 
151
#if HTTP_VIOLATIONS
152
152
    if (hdr->has(HDR_PROXY_CONNECTION))
153
 
        ht = HDR_PROXY_CONNECTION;
154
 
    else if (hdr->has(HDR_CONNECTION))
155
 
        ht = HDR_CONNECTION;
 
153
        list = hdr->getList(HDR_PROXY_CONNECTION);
156
154
    else
157
 
        return 0;
158
 
 
159
 
    list = hdr->getList(ht);
 
155
#endif
 
156
        if (hdr->has(HDR_CONNECTION))
 
157
            list = hdr->getList(HDR_CONNECTION);
 
158
        else
 
159
            return 0;
160
160
 
161
161
    res = strListIsMember(&list, directive, ',');
162
162