Merge remote-tracking branch 'origin/redwood' into release

23 files changed, 35 insertions, 23 deletions

diff --git a/netwerk/protocol/about/moz.build b/netwerk/protocol/about/moz.build
index 60a10c9cc..7c1842a4d 100644
--- a/netwerk/protocol/about/moz.build
+++ b/netwerk/protocol/about/moz.build
@@ -14,7 +14,7 @@ EXPORTS += [
     'nsAboutProtocolUtils.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsAboutBlank.cpp',
     'nsAboutCache.cpp',
     'nsAboutCacheEntry.cpp',
diff --git a/netwerk/protocol/about/nsAboutCache.h b/netwerk/protocol/about/nsAboutCache.h
index c2d1af850..6fb837eac 100644
--- a/netwerk/protocol/about/nsAboutCache.h
+++ b/netwerk/protocol/about/nsAboutCache.h
@@ -9,6 +9,7 @@
 #include "nsIAboutModule.h"
 #include "nsICacheStorageVisitor.h"
 #include "nsICacheStorage.h"
+#include "nsIChannel.h"
 
 #include "nsString.h"
 #include "nsIOutputStream.h"
diff --git a/netwerk/protocol/about/nsAboutCacheEntry.h b/netwerk/protocol/about/nsAboutCacheEntry.h
index 44a78760b..8bfa0aa72 100644
--- a/netwerk/protocol/about/nsAboutCacheEntry.h
+++ b/netwerk/protocol/about/nsAboutCacheEntry.h
@@ -9,6 +9,7 @@
 #include "nsIAboutModule.h"
 #include "nsICacheEntryOpenCallback.h"
 #include "nsICacheEntry.h"
+#include "nsIChannel.h"
 #include "nsIStreamListener.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
diff --git a/netwerk/protocol/about/nsAboutProtocolHandler.cpp b/netwerk/protocol/about/nsAboutProtocolHandler.cpp
index 998fc71f9..905ecb5a6 100644
--- a/netwerk/protocol/about/nsAboutProtocolHandler.cpp
+++ b/netwerk/protocol/about/nsAboutProtocolHandler.cpp
@@ -20,6 +20,7 @@
 #include "nsIWritablePropertyBag2.h"
 #include "nsIChannel.h"
 #include "nsIScriptError.h"
+#include "nsContentUtils.h"
 
 namespace mozilla {
 namespace net {
diff --git a/netwerk/protocol/data/moz.build b/netwerk/protocol/data/moz.build
index 0958118fa..2c45b8067 100644
--- a/netwerk/protocol/data/moz.build
+++ b/netwerk/protocol/data/moz.build
@@ -8,7 +8,7 @@ EXPORTS.mozilla.net += [
     'DataChannelParent.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'DataChannelChild.cpp',
     'DataChannelParent.cpp',
     'nsDataChannel.cpp',
diff --git a/netwerk/protocol/data/nsDataChannel.cpp b/netwerk/protocol/data/nsDataChannel.cpp
index 608a6c6e0..148a7901a 100644
--- a/netwerk/protocol/data/nsDataChannel.cpp
+++ b/netwerk/protocol/data/nsDataChannel.cpp
@@ -16,6 +16,7 @@
 #include "nsEscape.h"
 
 using namespace mozilla;
+using namespace mozilla::net;
 
 nsresult
 nsDataChannel::OpenContentStream(bool async, nsIInputStream **result,
diff --git a/netwerk/protocol/device/moz.build b/netwerk/protocol/device/moz.build
index 3bb95930e..6900e725a 100644
--- a/netwerk/protocol/device/moz.build
+++ b/netwerk/protocol/device/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsDeviceChannel.cpp',
     'nsDeviceProtocolHandler.cpp',
 ]
diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build
index 223ff2f2b..c6be28ef2 100644
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -15,7 +15,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_file'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsFileChannel.cpp',
     'nsFileProtocolHandler.cpp',
 ]
diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp b/netwerk/protocol/file/nsFileProtocolHandler.cpp
index e55cb9d47..3896dabad 100644
--- a/netwerk/protocol/file/nsFileProtocolHandler.cpp
+++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp
@@ -28,6 +28,8 @@
 #define DESKTOP_ENTRY_SECTION "Desktop Entry"
 #endif
 
+using namespace mozilla::net;
+
 //-----------------------------------------------------------------------------
 
 nsFileProtocolHandler::nsFileProtocolHandler()
diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build
index 060fb7575..f132dfdd3 100644
--- a/netwerk/protocol/ftp/moz.build
+++ b/netwerk/protocol/ftp/moz.build
@@ -20,7 +20,7 @@ EXPORTS.mozilla.net += [
     'FTPChannelParent.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'FTPChannelChild.cpp',
     'FTPChannelParent.cpp',
     'nsFTPChannel.cpp',
diff --git a/netwerk/protocol/ftp/nsFTPChannel.cpp b/netwerk/protocol/ftp/nsFTPChannel.cpp
index 2a0f04915..5c5bee920 100644
--- a/netwerk/protocol/ftp/nsFTPChannel.cpp
+++ b/netwerk/protocol/ftp/nsFTPChannel.cpp
@@ -14,6 +14,9 @@ using namespace mozilla;
 using namespace mozilla::net;
 extern LazyLogModule gFTPLog;
 
+#undef LOG
+#define LOG(args) MOZ_LOG(gFTPLog, mozilla::LogLevel::Debug, args)
+
 // There are two transport connections established for an 
 // ftp connection. One is used for the command channel , and
 // the other for the data channel. The command channel is the first
diff --git a/netwerk/protocol/ftp/nsFTPChannel.h b/netwerk/protocol/ftp/nsFTPChannel.h
index 549e577b3..f829c5f59 100644
--- a/netwerk/protocol/ftp/nsFTPChannel.h
+++ b/netwerk/protocol/ftp/nsFTPChannel.h
@@ -18,6 +18,7 @@
 #include "nsIProxyInfo.h"
 #include "nsIProxiedChannel.h"
 #include "nsIResumableChannel.h"
+#include "ADivertableParentChannel.h"
 
 class nsIURI;
 using mozilla::net::ADivertableParentChannel;
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;
 
diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build
index 37e2316b0..463d8e0fe 100644
--- a/netwerk/protocol/res/moz.build
+++ b/netwerk/protocol/res/moz.build
@@ -11,7 +11,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_res'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'ExtensionProtocolHandler.cpp',
     'nsResProtocolHandler.cpp',
     'SubstitutingProtocolHandler.cpp',
diff --git a/netwerk/protocol/viewsource/moz.build b/netwerk/protocol/viewsource/moz.build
index 4e3303c40..986ebf14e 100644
--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@@ -10,7 +10,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_viewsource'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsViewSourceChannel.cpp',
     'nsViewSourceHandler.cpp',
 ]
diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build
index b043137f7..e5e02ce98 100644
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -15,7 +15,7 @@ EXPORTS.mozilla.net += [
     'WyciwygChannelParent.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsWyciwyg.cpp',
     'nsWyciwygChannel.cpp',
     'nsWyciwygProtocolHandler.cpp',