← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/adaptation/ecap/XactionRep.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/ecap/XactionRep.cc
14
14
CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Ecap::XactionRep, XactionRep);
15
15
 
16
16
 
17
 
Adaptation::Ecap::XactionRep::XactionRep(Adaptation::Initiator *anInitiator,
18
 
        HttpMsg *virginHeader, HttpRequest *virginCause,
19
 
        const Adaptation::ServicePointer &aService):
 
17
Adaptation::Ecap::XactionRep::XactionRep(
 
18
    HttpMsg *virginHeader, HttpRequest *virginCause,
 
19
    const Adaptation::ServicePointer &aService):
20
20
        AsyncJob("Adaptation::Ecap::XactionRep"),
21
 
        Adaptation::Initiate("Adaptation::Ecap::XactionRep", anInitiator),
 
21
        Adaptation::Initiate("Adaptation::Ecap::XactionRep"),
22
22
        theService(aService),
23
23
        theVirginRep(virginHeader), theCauseRep(NULL),
24
24
        proxyingVb(opUndecided), proxyingAb(opUndecided),
430
430
        const BodyPipePointer &vp = theVirginRep.raw().body_pipe;
431
431
        if (!canAccessVb)
432
432
            buf.append("x", 1);
433
 
        if (vp != NULL && vp->stillConsuming(this)) {
 
433
        if (vp != NULL) { // XXX: but may not be stillConsuming()
434
434
            buf.append("Vb", 2);
435
 
            buf.append(vp->status(), strlen(vp->status())); // XXX
436
435
        } else
437
436
            buf.append("V.", 2);
438
437
    }
441
440
        MessageRep *rep = dynamic_cast<MessageRep*>(theAnswerRep.get());
442
441
        Must(rep);
443
442
        const BodyPipePointer &ap = rep->raw().body_pipe;
444
 
        if (ap != NULL && ap->stillProducing(this)) {
 
443
        if (ap != NULL) { // XXX: but may not be stillProducing()
445
444
            buf.append(" Ab", 3);
446
 
            buf.append(ap->status(), strlen(ap->status())); // XXX
447
445
        } else
448
446
            buf.append(" A.", 3);
449
447
    }