← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/esi/Esi.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/esi/Esi.cc
2429
2429
{
2430
2430
    int rv = 0;
2431
2431
 
2432
 
    if (rep->header.has(HDR_SURROGATE_CONTROL)) {
 
2432
    if (rep->surrogate_control) {
2433
2433
        HttpHdrScTarget *sctusable = httpHdrScGetMergedTarget (rep->surrogate_control,
2434
2434
                                     Config.Accel.surrogate_id);
2435
2435