iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-03 12:02:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.6.x'

Browse Source
This commit is contained in:
Alexey Sokolov
2015-04-16 20:32:58 +01:00
parent 0b205db494 7c64eba693
commit 7719213ea6
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/HTTPSock.cpp
View File

@@ -182,24 +182,21 @@ void CHTTPSock::ReadLine(const CString& sData) {
sLine.Token(1, true).Split(",", ssEncodings, false, "", "", false, true);
m_bAcceptGzip = (ssEncodings.find("gzip") != ssEncodings.end());
} else if (sLine.empty()) {
m_bGotHeader = true;
if (!m_sUser.empty()) {
if (!m_sUser.empty() && !m_bLoggedIn) {
m_bLoggedIn = OnLogin(m_sUser, m_sPass, true);
if (!m_bLoggedIn) {
// Error message already was sent
return;
}
}
if (m_bPost) {
m_sPostData = GetInternalReadBuffer();
CheckPost();
// After successful login ReadLine("") will be called again to trigger "else" block
} else {
GetPage();
}
m_bGotHeader = true;
DisableReadLine();
if (m_bPost) {
m_sPostData = GetInternalReadBuffer();
CheckPost();
} else {
GetPage();
}
DisableReadLine();
}
}
}