diff options
| author |  snowdrop | 2004-09-14 15:50:54 +0000 |
|---|---|---|
| committer | snowdrop | 2004-09-14 15:50:54 +0000 |
| commit | 17394823330613b0f9fac02743220a04570724c2 (patch) | |
| tree | 59d8c3d2b5ba71c4b3c1aa6956e210d544da91e3 | |
| parent | 34e3bcee0cf566ad819033300c9f786ebac3f227 (diff) | |
| download | csoap-17394823330613b0f9fac02743220a04570724c2.tar.gz csoap-17394823330613b0f9fac02743220a04570724c2.tar.bz2 | |
develop (not stable version of file)
| -rw-r--r-- | nanohttp/nanohttp-server.c | 16 | ||||
| -rw-r--r-- | nanohttp/nanohttp-socket.c | 3 |
2 files changed, 9 insertions, 10 deletions
diff --git a/nanohttp/nanohttp-server.c b/nanohttp/nanohttp-server.c index 8d86b86..3136652 100644 --- a/nanohttp/nanohttp-server.c +++ b/nanohttp/nanohttp-server.c @@ -1,5 +1,5 @@ /****************************************************************** -* $Id: nanohttp-server.c,v 1.22 2004/09/14 15:31:24 snowdrop Exp $ +* $Id: nanohttp-server.c,v 1.23 2004/09/14 15:50:54 snowdrop Exp $ * * CSOAP Project: A http client/server library in C * Copyright (C) 2003 Ferhat Ayaz @@ -523,9 +523,6 @@ int _httpd_select(fd_set *pfds) timeout.tv_sec = 1; timeout.tv_usec = 0; - FD_ZERO (pfds); - FD_SET (_httpd_socket, pfds); - #ifndef WIN32 select (1, pfds, NULL, NULL, &timeout); #else @@ -574,6 +571,9 @@ httpd_run () return err; } + /* zero file descriptior */ + FD_ZERO (&fds); + FD_SET (_httpd_socket, &fds); while (_httpd_run) { @@ -585,15 +585,15 @@ httpd_run () if (_httpd_select(&fds)) { log_error1("Can not select!"); - return -1; /* this is hard core! */ + return -1; } - + /* Wait for a socket to accept */ - while (_httpd_run && (FD_ISSET (_httpd_socket, &fds))); + while (_httpd_run && (!FD_ISSET (_httpd_socket, &fds))); if (!_httpd_run) break; - + /* Accept a socket */ err = hsocket_accept(_httpd_socket, &(conn->sock)); if (err != HSOCKET_OK) diff --git a/nanohttp/nanohttp-socket.c b/nanohttp/nanohttp-socket.c index 1770a21..c1699e8 100644 --- a/nanohttp/nanohttp-socket.c +++ b/nanohttp/nanohttp-socket.c @@ -1,5 +1,5 @@ /******************************************************************
-* $Id: nanohttp-socket.c,v 1.20 2004/09/14 15:31:24 snowdrop Exp $
+* $Id: nanohttp-socket.c,v 1.21 2004/09/14 15:50:54 snowdrop Exp $
*
* CSOAP Project: A http client/server library in C
* Copyright (C) 2003 Ferhat Ayaz
@@ -203,7 +203,6 @@ int hsocket_accept(hsocket_t sock, hsocket_t *dest) #ifdef WIN32
while(1)
{
- log_debug1("accept()");
sockfd = accept(sock, (struct sockaddr *)&addr, &asize);
if (sockfd == INVALID_SOCKET)
{
|