diff --git a/mozilla/netwerk/build/Makefile.in b/mozilla/netwerk/build/Makefile.in index e2bcb56b2c4..e6fae61b963 100644 --- a/mozilla/netwerk/build/Makefile.in +++ b/mozilla/netwerk/build/Makefile.in @@ -41,6 +41,7 @@ REQUIRES = xpcom \ locale \ intl \ uconv \ + caps \ $(ZLIB_REQUIRES) \ $(NULL) diff --git a/mozilla/netwerk/build/makefile.win b/mozilla/netwerk/build/makefile.win index 24cac16963f..73d586825b5 100644 --- a/mozilla/netwerk/build/makefile.win +++ b/mozilla/netwerk/build/makefile.win @@ -35,6 +35,7 @@ REQUIRES = xpcom \ intl \ uconv \ zlib \ + caps \ $(NULL) include <$(DEPTH)/config/config.mak> diff --git a/mozilla/netwerk/build/nsNetCID.h b/mozilla/netwerk/build/nsNetCID.h index 7ab199460e4..8c2aa96966d 100644 --- a/mozilla/netwerk/build/nsNetCID.h +++ b/mozilla/netwerk/build/nsNetCID.h @@ -306,6 +306,13 @@ {0x83, 0xcf, 0x09, 0x09, 0xe1, 0x8a, 0x09, 0x3a} \ } +#define NS_HTTPDIGESTAUTH_CID \ +{ /* 17491ba4-1dd2-11b2-aae3-de6b92dab620 */ \ + 0x17491ba4, \ + 0x1dd2, \ + 0x11b2, \ + {0xaa, 0xe3, 0xde, 0x6b, 0x92, 0xda, 0xb6, 0x20} \ +} /****************************************************************************** * netwerk/protocol/res/ classes diff --git a/mozilla/netwerk/build/nsNetModule.cpp b/mozilla/netwerk/build/nsNetModule.cpp index 19525f7ea97..61cd412d177 100644 --- a/mozilla/netwerk/build/nsNetModule.cpp +++ b/mozilla/netwerk/build/nsNetModule.cpp @@ -113,6 +113,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsStorageTransport) #include "nsHttpBasicAuth.h" NS_GENERIC_FACTORY_CONSTRUCTOR(nsHttpBasicAuth) +#include "nsHttpDigestAuth.h" +NS_GENERIC_FACTORY_CONSTRUCTOR(nsHttpDigestAuth) + /////////////////////////////////////////////////////////////////////////////// #include "nsResProtocolHandler.h" @@ -912,6 +915,11 @@ static nsModuleComponentInfo gNetModuleInfo[] = { NS_HTTP_AUTHENTICATOR_CONTRACTID_PREFIX "basic", nsHttpBasicAuthConstructor }, + { "HTTP Digest Auth Encoder", + NS_HTTPDIGESTAUTH_CID, + NS_HTTP_AUTHENTICATOR_CONTRACTID_PREFIX "digest", + nsHttpDigestAuthConstructor }, + // from netwerk/protocol/data: { "Data Protocol Handler", NS_DATAHANDLER_CID,