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

yWeb 2.8.a.3 Alpha-Version

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@406 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
yjogol
2010-02-24 16:16:10 +00:00
parent 24c8d684c9
commit 32c7517141
191 changed files with 8063 additions and 4185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,6 @@
// c++
#include <cerrno>
#include <csignal>
#include <cstdio>
// system
#include <arpa/inet.h>
@@ -49,8 +48,10 @@ CWebserver::CWebserver()
FD_ZERO(&read_fds);
fdmax = 0;
open_connections = 0;
//pthread_attr_init(&attr);
//pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
#ifdef Y_CONFIG_BUILD_AS_DAEMON
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
#endif
port=80;
@@ -128,7 +129,7 @@ bool CWebserver::run(void)
// initialize values for select
int listener = listenSocket.get_socket();// Open Listener
struct timeval tv; // timeout struct
struct timeval tv; // timeout struct
FD_SET(listener, &master); // add the listener to the master set
fdmax = listener; // init max fd
fcntl(listener, F_SETFD , O_NONBLOCK); // listener master socket non-blocking
@@ -157,8 +158,8 @@ bool CWebserver::run(void)
// Socket Error?
if(fd == -1 && errno != EINTR)
{
perror("select");
return false;
perror("select");
return false;
}
// Socket Timeout?
@@ -419,11 +420,14 @@ bool CWebserver::handle_connection(CySocket *newSock)
newConn->ySock = newSock;
newConn->ySock->handling = true;
newConn->WebserverBackref = this;
//newConn->is_treaded = is_threading;
#ifdef Y_CONFIG_BUILD_AS_DAEMON
newConn->is_treaded = is_threading;
#else
newConn->is_treaded = false;
#endif
int index = -1;
if(0) /*if(is_threading) FIXME not work */
#ifdef Y_CONFIG_BUILD_AS_DAEMON
if(is_threading)
{
pthread_mutex_lock( &mutex );
// look for free Thread slot
@@ -449,6 +453,7 @@ bool CWebserver::handle_connection(CySocket *newSock)
dperror("Could not create Connection-Thread\n");
}
else // non threaded
#endif
WebThread((void *)newConn);
return ((index != -1) || !is_threading);
}