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

- yWeb: try to fix empty pages

Browse Source
This commit is contained in:
svenhoefer
2014-08-30 14:05:18 +02:00
parent 5ec1873982
commit 270e915954
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nhttpd/yhttpd_core/yconnection.cpp
View File

@@ -96,8 +96,10 @@ void CWebserverConnection::HandleConnection() {
if(string_tolower(Request.HeaderList["Connection"]) == "close" if(string_tolower(Request.HeaderList["Connection"]) == "close"
|| (httprotocol != "HTTP/1.1" && string_tolower(Request.HeaderList["Connection"]) != "keep-alive") || (httprotocol != "HTTP/1.1" && string_tolower(Request.HeaderList["Connection"]) != "keep-alive")
|| !Webserver->CheckKeepAliveAllowedByIP(sock->get_client_ip())) || !Webserver->CheckKeepAliveAllowedByIP(sock->get_client_ip()))
#endif
keep_alive = false; keep_alive = false;
#else
keep_alive = false;
#endif
// Send a response // Send a response
Response.SendResponse(); Response.SendResponse();

4
src/nhttpd/yhttpd_core/ywebserver.cpp
View File

@@ -27,6 +27,7 @@
#include "ysocket.h" #include "ysocket.h"
#include "yconnection.h" #include "yconnection.h"
#include "yrequest.h" #include "yrequest.h"
#include <system/set_threadname.h>
//============================================================================= //=============================================================================
// Initialization of static variables // Initialization of static variables
@@ -117,6 +118,7 @@ CWebserver::~CWebserver() {
#define MAX_TIMEOUTS_TO_CLOSE 10 #define MAX_TIMEOUTS_TO_CLOSE 10
#define MAX_TIMEOUTS_TO_TEST 100 #define MAX_TIMEOUTS_TO_TEST 100
bool CWebserver::run(void) { bool CWebserver::run(void) {
set_threadname(__func__);
if (!listenSocket.listen(port, HTTPD_MAX_CONNECTIONS)) { if (!listenSocket.listen(port, HTTPD_MAX_CONNECTIONS)) {
if (port != 80) { if (port != 80) {
fprintf(stderr, "[yhttpd] Socket cannot bind and listen on port %d Abort.\n", port); fprintf(stderr, "[yhttpd] Socket cannot bind and listen on port %d Abort.\n", port);
@@ -226,6 +228,8 @@ bool CWebserver::run(void) {
CySocket *newConnectionSock; CySocket *newConnectionSock;
if (!(newConnectionSock = listenSocket.accept())) //Now: Blocking wait if (!(newConnectionSock = listenSocket.accept())) //Now: Blocking wait
{ {
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_testcancel();
dperror("Socket accept error. Continue.\n"); dperror("Socket accept error. Continue.\n");
continue; continue;
} }