diff options
author | Moonchild <moonchild@palemoon.org> | 2020-05-18 09:23:17 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2020-05-20 13:58:23 +0000 |
commit | d8a0849b7fb5d19d823e1e6036f06cb577a097e7 (patch) | |
tree | 70f8f2bee03010fcf610dc93b948f44cfe152635 | |
parent | 02923a36489999b0ed4f65e1bc4171be566ab01a (diff) | |
download | UXP-d8a0849b7fb5d19d823e1e6036f06cb577a097e7.tar UXP-d8a0849b7fb5d19d823e1e6036f06cb577a097e7.tar.gz UXP-d8a0849b7fb5d19d823e1e6036f06cb577a097e7.tar.lz UXP-d8a0849b7fb5d19d823e1e6036f06cb577a097e7.tar.xz UXP-d8a0849b7fb5d19d823e1e6036f06cb577a097e7.zip |
Issue #80 - De-unify netwerk/protocol/http
-rw-r--r-- | netwerk/protocol/http/Http2Push.cpp | 1 | ||||
-rw-r--r-- | netwerk/protocol/http/HttpBaseChannel.cpp | 1 | ||||
-rw-r--r-- | netwerk/protocol/http/HttpChannelChild.cpp | 1 | ||||
-rw-r--r-- | netwerk/protocol/http/HttpChannelParent.cpp | 3 | ||||
-rw-r--r-- | netwerk/protocol/http/HttpChannelParentListener.cpp | 1 | ||||
-rw-r--r-- | netwerk/protocol/http/moz.build | 19 | ||||
-rw-r--r-- | netwerk/protocol/http/nsHttpChannel.cpp | 1 | ||||
-rw-r--r-- | netwerk/protocol/http/nsHttpChannel.h | 5 |
8 files changed, 17 insertions, 15 deletions
diff --git a/netwerk/protocol/http/Http2Push.cpp b/netwerk/protocol/http/Http2Push.cpp index 34fc425d2..a1bbd72cc 100644 --- a/netwerk/protocol/http/Http2Push.cpp +++ b/netwerk/protocol/http/Http2Push.cpp @@ -19,6 +19,7 @@ #include "nsHttpChannel.h" #include "nsIHttpPushListener.h" #include "nsString.h" +#include "nsSocketTransportService2.h" namespace mozilla { namespace net { diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index 568ef3012..a53022f71 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -11,6 +11,7 @@ #include "mozilla/net/HttpBaseChannel.h" #include "nsHttpHandler.h" +#include "nsHttpChannel.h" #include "nsMimeTypes.h" #include "nsNetCID.h" #include "nsNetUtil.h" diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp index 0a1e0f859..5d17b42b2 100644 --- a/netwerk/protocol/http/HttpChannelChild.cpp +++ b/netwerk/protocol/http/HttpChannelChild.cpp @@ -18,6 +18,7 @@ #include "mozilla/net/NeckoChild.h" #include "mozilla/net/HttpChannelChild.h" +#include "AltDataOutputStreamChild.h" #include "nsISupportsPrimitives.h" #include "nsChannelClassifier.h" #include "nsStringStream.h" diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp index 7c88b9222..36a02e0fa 100644 --- a/netwerk/protocol/http/HttpChannelParent.cpp +++ b/netwerk/protocol/http/HttpChannelParent.cpp @@ -24,6 +24,7 @@ #include "nsIAssociatedContentSecurity.h" #include "nsIApplicationCacheService.h" #include "mozilla/ipc/InputStreamUtils.h" +#include "mozilla/ipc/IPCStreamUtils.h" #include "mozilla/ipc/URIUtils.h" #include "SerializedLoadContext.h" #include "nsIAuthInformation.h" @@ -40,6 +41,8 @@ #include "nsIWindowWatcher.h" #include "nsIDocument.h" #include "nsStringStream.h" +#include "nsIStorageStream.h" +#include "nsStreamUtils.h" using mozilla::BasePrincipal; using namespace mozilla::dom; diff --git a/netwerk/protocol/http/HttpChannelParentListener.cpp b/netwerk/protocol/http/HttpChannelParentListener.cpp index 59030cf99..d5fd77dd1 100644 --- a/netwerk/protocol/http/HttpChannelParentListener.cpp +++ b/netwerk/protocol/http/HttpChannelParentListener.cpp @@ -16,6 +16,7 @@ #include "nsIHttpHeaderVisitor.h" #include "nsIRedirectChannelRegistrar.h" #include "nsIPromptFactory.h" +#include "nsIWindowWatcher.h" #include "nsQueryObject.h" using mozilla::Unused; diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build index a1b57876b..8e3c51010 100644 --- a/netwerk/protocol/http/moz.build +++ b/netwerk/protocol/http/moz.build @@ -43,18 +43,11 @@ EXPORTS.mozilla.net += [ 'TimingStruct.h', ] -# ASpdySession.cpp and nsHttpAuthCache cannot be built in unified mode because -# they use plarena.h. SOURCES += [ - 'AlternateServices.cpp', - 'ASpdySession.cpp', - 'nsHttpAuthCache.cpp', - 'nsHttpChannelAuthProvider.cpp', # redefines GetAuthType -] - -UNIFIED_SOURCES += [ 'AltDataOutputStreamChild.cpp', 'AltDataOutputStreamParent.cpp', + 'AlternateServices.cpp', + 'ASpdySession.cpp', 'CacheControlParser.cpp', 'ConnectionDiagnostics.cpp', 'Http2Compression.cpp', @@ -70,14 +63,17 @@ UNIFIED_SOURCES += [ 'nsCORSListenerProxy.cpp', 'nsHttp.cpp', 'nsHttpActivityDistributor.cpp', + 'nsHttpAuthCache.cpp', 'nsHttpAuthManager.cpp', 'nsHttpBasicAuth.cpp', 'nsHttpChannel.cpp', + 'nsHttpChannelAuthProvider.cpp', 'nsHttpChunkedDecoder.cpp', 'nsHttpConnection.cpp', 'nsHttpConnectionInfo.cpp', 'nsHttpConnectionMgr.cpp', 'nsHttpDigestAuth.cpp', + 'nsHttpHandler.cpp', 'nsHttpHeaderArray.cpp', 'nsHttpNTLMAuth.cpp', 'nsHttpPipeline.cpp', @@ -89,11 +85,6 @@ UNIFIED_SOURCES += [ 'TunnelUtils.cpp', ] -# These files cannot be built in unified mode because of OS X headers. -SOURCES += [ - 'nsHttpHandler.cpp', -] - IPDL_SOURCES += [ 'PAltDataOutputStream.ipdl', 'PHttpChannel.ipdl', diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 950b1a7ab..464f7507d 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -24,6 +24,7 @@ #include "nsICryptoHash.h" #include "nsINetworkInterceptController.h" #include "nsINSSErrorsService.h" +#include "nsIScriptError.h" #include "nsIStringBundle.h" #include "nsIStreamListenerTee.h" #include "nsISeekableStream.h" diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h index defd710c3..b7f39b2f0 100644 --- a/netwerk/protocol/http/nsHttpChannel.h +++ b/netwerk/protocol/http/nsHttpChannel.h @@ -35,7 +35,10 @@ class nsIHttpChannelAuthProvider; class nsInputStreamPump; class nsISSLStatus; -namespace mozilla { namespace net { +namespace mozilla { +namespace net { + +bool WillRedirect(nsHttpResponseHead * response); class Http2PushedStream; |