Merge from trunk

diff --cc src/structs.h
index bdf93c85ded328039659747b7309e259c146c945,4ab885692a5f4ae922b1c432b681f09022686600..c7bc3ad7245bb61b0621d5110d6517b4bfffcde2
--- 1/src/structs.h
--- 2/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;