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

WebModules: Make PAGE_DONE imply Close()

Browse Source 
When one now finishes a web request with PAGE_DONE, the code actively calls
Close(CLT_AFTERWRITE) which one previously had to call explicitly. This means
there is finally a difference between PAGE_DONE and PAGE_DEFERRED. ;)


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1981 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-05-13 15:54:06 +00:00
parent 3dbb918164
commit 0c0c51172e
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
WebModules.cpp
View File

@@ -513,7 +513,9 @@ void CWebSock::OnPageRequest(const CString& sURI) {
// Something else will later call Close()
break;
case PAGE_DONE:
// Redirect or something like that, it's done, Close() has been called
// Redirect or something like that, it's done, just make sure
// the connection will be closed
Close(CLT_AFTERWRITE);
break;
default:
PrintNotFound();
@@ -656,6 +658,11 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS
/* if a module returns false from OnWebRequest, it does not
want the template to be printed, usually because it did a redirect. */
if (pModule->OnWebRequest(*this, m_sPage, m_Template)) {
// If they already sent a reply, let's assume
// they did what they wanted to do.
if (SentHeader()) {
return PAGE_DONE;
}
return PrintTemplate(m_sPage, sPageRet, pModule);
}
@@ -663,7 +670,6 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS
sPageRet = GetErrorPage(404, "Not Implemented", "The requested module does not acknowledge web requests");
return PAGE_PRINT;
} else {
Close(CLT_AFTERWRITE); // make sure the connection is going to be closed
return PAGE_DONE;
}
}