← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/enums.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/enums.h
41
41
    LOG_TCP_HIT,
42
42
    LOG_TCP_MISS,
43
43
    LOG_TCP_REFRESH_UNMODIFIED, // refresh from origin revalidated existing entry
44
 
    LOG_TCP_REFRESH_FAIL,       // refresh from origin failed
 
44
    LOG_TCP_REFRESH_FAIL_OLD,   // refresh from origin failed, stale reply sent
 
45
    LOG_TCP_REFRESH_FAIL_ERR,   // refresh from origin failed, error forwarded
45
46
    LOG_TCP_REFRESH_MODIFIED,   // refresh from origin replaced existing entry
46
47
    LOG_TCP_CLIENT_REFRESH_MISS,
47
48
    LOG_TCP_IMS_HIT,
81
82
    ERR_FORWARDING_DENIED,
82
83
    ERR_NO_RELAY,
83
84
    ERR_ZERO_SIZE_OBJECT,
 
85
    ERR_PRECONDITION_FAILED,
84
86
    ERR_FTP_DISABLED,
85
87
    ERR_FTP_FAILURE,
86
88
    ERR_URN_RESOLVE,
143
145
    CC_MAX_AGE,
144
146
    CC_S_MAXAGE,
145
147
    CC_MAX_STALE,
 
148
    CC_MIN_FRESH,
146
149
    CC_ONLY_IF_CACHED,
147
150
    CC_OTHER,
148
151
    CC_ENUM_END