Http branch landing: changes to netwerk/ (bug 76866) r=gagan,sr=dougt,a=chofmann

git-svn-id: svn://10.0.0.236/trunk@94681 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/netwerk/build/nsNetModule.cpp

@@ -107,6 +107,15 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsStorageTransport)
 
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "nsHttpHandler.h"
+//NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsHttpHandler, Init)
+
+#include "nsHttpBasicAuth.h"
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsHttpBasicAuth)
+
+///////////////////////////////////////////////////////////////////////////////
+
+#if 0
 #include "nsIHTTPProtocolHandler.h"
 #include "nsHTTPHandler.h"
 #include "nsHTTPSHandler.h"
@@ -156,6 +165,8 @@ UnregisterBasicAuth(nsIComponentManager *aCompMgr, nsIFile *aPath,
                                            getter_Copies(basicAuth));
     return NS_OK;
 }
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "nsFileChannel.h"
@@ -785,6 +796,7 @@ static nsModuleComponentInfo gNetModuleInfo[] = {
       nsFileChannel::Create
     },
     
+#if 0
     // from netwerk/protocol/http:
     { "HTTP Handler",
       NS_IHTTPHANDLER_CID,
@@ -801,6 +813,22 @@ static nsModuleComponentInfo gNetModuleInfo[] = {
       RegisterBasicAuth,
       UnregisterBasicAuth
     },
+#endif
+
+    { "HTTP Handler",
+      NS_HTTPPROTOCOLHANDLER_CID,
+      NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http",
+      nsHttpHandler::Create },
+
+    { "HTTPS Handler",
+      NS_HTTPPROTOCOLHANDLER_CID,
+      NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "https",
+      nsHttpHandler::Create },
+
+    { "HTTP Basic Auth Encoder",
+      NS_HTTPBASICAUTH_CID,
+      NS_HTTP_AUTHENTICATOR_CONTRACTID_PREFIX "basic",
+      nsHttpBasicAuthConstructor },
 
     // from netwerk/protocol/data:
     { "Data Protocol Handler",