mirror/ULib
1
0
Fork 0
mirror of https://github.com/stefanocasazza/ULib.git synced 2025-10-05 19:18:01 +08:00
Code Issues Releases Wiki Activity

fix

Browse Source
This commit is contained in:
stefanocasazza 2017-07-26 11:39:07 +02:00
parent b6ee1e71fd
commit 01e5f2822f
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ulib/net/server/client_image.cpp
View File

@ -1972,7 +1972,9 @@ write:
if (U_ClientImage_parallelization == U_PARALLELIZATION_CHILD)
{
wait: if (UNotifier::waitForWrite(socket->iSockDesc, U_TIMEOUT_MS) == 1) goto write;
wait: if (socket->isOpen() == false) goto end;
if (UNotifier::waitForWrite(socket->iSockDesc, U_TIMEOUT_MS) == 1) goto write;
U_RETURN(U_NOTIFIER_DELETE);
}
@ -1986,6 +1988,7 @@ wait: if (UNotifier::waitForWrite(socket->iSockDesc, U_TIMEOUT_MS) == 1) goto
U_RETURN(U_NOTIFIER_OK);
}
end:
U_SRV_LOG("sendfile failed - sock_fd %d sfd %d count %u U_ClientImage_pclose(this) %d %B", socket->iSockDesc, sfd, count, U_ClientImage_pclose(this), U_ClientImage_pclose(this));
if ((U_ClientImage_pclose(this) & U_CLOSE) != 0) UFile::close(sfd);

4
src/ulib/net/server/server.cpp
View File

@ -2038,10 +2038,10 @@ void UServer_Base::loadConfigParam()
#ifdef U_EVASIVE_SUPPORT
/**
* This is the threshold for the number of requests for the same page (or URI) per page interval.
* Once the threshold for that interval has been exceeded (defaults to 3), the IP address of the client will be added to the blocking list
* Once the threshold for that interval has been exceeded (defaults to 2), the IP address of the client will be added to the blocking list
*/
page_count = cfg->readLong(U_CONSTANT_TO_PARAM("DOS_PAGE_COUNT"), 3);
page_count = cfg->readLong(U_CONSTANT_TO_PARAM("DOS_PAGE_COUNT"), 2);
/**
* The interval for the page count threshold; defaults to 1 second intervals

2
src/ulib/utility/uhttp.cpp
View File

@ -3973,6 +3973,8 @@ int UHTTP::handlerREAD()
if (UClientImage_Base::bsendGzipBomp)
{
UClientImage_Base::bsendGzipBomp = false;
U_DEBUG("we strike back sending gzip bomb...", 0);
U_SRV_LOG("we strike back sending gzip bomb...", 0);

2
tests/ulib/test_ssl_server.cpp
View File

@ -49,7 +49,9 @@ protected:
{
x509 = ((USSLSocket*)socket)->getPeerCertificate();
# if OPENSSL_VERSION_NUMBER < 0x10100000L
U_INTERNAL_ASSERT_DIFFERS(x509, 0)
# endif
}
if (x509) cerr << UCertificate(x509).print();