← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/Server.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/Server.h
186
186
 
187
187
#if USE_ADAPTATION
188
188
    BodyPipe::Pointer virginBodyDestination;  /**< to provide virgin response body */
189
 
    Adaptation::Initiate *adaptedHeadSource;  /**< to get adapted response headers */
 
189
    CbcPointer<Adaptation::Initiate> adaptedHeadSource;  /**< to get adapted response headers */
190
190
    BodyPipe::Pointer adaptedBodySource;      /**< to consume adated response body */
191
191
 
192
192
    bool adaptationAccessCheckPending;