diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-06-01 21:58:35 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-06-01 21:58:35 +0000 |
| commit | c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810 (patch) | |
| tree | c7672903a2030d37f861b12900165a015f49d10a /netwerk/protocol/ftp | |
| parent | 451509e2c0188a4164d4b3d1d9f5839ed1e95246 (diff) | |
| parent | 744b044935f7d1d67fbe0df42d898efcbdd00536 (diff) | |
| download | UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.gz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.lz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.xz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.zip | |
Merge remote-tracking branch 'origin/redwood' into release
Diffstat (limited to 'netwerk/protocol/ftp')
| -rw-r--r-- | netwerk/protocol/ftp/moz.build | 2 | ||||
| -rw-r--r-- | netwerk/protocol/ftp/nsFTPChannel.cpp | 3 | ||||
| -rw-r--r-- | netwerk/protocol/ftp/nsFTPChannel.h | 1 |
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; |