← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/adaptation/icap/Xaction.h

  • 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/Xaction.h
40
40
#include "adaptation/icap/ServiceRep.h"
41
41
#include "adaptation/Initiate.h"
42
42
#include "AccessLogEntry.h"
 
43
#include "HttpReply.h"
43
44
 
44
 
class HttpMsg;
45
45
class CommConnectCbParams;
46
46
 
47
47
namespace Adaptation
63
63
{
64
64
 
65
65
public:
66
 
    Xaction(const char *aTypeName, Adaptation::Initiator *anInitiator, ServiceRep::Pointer &aService);
 
66
    Xaction(const char *aTypeName, ServiceRep::Pointer &aService);
67
67
    virtual ~Xaction();
68
68
 
69
69
    void disableRetries();
80
80
 
81
81
    // TODO: create these only when actually sending/receiving
82
82
    HttpRequest *icapRequest; ///< sent (or at least created) ICAP request
83
 
    HttpReply *icapReply; ///< received ICAP reply, if any
 
83
    HttpReply::Pointer icapReply; ///< received ICAP reply, if any
84
84
 
85
85
    /// the number of times we tried to get to the service, including this time
86
86
    int attempts;
125
125
    // useful for debugging
126
126
    virtual bool fillVirginHttpHeader(MemBuf&) const;
127
127
 
 
128
public:
128
129
    // custom exception handling and end-of-call checks
129
130
    virtual void callException(const std::exception  &e);
130
131
    virtual void callEnd();
131
132
 
 
133
protected:
132
134
    // logging
133
135
    void setOutcome(const XactOutcome &xo);
134
136
    virtual void finalizeLogInfo();