Merge from trunk. and Save Comm::Connection in IoCallback

[thirdparty/squid.git] / src / structs.h

diff --git a/src/structs.h b/src/structs.h
index 633e4233c0530632009c1aadbe1ef78e5ca71fa5..d7f14c79224b2aef921417f16f5a8f4f4af547c9 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -449,6 +449,7 @@ struct SquidConfig {
     } onoff;
 
     int forward_max_tries;
+    int connect_retries;
 
     class ACL *aclList;
 
@@ -525,7 +526,6 @@ struct SquidConfig {
     char *errorStylesheet;
 
     struct {
-        int maxtries;
         int onerror;
     } retry;
 
@@ -926,7 +926,7 @@ struct peer {
     int n_addresses;
     int rr_count;
     peer *next;
-    int test_fd;
+    int testing_now;
 
     struct {
         unsigned int hash;