mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

turn some comparsions for a better readability

Browse Source 
Origin commit data
------------------
Commit: bee4cb4959
Author: vanhofen <vanhofen@gmx.de>
Date: 2024-03-25 (Mon, 25 Mar 2024)

Origin message was:
------------------
- turn some comparsions for a better readability

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2024-03-25 20:29:55 +01:00
committed by Thilo Graf
parent f7f1f4d6e6
commit 14240c3c4a
15 changed files with 89 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nhttpd/yhttpd_core/ysocket.cpp
View File

@@ -90,7 +90,7 @@ bool CySocket::initAsSSL(void)
return false;
}
SSL_set_accept_state(ssl); // accept connection
if(1 != (SSL_set_fd(ssl, sock))) // associate socket descriptor
if((SSL_set_fd(ssl, sock)) != 1) // associate socket descriptor
if (NULL == (ssl = SSL_new(CySocket::SSL_ctx)))
{
aprintf("ySocket:SSL Error: Create SSL_new : %s\n", ERR_error_string(ERR_get_error(), NULL) );
@@ -106,7 +106,7 @@ bool CySocket::initSSL(void)
{
SSL_load_error_strings(); // Load SSL Error Strings
SSL_library_init(); // Load SSL Library
if (0 == RAND_status()) // set Random
if (RAND_status() == 0) // set Random
{
aprintf("ySocket:SSL got no rand\n");
return false;
@@ -122,7 +122,7 @@ bool CySocket::initSSL(void)
return false;
}
if(!SSL_CA_file.empty()) // have a CA?
if(1 != SSL_CTX_load_verify_locations(SSL_ctx, SSL_CA_file.c_str(), NULL))
if(SSL_CTX_load_verify_locations(SSL_ctx, SSL_CA_file.c_str(), NULL) != 1)
{
aprintf("ySocket:SSL Error: %s CA-File:%s\n",ERR_error_string(ERR_get_error(), NULL), SSL_CA_file.c_str());
return false;

4
src/nhttpd/yhttpd_mods/mod_sendfile.cpp
View File

@@ -119,8 +119,8 @@ THandleStatus CmodSendfile::Hook_PrepareResponse(CyhookHandler *hh) {
hh->RangeEnd = hh->ContentLength - 1;
const char *range = (hh->HeaderList["Range"].empty()) ? NULL : hh->HeaderList["Range"].c_str();
if ((range &&
(2 != sscanf(range, "bytes=%" PRId64 "-%" PRId64, &hh->RangeStart, &hh->RangeEnd)) &&
(1 != sscanf(range, "bytes=%" PRId64 "-", &hh->RangeStart)))
(sscanf(range, "bytes=%" PRId64 "-%" PRId64, &hh->RangeStart, &hh->RangeEnd) != 2) &&
(sscanf(range, "bytes=%" PRId64 "-", &hh->RangeStart) != 1))
|| (hh->RangeStart > hh->RangeEnd)
|| (hh->RangeEnd > hh->ContentLength - 1)) {
hh->SetError(HTTP_REQUEST_RANGE_NOT_SATISFIABLE);