← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/adaptation/ecap/ServiceRep.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/ServiceRep.cc
57
57
}
58
58
 
59
59
Adaptation::Initiate *
60
 
Adaptation::Ecap::ServiceRep::makeXactLauncher(Adaptation::Initiator *initiator,
61
 
        HttpMsg *virgin, HttpRequest *cause)
 
60
Adaptation::Ecap::ServiceRep::makeXactLauncher(HttpMsg *virgin,
 
61
        HttpRequest *cause)
62
62
{
63
63
    Must(up());
64
 
    XactionRep *rep = new XactionRep(initiator, virgin, cause, Pointer(this));
 
64
    XactionRep *rep = new XactionRep(virgin, cause, Pointer(this));
65
65
    XactionRep::AdapterXaction x(theService->makeXaction(rep));
66
66
    rep->master(x);
67
67
    return rep;