← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/access_log.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/access_log.cc
67
67
    "TCP_HIT",
68
68
    "TCP_MISS",
69
69
    "TCP_REFRESH_UNMODIFIED",
70
 
    "TCP_REFRESH_FAIL",
 
70
    "TCP_REFRESH_FAIL", // same tag logged for LOG_TCP_REFRESH_FAIL_OLD and
 
71
    "TCP_REFRESH_FAIL", // LOG_TCP_REFRESH_FAIL_ERR for backward-compatibility
71
72
    "TCP_REFRESH_MODIFIED",
72
73
    "TCP_CLIENT_REFRESH_MISS",
73
74
    "TCP_IMS_HIT",
2423
2424
    if (code == LOG_TCP_IMS_HIT)
2424
2425
        return 1;
2425
2426
 
2426
 
    if (code == LOG_TCP_REFRESH_FAIL)
 
2427
    if (code == LOG_TCP_REFRESH_FAIL_OLD)
2427
2428
        return 1;
2428
2429
 
2429
2430
    if (code == LOG_TCP_REFRESH_UNMODIFIED)