summaryrefslogtreecommitdiffstats
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-20 13:58:08 +0000
commita5da610b878033f2a0719389cbe23b3894307888 (patch)
tree41e083c3ed150cf6971868648b9ba6d16b5bf787 /netwerk
parentaedf5c0169a835c178834590d07384945db07009 (diff)
downloadUXP-a5da610b878033f2a0719389cbe23b3894307888.tar
UXP-a5da610b878033f2a0719389cbe23b3894307888.tar.gz
UXP-a5da610b878033f2a0719389cbe23b3894307888.tar.lz
UXP-a5da610b878033f2a0719389cbe23b3894307888.tar.xz
UXP-a5da610b878033f2a0719389cbe23b3894307888.zip
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 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;