From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 12 Dec 2008 08:02:30 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1289^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54371353e1dead5a839cb52fb9f848386614960e;p=thirdparty%2Fsquid.git

Merge from trunk
---

54371353e1dead5a839cb52fb9f848386614960e
diff --cc src/structs.h
index bdf93c85de,4ab885692a..c7bc3ad724
--- a/src/structs.h
+++ b/src/structs.h
@@@ -631,15 -592,14 +592,14 @@@ struct SquidConfig 
      int sleep_after_fork;	/* microseconds */
      time_t minimum_expiry_time;	/* seconds */
      external_acl *externalAclHelperList;
 +
  #if USE_ZPH_QOS
 -    int zph_tos_local;
 -    int zph_tos_peer;
 -    int zph_preserve_miss_tos_mask;
 +    QosConfig zph;
  #endif
 +
  #if USE_SSL
  
-     struct
-     {
+     struct {
          char *cert;
          char *key;
          int version;