Bug 616809 Remove CRs from netwerk r=biesi a=jst DONTBUILD
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Sun, 06 Feb 2011 00:04:14 +0000
changeset 61995 8eaee3e456e4240a6acc0e038b63c665993bc937
parent 61994 5bf94fcd5115692b32da8c5aeecba23ef2f4ca71
child 61996 f40e9a9977e2de293486ff515efbae4bc5698573
push id18573
push userneil@parkwaycc.co.uk
push dateSun, 06 Feb 2011 00:05:41 +0000
treeherderautoland@f40e9a9977e2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbiesi, jst
bugs616809
milestone2.0b12pre
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
Bug 616809 Remove CRs from netwerk r=biesi a=jst DONTBUILD
netwerk/protocol/http/nsHttpAuthCache.cpp
netwerk/protocol/http/nsIHttpAuthenticator.idl
netwerk/test/httpserver/jar.mn
--- a/netwerk/protocol/http/nsHttpAuthCache.cpp
+++ b/netwerk/protocol/http/nsHttpAuthCache.cpp
@@ -415,18 +415,18 @@ nsHttpAuthEntry::Set(const char *path,
         memcpy(newChall, chall, challLen);
     newChall[challLen] = 0;
 
     nsresult rv = NS_OK;
     if (ident) {
         rv = mIdent.Set(*ident);
     } 
     else if (mIdent.IsEmpty()) {
-        // If we are not given an identity and our cached identity has not been
-        // initialized yet (so is currently empty), initialize it now by
+        // If we are not given an identity and our cached identity has not been
+        // initialized yet (so is currently empty), initialize it now by
         // filling it with nulls.  We need to do that because consumers expect
         // that mIdent is initialized after this function returns.
         rv = mIdent.Set(nsnull, nsnull, nsnull);
     }
     if (NS_FAILED(rv)) {
         free(newRealm);
         return rv;
     }
--- a/netwerk/protocol/http/nsIHttpAuthenticator.idl
+++ b/netwerk/protocol/http/nsIHttpAuthenticator.idl
@@ -131,17 +131,17 @@ interface nsIHttpAuthenticator : nsISupp
                                inout nsISupports    aContinuationState,
                                out   unsigned long  aFlags);
 
     /**
      * Generate flags
      */
 
     /**
-     * Indicates that the authenticator has used an out-of-band or internal 
+     * Indicates that the authenticator has used an out-of-band or internal
      * source of identity and tells the consumer that it must not cache 
      * the returned identity because it might not be valid and would overwrite
      * the cached identity.  See bug 542318 comment 32.
      */
     const unsigned long USING_INTERNAL_IDENTITY = (1<<0);
 
     /**
      * Flags defining various properties of the authenticator.
--- a/netwerk/test/httpserver/jar.mn
+++ b/netwerk/test/httpserver/jar.mn
@@ -1,6 +1,6 @@
-#ifdef XPI_NAME
-httpd.jar:
-%  component {54ef6f81-30af-4b1d-ac55-8ba811293e41} components/httpd.js
-%  contract @mozilla.org/server/jshttp;1 {54ef6f81-30af-4b1d-ac55-8ba811293e41}
-%  interfaces components/test_necko.xpt
-#endif
+#ifdef XPI_NAME
+httpd.jar:
+%  component {54ef6f81-30af-4b1d-ac55-8ba811293e41} components/httpd.js
+%  contract @mozilla.org/server/jshttp;1 {54ef6f81-30af-4b1d-ac55-8ba811293e41}
+%  interfaces components/test_necko.xpt
+#endif