← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/adaptation/AccessCheck.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/adaptation/AccessCheck.cc
23
23
 
24
24
    if (Config::Enabled) {
25
25
        // the new check will call the callback and delete self, eventually
26
 
        return AsyncStart(new AccessCheck(
27
 
                              ServiceFilter(method, vp, req, rep), cb, cbdata));
 
26
        AsyncJob::Start(new AccessCheck( // we do not store so not a CbcPointer
 
27
                            ServiceFilter(method, vp, req, rep), cb, cbdata));
 
28
        return true;
28
29
    }
29
30
 
30
31
    debugs(83, 3, HERE << "adaptation off, skipping");
123
124
     * we should be kicking off an authentication before continuing
124
125
     * with this request. see bug 2400 for details.
125
126
     */
126
 
    ac->noteAnswer(answer==ACCESS_ALLOWED);
 
127
 
 
128
    // convert to async call to get async call protections and features
 
129
    typedef UnaryMemFunT<AccessCheck, int> MyDialer;
 
130
    AsyncCall::Pointer call =
 
131
        asyncCall(93,7, "Adaptation::AccessCheck::noteAnswer",
 
132
                  MyDialer(ac, &Adaptation::AccessCheck::noteAnswer,
 
133
                           answer==ACCESS_ALLOWED));
 
134
    ScheduleCallHere(call);
 
135
 
127
136
}
128
137
 
129
138
/// process the results of the ACL check