Minor formatting fixes to redirects patch (bug 536294)
authorJason Duell <jduell.mcbugs@gmail.com>
Wed, 11 Aug 2010 00:09:50 -0700
changeset 49378 764e442861ae73b26c5b6b7ca34fc1a27324f8f8
parent 49377 f734ee9382eff78dd4fa1633a5d808c0d69f9de3
child 49379 6d4660297eab51d3121fb123fa42b7a17c56f449
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs536294
milestone2.0b4pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Minor formatting fixes to redirects patch (bug 536294)
netwerk/protocol/http/HttpBaseChannel.cpp
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -900,20 +900,17 @@ HttpBaseChannel::SetCookie(const char *a
 
   // empty header isn't an error
   if (!(aCookieHeader && *aCookieHeader))
     return NS_OK;
 
   nsICookieService *cs = gHttpHandler->GetCookieService();
   NS_ENSURE_TRUE(cs, NS_ERROR_FAILURE);
 
-  return cs->SetCookieStringFromHttp(mURI,
-                                     nsnull,
-                                     nsnull,
-                                     aCookieHeader,
+  return cs->SetCookieStringFromHttp(mURI, nsnull, nsnull, aCookieHeader,
                                      mResponseHead->PeekHeader(nsHttp::Date),
                                      this);
 }
 
 NS_IMETHODIMP
 HttpBaseChannel::GetForceAllowThirdPartyCookie(PRBool *aForce)
 {
   *aForce = mForceAllowThirdPartyCookie;
@@ -967,18 +964,17 @@ HttpBaseChannel::AddCookiesToRequest()
   }
 
   nsXPIDLCString cookie;
 
   nsICookieService *cs = gHttpHandler->GetCookieService();
   if (cs) {
     cs->GetCookieStringFromHttp(mURI,
                                 mDocumentURI ? mDocumentURI : mOriginalURI,
-                                this,
-                                getter_Copies(cookie));
+                                this, getter_Copies(cookie));
   }
 
   if (cookie.IsEmpty()) {
     cookie = mUserSetCookieHeader;
   }
   else if (!mUserSetCookieHeader.IsEmpty()) {
     cookie.Append(NS_LITERAL_CSTRING("; ") + mUserSetCookieHeader);
   }
@@ -1041,37 +1037,35 @@ HttpBaseChannel::SetupReplacementChannel
       // replicate original call to SetUploadStream...
       if (uploadChannel2) {
         const char *ctype = mRequestHead.PeekHeader(nsHttp::Content_Type);
         if (!ctype)
           ctype = "";
         const char *clen  = mRequestHead.PeekHeader(nsHttp::Content_Length);
         PRInt64 len = clen ? nsCRT::atoll(clen) : -1;
         uploadChannel2->ExplicitSetUploadStream(
-            mUploadStream,
-            nsDependentCString(ctype),
-            len,
-            nsDependentCString(mRequestHead.Method()),
-            mUploadStreamHasHeaders);
+                                  mUploadStream, nsDependentCString(ctype), len,
+                                  nsDependentCString(mRequestHead.Method()),
+                                  mUploadStreamHasHeaders);
       } else {
         if (mUploadStreamHasHeaders) {
           uploadChannel->SetUploadStream(mUploadStream, EmptyCString(),
                            -1);
         } else {
           const char *ctype =
             mRequestHead.PeekHeader(nsHttp::Content_Type);
           const char *clen =
             mRequestHead.PeekHeader(nsHttp::Content_Length);
           if (!ctype) {
             ctype = "application/octet-stream";
           }
           if (clen) {
             uploadChannel->SetUploadStream(mUploadStream,
-                             nsDependentCString(ctype),
-                             atoi(clen));
+                                           nsDependentCString(ctype),
+                                           atoi(clen));
           }
         }
       }
     }
     // since preserveMethod is true, we need to ensure that the appropriate 
     // request method gets set on the channel, regardless of whether or not 
     // we set the upload stream above. This means SetRequestMethod() will
     // be called twice if ExplicitSetUploadStream() gets called above.