summaryrefslogtreecommitdiff
path: root/netwerk
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-05-18 06:00:43 +0000
committerMoonchild <moonchild@palemoon.org>2020-05-18 06:00:43 +0000
commit243850386dd22ebea3897b0f2d94a24c582e4705 (patch)
tree4d22f391d5928747cb3f012f5fd80f2e721f84e3 /netwerk
parent5f86cd25f2255b6bee1dd77245ea91fe0a2f4bc4 (diff)
downloaduxp-243850386dd22ebea3897b0f2d94a24c582e4705.tar.gz
Issue #80 - De-unify netwerk/protocol/ftp
Diffstat (limited to 'netwerk')
-rw-r--r--netwerk/protocol/ftp/moz.build2
-rw-r--r--netwerk/protocol/ftp/nsFTPChannel.cpp3
-rw-r--r--netwerk/protocol/ftp/nsFTPChannel.h1
3 files changed, 5 insertions, 1 deletions
diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build
index 060fb7575b..f132dfdd39 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 2a0f049153..5c5bee9206 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 549e577b3d..f829c5f59c 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;