---------------------
PatchSet 8173 
Date: 2006/06/06 05:55:32
Author: hno
Branch: pinning-2_6
Tag: (none) 
Log:
Indent

Members: 
	src/client_side.c:1.117.2.3->1.117.2.4 
	src/forward.c:1.32.2.2->1.32.2.3 
	src/http.c:1.36.6.2->1.36.6.3 
	src/protos.h:1.102.2.1->1.102.2.2 
	src/structs.h:1.104.2.3->1.104.2.4 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.117.2.3
retrieving revision 1.117.2.4
diff -u -r1.117.2.3 -r1.117.2.4
--- squid/src/client_side.c	6 Jun 2006 05:41:17 -0000	1.117.2.3
+++ squid/src/client_side.c	6 Jun 2006 05:55:32 -0000	1.117.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.117.2.3 2006/06/06 05:41:17 hno Exp $
+ * $Id: client_side.c,v 1.117.2.4 2006/06/06 05:55:32 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -1464,7 +1464,6 @@
 	if (request->range)
 	    request->flags.range = 1;
     }
-
     if (httpHeaderHas(req_hdr, HDR_AUTHORIZATION) || httpHeaderHas(req_hdr, HDR_PROXY_AUTHORIZATION)) {
 	HttpHeaderPos pos = HttpHeaderInitPos;
 	HttpHeaderEntry *e;
@@ -4956,7 +4955,7 @@
     conn->pinning.fd = -1;
     safe_free(conn->pinning.host);
     /* NOTE: pinning.pinned should be kept. This combined with fd == -1 at the end of a request indicates that the host
-       connection has gone away */
+     * connection has gone away */
 }
 
 void
@@ -4976,7 +4975,7 @@
 }
 
 int
-clientGetPinnedConnection(ConnStateData *conn, request_t *request)
+clientGetPinnedConnection(ConnStateData * conn, request_t * request)
 {
     int fd = conn->pinning.fd;
 
@@ -4995,4 +4994,3 @@
     comm_remove_close_handler(fd, clientPinnedConnectionClosed, conn);
     return fd;
 }
-
Index: squid/src/forward.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/forward.c,v
retrieving revision 1.32.2.2
retrieving revision 1.32.2.3
diff -u -r1.32.2.2 -r1.32.2.3
--- squid/src/forward.c	6 Jun 2006 05:24:18 -0000	1.32.2.2
+++ squid/src/forward.c	6 Jun 2006 05:55:32 -0000	1.32.2.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.c,v 1.32.2.2 2006/06/06 05:24:18 hno Exp $
+ * $Id: forward.c,v 1.32.2.3 2006/06/06 05:55:32 hno Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -452,7 +452,7 @@
 }
 
 static int
-getPinnedFD(request_t *request)
+getPinnedFD(request_t * request)
 {
     int fd;
     ConnStateData *conn = request->pinned_connection;
@@ -466,7 +466,6 @@
 	cbdataUnlock(request->pinned_connection);
 	request->pinned_connection = NULL;
     }
-
     return fd;
 }
 
@@ -511,7 +510,7 @@
     if (ftimeout < ctimeout)
 	ctimeout = ftimeout;
     if (fwdState->request->pinned_connection) {
-       	fd = getPinnedFD(fwdState->request);
+	fd = getPinnedFD(fwdState->request);
 	if (fd >= 0) {
 	    fwdState->server_fd = fd;
 	    fwdState->n_tries++;
Index: squid/src/http.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/http.c,v
retrieving revision 1.36.6.2
retrieving revision 1.36.6.3
diff -u -r1.36.6.2 -r1.36.6.3
--- squid/src/http.c	6 Jun 2006 05:24:18 -0000	1.36.6.2
+++ squid/src/http.c	6 Jun 2006 05:55:33 -0000	1.36.6.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.c,v 1.36.6.2 2006/06/06 05:24:18 hno Exp $
+ * $Id: http.c,v 1.36.6.3 2006/06/06 05:55:33 hno Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -54,7 +54,7 @@
 static void httpMakePublic(StoreEntry *);
 static int httpCachableReply(HttpStateData *);
 static void httpMaybeRemovePublic(StoreEntry *, http_status);
-static int peer_supports_connection_pinning(HttpStateData *httpState);
+static int peer_supports_connection_pinning(HttpStateData * httpState);
 
 static void
 httpStateFree(int fd, void *data)
@@ -551,7 +551,7 @@
 /* Small helper function to verify if connection pinning is supported or not
  */
 static int
-peer_supports_connection_pinning(HttpStateData *httpState)
+peer_supports_connection_pinning(HttpStateData * httpState)
 {
     const HttpReply *rep = httpState->entry->mem_obj->reply;
     const HttpHeader *hdr = &rep->header;
Index: squid/src/protos.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/protos.h,v
retrieving revision 1.102.2.1
retrieving revision 1.102.2.2
diff -u -r1.102.2.1 -r1.102.2.2
--- squid/src/protos.h	6 Jun 2006 05:24:18 -0000	1.102.2.1
+++ squid/src/protos.h	6 Jun 2006 05:55:33 -0000	1.102.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.102.2.1 2006/06/06 05:24:18 hno Exp $
+ * $Id: protos.h,v 1.102.2.2 2006/06/06 05:55:33 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -140,8 +140,8 @@
 extern void clientOpenListenSockets(void);
 extern void clientHttpConnectionsClose(void);
 extern int isTcpHit(log_type);
-extern void clientPinConnection(ConnStateData *conn, const char *host, int port, int fd);
-int clientGetPinnedConnection(ConnStateData *conn, request_t *request);
+extern void clientPinConnection(ConnStateData * conn, const char *host, int port, int fd);
+int clientGetPinnedConnection(ConnStateData * conn, request_t * request);
 
 extern int commSetNonBlocking(int fd);
 extern int commUnsetNonBlocking(int fd);
Index: squid/src/structs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/structs.h,v
retrieving revision 1.104.2.3
retrieving revision 1.104.2.4
diff -u -r1.104.2.3 -r1.104.2.4
--- squid/src/structs.h	6 Jun 2006 05:41:18 -0000	1.104.2.3
+++ squid/src/structs.h	6 Jun 2006 05:55:33 -0000	1.104.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.104.2.3 2006/06/06 05:41:18 hno Exp $
+ * $Id: structs.h,v 1.104.2.4 2006/06/06 05:55:33 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1241,10 +1241,10 @@
     http_port_list *port;
     int transparent;
     struct {
-	int fd;		/* pinned server side connection */
-	char *host;	/* host name of pinned connection */
-	int port;	/* port of pinned connection */
-	int pinned;	/* this connection was pinned */
+	int fd;			/* pinned server side connection */
+	char *host;		/* host name of pinned connection */
+	int port;		/* port of pinned connection */
+	int pinned;		/* this connection was pinned */
     } pinning;
 };
 
@@ -1869,7 +1869,7 @@
      * than this String */
     String x_forwarded_for_iterator;
 #endif				/* FOLLOW_X_FORWARDED_FOR */
-    ConnStateData *pinned_connection; /* If set then this request is tighly tied to the corresponding client side connetion */
+    ConnStateData *pinned_connection;	/* If set then this request is tighly tied to the corresponding client side connetion */
 };
 
 struct _cachemgr_passwd {