Bug 1159448 - Thunderbird ignores proxy settings on POP3S protocol, r=neil, a=rkent
authorR Kent James <rkent@caspia.com>
Thu, 14 May 2015 18:34:02 -0700
changeset 26030 db5fd57ab6d26eccd231d08db073d99f7035d170
parent 26027 2e3475b7290dfc198e3d811a4884b1fcdd91008b
child 26032 3390e06188c1e1812ff81f6f1d19d1b38956f536
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersneil, rkent
bugs1159448
Bug 1159448 - Thunderbird ignores proxy settings on POP3S protocol, r=neil, a=rkent
mailnews/build/nsMailModule.cpp
mailnews/local/public/nsMsgLocalCID.h
--- a/mailnews/build/nsMailModule.cpp
+++ b/mailnews/build/nsMailModule.cpp
@@ -1199,16 +1199,17 @@ const mozilla::Module::ContractIDEntry k
   { NS_MAILBOXSERVICE_CONTRACTID1, &kNS_MAILBOXSERVICE_CID },
   { NS_MAILBOXSERVICE_CONTRACTID2, &kNS_MAILBOXSERVICE_CID },
   { NS_MAILBOXSERVICE_CONTRACTID3, &kNS_MAILBOXSERVICE_CID },
   { NS_MAILBOXSERVICE_CONTRACTID4, &kNS_MAILBOXSERVICE_CID },
   { NS_MAILBOXPARSER_CONTRACTID, &kNS_MAILBOXPARSER_CID },
   { NS_POP3URL_CONTRACTID, &kNS_POP3URL_CID },
   { NS_POP3SERVICE_CONTRACTID1, &kNS_POP3SERVICE_CID },
   { NS_POP3SERVICE_CONTRACTID2, &kNS_POP3SERVICE_CID },
+  { NS_POP3SERVICE_CONTRACTID3, &kNS_POP3SERVICE_CID },
   { NS_NONESERVICE_CONTRACTID, &kNS_NONESERVICE_CID },
 #ifdef HAVE_MOVEMAIL
   { NS_MOVEMAILSERVICE_CONTRACTID, &kNS_MOVEMAILSERVICE_CID },
 #endif /* HAVE_MOVEMAIL */
   { NS_POP3PROTOCOLINFO_CONTRACTID, &kNS_POP3SERVICE_CID },
   { NS_NONEPROTOCOLINFO_CONTRACTID, &kNS_NONESERVICE_CID },
 #ifdef HAVE_MOVEMAIL
   { NS_MOVEMAILPROTOCOLINFO_CONTRACTID, &kNS_MOVEMAILSERVICE_CID },
--- a/mailnews/local/public/nsMsgLocalCID.h
+++ b/mailnews/local/public/nsMsgLocalCID.h
@@ -112,16 +112,25 @@
 //
 
 #define NS_POP3SERVICE_CONTRACTID1 \
   "@mozilla.org/messenger/popservice;1"
 
 #define NS_POP3SERVICE_CONTRACTID2 \
   NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "pop"
 
+// Mailnews has used "pop" as the protocol scheme for pop3 in some places,
+// but "pop3" in others. Necko code needs to be able to locate protocolInfo
+// based on pop3 to get proxy information.
+//
+// TODO: fix the mailnews code to use a consistent POP3 protocol scheme.
+
+#define NS_POP3SERVICE_CONTRACTID3 \
+  NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "pop3"
+
 #define NS_POP3PROTOCOLINFO_CONTRACTID \
   NS_MSGPROTOCOLINFO_CONTRACTID_PREFIX NS_POP3INCOMINGSERVER_TYPE
 
 #define NS_POP3SERVICE_CID                \
 { /* 3BB459E3-D746-11d2-806A-006008128C4E */      \
  0x3bb459e3, 0xd746, 0x11d2,              \
   { 0x80, 0x6a, 0x0, 0x60, 0x8, 0x12, 0x8c, 0x4e }}