mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

stop trying to implement advanced pop3 server features on servers that don't really support them, patch by ch.ey@gmx.net, r=bienvenu, sr=mscott 156998

This commit is contained in:
bienvenu%nventure.com 2007-06-27 17:43:13 +00:00
Родитель 619acac721
Коммит fd01f1cec4
5 изменённых файлов: 330 добавлений и 582 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

48
mail/locales/en-US/chrome/messenger/localMsgs.properties
Просмотреть файл

@ -108,24 +108,6 @@
# the second %ld will receive the total number of messages
4009=Received %ld of %ld messages
# Status - the server doesn't support UIDL...
## @name POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC
## @loc None
# LOCALIZATION NOTE(4010): The following sentence should be translated in this way:
# Do not translate "POP3"
# Do not translate "%S". Place %s in your translation where the name of the server should appear.
# Do not translate "UIDL"
4010=The POP3 server (%S) does not support UIDL, which is needed to implement the ``Leave on Server'' and ``Maximum Message Size'' options. To download your mail, turn off these options in the Mail Server panel of Preferences.
# Status - the server doesn't support the top command
## @name POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND
## @loc None
# LOCALIZATION NOTE(4011): The following sentence should be translated in this way:
# Do not translate "POP3"
# Do not translate "%s". Place %s in your translation where the name of the server should appear.
# Do not translate "TOP"
4011=The POP3 mail server (%s) does not support the TOP command. Without server support for this, we cannot implement the ``Maximum Message Size'' preference. This option has been disabled, and messages will be downloaded regardless of their size.
# Status - retr failure from the server
## @name POP3_RETR_FAILURE
## @loc None
@ -213,11 +195,6 @@
## @loc None
4030=Mail server does not support secure authentication.
# secure authentication failed and unsure why
## @name CANNOT_PROCESS_APOP_AUTH
## @loc None
4031=Mail server does not support secure authentication or you have entered an incorrect password. Please check your password, or turn off secure authentication in the account settings for your mail server.\n
## @name MOVEMAIL_SPOOL_FILE_LOCKED
## @loc None
4032=The mail spool file %S is locked.
@ -246,6 +223,29 @@
## @loc None
4038=There was an error downloading the following message: \nFrom: %S\n Subject: %S\n This message may contain a virus or there is not enough disk space. Skip this message?
# Status - the server doesn't support UIDL...
## @name POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC
## @loc None
# LOCALIZATION NOTE(4010): The following sentence should be translated in this way:
# Do not translate "POP3"
# Do not translate "%S". Place %S in your translation where the name of the server should appear.
# Do not translate "UIDL"
4040=The POP3 mail server (%S) does not support UIDL or XTND XLST, which are required to implement the ``Leave on Server'', ``Maximum Message Size'' or ``Fetch Headers Only'' options. To download your mail, turn off these options in the Server Settings for your mail server in the Account Settings window.
# Status - the server doesn't support the top command
## @name POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND
## @loc None
# LOCALIZATION NOTE(4011): The following sentence should be translated in this way:
# Do not translate "POP3"
# Do not translate "%S". Place %S in your translation where the name of the server should appear.
# Do not translate "TOP"
4041=The POP3 mail server (%S) does not support the TOP command. Without server support for this, we cannot implement the ``Maximum Message Size'' or ``Fetch Headers Only'' preference. This option has been disabled, and messages will be downloaded regardless of their size.
# secure authentication failed and unsure why
## @name CANNOT_PROCESS_APOP_AUTH
## @loc None
4042=The mail server does not support secure authentication or you have entered an incorrect password. Please check your password, or turn off secure authentication in the Server Settings for your mail server in the Account Settings window.\n
## @name NS_ERROR_COULD_NOT_CONNECT_VIA_TLS
## @loc None
4039=Unable to establish TLS connection to POP3 server. The server may be down or may be incorrectly configured. Please verify that your Mail/News account settings are correct and try again.
4043=Unable to establish TLS connection to POP3 server. The server may be down or may be incorrectly configured. Please verify the correct configuration in the Server Settings for your mail server in the Account Settings window and try again.

10
mailnews/local/src/nsLocalStrings.h
Просмотреть файл

@ -17,8 +17,6 @@
#define POP3_CONNECT_HOST_CONTACTED_SENDING_LOGIN_INFORMATION 4007
#define POP3_NO_MESSAGES 4008
#define POP3_DOWNLOAD_COUNT 4009
#define POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC 4010
#define POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND 4011
#define POP3_RETR_FAILURE 4012
#define POP3_PASSWORD_UNDEFINED 4013
#define POP3_USERNAME_UNDEFINED 4014
@ -37,7 +35,6 @@
#define MOVING_MSGS_STATUS 4028
#define POP3_MESSAGE_FOLDER_BUSY 4029
#define CANNOT_PROCESS_SECURE_AUTH 4030
#define CANNOT_PROCESS_APOP_AUTH 4031
#define MOVEMAIL_SPOOL_FILE_LOCKED 4032
#define MOVEMAIL_CANT_OPEN_SPOOL_FILE 4033
#define MOVEMAIL_CANT_CREATE_LOCK 4034
@ -45,6 +42,9 @@
#define MOVEMAIL_CANT_TRUNCATE_SPOOL_FILE 4036
#define MOVEMAIL_SPOOL_FILE_NOT_FOUND 4037
#define POP3_TMP_DOWNLOAD_FAILED 4038
#define NS_ERROR_COULD_NOT_CONNECT_VIA_TLS 4039
#define POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC 4040
#define POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND 4041
#define CANNOT_PROCESS_APOP_AUTH 4042
#define NS_ERROR_COULD_NOT_CONNECT_VIA_TLS 4043
#endif /* _nsLocalStringBundle_H__ */
#endif /* _nsLocalStrings_H__ */

735
mailnews/local/src/nsPop3Protocol.cpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

71
mailnews/local/src/nsPop3Protocol.h
Просмотреть файл

@ -149,34 +149,28 @@ enum Pop3StatesEnum {
POP3_DONE, // 23
POP3_ERROR_DONE, // 24
POP3_FREE, // 25
/* The following 3 states support the use of the 'TOP' command instead of UIDL
for leaving mail on the pop server -km */
POP3_START_USE_TOP_FOR_FAKE_UIDL, // 26
POP3_SEND_FAKE_UIDL_TOP, // 27
POP3_GET_FAKE_UIDL_TOP, // 28
POP3_SEND_AUTH, // 29
POP3_AUTH_RESPONSE, // 30
POP3_SEND_CAPA, // 31
POP3_CAPA_RESPONSE, // 32
POP3_PROCESS_AUTH, // 33
POP3_AUTH_FALLBACK, // 34
POP3_SEND_AUTH, // 26
POP3_AUTH_RESPONSE, // 27
POP3_SEND_CAPA, // 28
POP3_CAPA_RESPONSE, // 29
POP3_PROCESS_AUTH, // 30
POP3_AUTH_FALLBACK, // 31
POP3_AUTH_LOGIN, // 35
POP3_AUTH_LOGIN_RESPONSE, // 36
POP3_AUTH_NTLM, // 37
POP3_AUTH_NTLM_RESPONSE, // 38
POP3_SEND_XSENDER, // 39
POP3_XSENDER_RESPONSE, // 40
POP3_SEND_GURL, // 41
POP3_AUTH_LOGIN, // 32
POP3_AUTH_LOGIN_RESPONSE, // 33
POP3_AUTH_NTLM, // 34
POP3_AUTH_NTLM_RESPONSE, // 35
POP3_SEND_XSENDER, // 36
POP3_XSENDER_RESPONSE, // 37
POP3_SEND_GURL, // 38
POP3_GURL_RESPONSE, // 42
POP3_QUIT_RESPONSE, // 43
POP3_INTERRUPTED, // 44
POP3_TLS_RESPONSE, // 45
POP3_AUTH_GSSAPI, // 46
POP3_AUTH_GSSAPI_FIRST, // 47
POP3_AUTH_GSSAPI_STEP // 48
POP3_GURL_RESPONSE, // 39
POP3_QUIT_RESPONSE, // 40
POP3_TLS_RESPONSE, // 41
POP3_AUTH_GSSAPI, // 42
POP3_AUTH_GSSAPI_FIRST, // 43
POP3_AUTH_GSSAPI_STEP // 44
};
@ -252,25 +246,6 @@ typedef struct _Pop3ConData {
PLHashTable *newuidl;
char *only_uidl; /* If non-NULL, then load only this UIDL. */
/* the following three fields support the
use of the 'TOP' command instead of UIDL
for leaving mail on the pop server -km */
/* the current message that we are retrieving
with the TOP command */
PRInt32 current_msg_to_top;
/* we will download this many in
POP3_GET_MSG */
PRInt32 number_of_messages_not_seen_before;
/* reached when we have TOPped
all of the new messages */
PRBool found_new_message_boundary;
/* if this is true then we don't stop
at new message boundary, we have to
TOP em all to delete some */
PRBool delete_server_message_during_top_traversal;
PRBool get_url;
PRBool seenFromHeader;
PRInt32 parsed_bytes;
@ -352,8 +327,6 @@ private:
void FreeMsgInfo();
void Abort();
PRBool m_parsingMultiLineMessageId;
PRBool m_tlsEnabled;
PRInt32 m_socketType;
PRBool m_useSecAuth;
@ -402,9 +375,7 @@ private:
PRInt32 GurlResponse();
PRInt32 SendList();
PRInt32 GetList(nsIInputStream* inputStream, PRUint32 length);
PRInt32 SendFakeUidlTop();
PRInt32 StartUseTopForFakeUidl();
PRInt32 GetFakeUidlTop(nsIInputStream* inputStream, PRUint32 length);
PRInt32 HandleNoUidListAvailable();
PRInt32 SendXtndXlstMsgid();
PRInt32 GetXtndXlstMsgid(nsIInputStream* inputStream, PRUint32 length);
PRInt32 SendUidlList();

48
suite/locales/en-US/chrome/mailnews/localMsgs.properties
Просмотреть файл

@ -113,24 +113,6 @@
# the second %ld will receive the total number of messages
4009=Received %ld of %ld messages
# Status - the server doesn't support UIDL...
## @name POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC
## @loc None
# LOCALIZATION NOTE(4010): The following sentence should be translated in this way:
# Do not translate "POP3"
# Do not translate "%S". Place %s in your translation where the name of the server should appear.
# Do not translate "UIDL"
4010=The POP3 server (%S) does not support UIDL, which is needed to implement the ``Leave on Server'' and ``Maximum Message Size'' options. To download your mail, turn off these options in the Mail Server panel of Preferences.
# Status - the server doesn't support the top command
## @name POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND
## @loc None
# LOCALIZATION NOTE(4011): The following sentence should be translated in this way:
# Do not translate "POP3"
# Do not translate "%s". Place %s in your translation where the name of the server should appear.
# Do not translate "TOP"
4011=The POP3 mail server (%s) does not support the TOP command. Without server support for this, we cannot implement the ``Maximum Message Size'' preference. This option has been disabled, and messages will be downloaded regardless of their size.
# Status - retr failure from the server
## @name POP3_RETR_FAILURE
## @loc None
@ -213,11 +195,6 @@
## @loc None
4030=Mail server does not support secure authentication.
# secure authentication failed and unsure why
## @name CANNOT_PROCESS_APOP_AUTH
## @loc None
4031=Mail server does not support secure authentication or you have entered an incorrect password. Please check your password, or turn off secure authentication in the account settings for your mail server.\n
## @name MOVEMAIL_SPOOL_FILE_LOCKED
## @loc None
4032=The mail spool file %S is locked.
@ -246,6 +223,29 @@
## @loc None
4038=There was an error downloading the following message: \nFrom: %S\n Subject: %S\n This message may contain a virus or there is not enough disk space. Skip this message?
# Status - the server doesn't support UIDL...
## @name POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC
## @loc None
# LOCALIZATION NOTE(4010): The following sentence should be translated in this way:
# Do not translate "POP3"
# Do not translate "%S". Place %S in your translation where the name of the server should appear.
# Do not translate "UIDL"
4040=The POP3 mail server (%S) does not support UIDL or XTND XLST, which are required to implement the ``Leave on Server'', ``Maximum Message Size'' or ``Fetch Headers Only'' options. To download your mail, turn off these options in the Server Settings for your mail server in the Account Settings window.
# Status - the server doesn't support the top command
## @name POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND
## @loc None
# LOCALIZATION NOTE(4011): The following sentence should be translated in this way:
# Do not translate "POP3"
# Do not translate "%S". Place %S in your translation where the name of the server should appear.
# Do not translate "TOP"
4041=The POP3 mail server (%S) does not support the TOP command. Without server support for this, we cannot implement the ``Maximum Message Size'' or ``Fetch Headers Only'' preference. This option has been disabled, and messages will be downloaded regardless of their size.
# secure authentication failed and unsure why
## @name CANNOT_PROCESS_APOP_AUTH
## @loc None
4042=The mail server does not support secure authentication or you have entered an incorrect password. Please check your password, or turn off secure authentication in the Server Settings for your mail server in the Account Settings window.\n
## @name NS_ERROR_COULD_NOT_CONNECT_VIA_TLS
## @loc None
4039=Unable to establish TLS connection to POP3 server. The server may be down or may be incorrectly configured. Please verify that your Mail/News account settings are correct and try again.
4043=Unable to establish TLS connection to POP3 server. The server may be down or may be incorrectly configured. Please verify the correct configuration in the Server Settings for your mail server in the Account Settings window and try again.