mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

yhttpd: try to fix shutdown problems, probably directfb related

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a42b1ca512
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-02-28 (Sun, 28 Feb 2010)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2010-02-28 19:54:00 +01:00
parent 96db3ade8c
commit 1175105586
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nhttpd/yhttpd.cpp
View File

@@ -107,6 +107,7 @@ void yhttpd_reload_config() {
#ifndef Y_CONFIG_BUILD_AS_DAEMON
void * nhttpd_main_thread(void *) {
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, 0);
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
aprintf("Webserver %s tid %ld\n", WEBSERVERNAME, syscall(__NR_gettid));
yhttpd = new Cyhttpd();
//CLogging::getInstance()->setDebug(true);

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

@@ -218,6 +218,8 @@ bool CWebserver::run(void) {
CySocket *newConnectionSock;
if (!(newConnectionSock = listenSocket.accept())) //Now: Blocking wait
{
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_testcancel();
dperror("Socket accept error. Continue.\n");
continue;
}