]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
SourceFormat Enforcement
authorAutomatic source maintenance <squidadm@squid-cache.org>
Fri, 29 Jan 2010 01:13:09 +0000 (18:13 -0700)
committerAutomatic source maintenance <squidadm@squid-cache.org>
Fri, 29 Jan 2010 01:13:09 +0000 (18:13 -0700)
src/AccessLogEntry.h
src/client_side.cc
src/client_side_request.cc

index 5f2ee2225fe8441c49fc2f570f592fb4c4ae1fbd..23be3c27c06b13745541b1f75389ecf29acae3aa 100644 (file)
@@ -48,8 +48,7 @@ class AccessLogEntry
 
 public:
     AccessLogEntry() : url(NULL) , reply(NULL), request(NULL),
-       adapted_request(NULL)
-    {}
+            adapted_request(NULL) {}
 
     const char *url;
 
@@ -136,7 +135,7 @@ public:
 
     public:
         Headers() : request(NULL),
-           adapted_request(NULL),
+                adapted_request(NULL),
 
 #if ICAP_CLIENT
                 icap(NULL),
@@ -145,7 +144,7 @@ public:
 
         char *request; //< virgin HTTP request headers
 
-       char *adapted_request; //< HTTP request headers after adaptation and redirection
+        char *adapted_request; //< HTTP request headers after adaptation and redirection
 
 
 #if ICAP_CLIENT
@@ -166,7 +165,7 @@ public:
     } _private;
     HierarchyLogEntry hier;
     HttpReply *reply;
-    HttpRequest *request; //< virgin HTTP request 
+    HttpRequest *request; //< virgin HTTP request
     HttpRequest *adapted_request; //< HTTP request after adaptation and redirection
 
 
index 7f362cf848179c2c72fd7e806429c0a90cdba20e..47d5b50600bbd9227bf77fbb8c08348d545f1596 100644 (file)
@@ -461,17 +461,17 @@ prepareLogWithRequestDetails(HttpRequest * request, AccessLogEntry * aLogEntry)
         mb.init();
         packerToMemInit(&p, &mb);
         request->header.packInto(&p);
-       //This is the request after adaptation or redirection
-       aLogEntry->headers.adapted_request = xstrdup(mb.buf);
-
-       // the virgin request is saved to aLogEntry->request
-       if (aLogEntry->request) {
-           packerClean(&p);
-           mb.reset();
-           packerToMemInit(&p, &mb);
-           aLogEntry->request->header.packInto(&p);
-           aLogEntry->headers.request = xstrdup(mb.buf);
-       }
+        //This is the request after adaptation or redirection
+        aLogEntry->headers.adapted_request = xstrdup(mb.buf);
+
+        // the virgin request is saved to aLogEntry->request
+        if (aLogEntry->request) {
+            packerClean(&p);
+            mb.reset();
+            packerToMemInit(&p, &mb);
+            aLogEntry->request->header.packInto(&p);
+            aLogEntry->headers.request = xstrdup(mb.buf);
+        }
 
 #if ICAP_CLIENT
         packerClean(&p);
index 540ee82c5947be0dda5b3cf78aba04bb3a951291..2cb7d92bb66a221432b998dc9451adfd46b4ebec 100644 (file)
@@ -1258,7 +1258,7 @@ ClientHttpRequest::doCallouts()
 
     /*Save the original request for logging purposes*/
     if (!calloutContext->http->al.request)
-       calloutContext->http->al.request = HTTPMSGLOCK(request);
+        calloutContext->http->al.request = HTTPMSGLOCK(request);
 
     if (!calloutContext->http_access_done) {
         debugs(83, 3, HERE << "Doing calloutContext->clientAccessCheck()");