зеркало из https://github.com/mozilla/pjs.git
fix it so we won't try to send "ARTICLE <" to the nntp server. on quit, we sometimes get into a state where we try to send that to the server. if I detect that state, I return error but I don't send the bogus data over the wire. sr=bienvenu
related to bugs #57659 and #72317
This commit is contained in:
Родитель
a79faf2edf
Коммит
aecef38022
|
@ -2036,6 +2036,9 @@ PRInt32 nsNNTPProtocol::SendFirstNNTPCommand(nsIURI * url)
|
||||||
}
|
}
|
||||||
else /* article or cancel */
|
else /* article or cancel */
|
||||||
{
|
{
|
||||||
|
NS_ASSERTION(m_path, "no m_path, see bugs #57659 and #72317");
|
||||||
|
if (!m_path) return -1;
|
||||||
|
|
||||||
if (m_typeWanted == CANCEL_WANTED) {
|
if (m_typeWanted == CANCEL_WANTED) {
|
||||||
NET_SACopy(&command, "HEAD ");
|
NET_SACopy(&command, "HEAD ");
|
||||||
}
|
}
|
||||||
|
@ -2043,10 +2046,10 @@ PRInt32 nsNNTPProtocol::SendFirstNNTPCommand(nsIURI * url)
|
||||||
NS_ASSERTION(m_typeWanted == ARTICLE_WANTED, "not cancel, and not article");
|
NS_ASSERTION(m_typeWanted == ARTICLE_WANTED, "not cancel, and not article");
|
||||||
NET_SACopy(&command, "ARTICLE ");
|
NET_SACopy(&command, "ARTICLE ");
|
||||||
}
|
}
|
||||||
if (m_path && *m_path != '<')
|
|
||||||
|
if (*m_path != '<')
|
||||||
NET_SACat(&command,"<");
|
NET_SACat(&command,"<");
|
||||||
|
|
||||||
NS_ASSERTION(m_path, "no path");
|
|
||||||
NET_SACat(&command, m_path);
|
NET_SACat(&command, m_path);
|
||||||
|
|
||||||
if (PL_strchr(command+8, '>')==0)
|
if (PL_strchr(command+8, '>')==0)
|
||||||
|
@ -2064,7 +2067,6 @@ PRInt32 nsNNTPProtocol::SendFirstNNTPCommand(nsIURI * url)
|
||||||
m_nextStateAfterResponse = SEND_FIRST_NNTP_COMMAND_RESPONSE;
|
m_nextStateAfterResponse = SEND_FIRST_NNTP_COMMAND_RESPONSE;
|
||||||
SetFlag(NNTP_PAUSE_FOR_READ);
|
SetFlag(NNTP_PAUSE_FOR_READ);
|
||||||
return(status);
|
return(status);
|
||||||
|
|
||||||
} /* sent first command */
|
} /* sent first command */
|
||||||
|
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче