diff options
| author |  rans | 2004-09-13 15:33:32 +0000 |
|---|---|---|
| committer | rans | 2004-09-13 15:33:32 +0000 |
| commit | 36ef5aa4d4ea143c9e1fe1e0052d2c37574d7a8f (patch) | |
| tree | 253288b60603ccb481a6f53e9293037d5b5fec73 /nanohttp/nanohttp-socket.c | |
| parent | 3a88be29ecb1a2a67e85d8b8d8649865901b9b86 (diff) | |
| download | csoap-36ef5aa4d4ea143c9e1fe1e0052d2c37574d7a8f.tar.gz csoap-36ef5aa4d4ea143c9e1fe1e0052d2c37574d7a8f.tar.bz2 | |
Made SIGTERM stuff work properly on both UNIX and Windows
Diffstat (limited to 'nanohttp/nanohttp-socket.c')
| -rw-r--r-- | nanohttp/nanohttp-socket.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/nanohttp/nanohttp-socket.c b/nanohttp/nanohttp-socket.c index 182c91a..79a9568 100644 --- a/nanohttp/nanohttp-socket.c +++ b/nanohttp/nanohttp-socket.c @@ -1,5 +1,5 @@ /****************************************************************** -* $Id: nanohttp-socket.c,v 1.16 2004/09/13 06:39:53 snowdrop Exp $ +* $Id: nanohttp-socket.c,v 1.17 2004/09/13 15:33:32 rans Exp $ * * CSOAP Project: A http client/server library in C * Copyright (C) 2003 Ferhat Ayaz @@ -191,11 +191,11 @@ hsocket_bind (hsocket_t * dsock, int port) #ifdef WIN32 int hsocket_accept (hsocket_t sock, unsigned (__stdcall * func) (void *), - conndata_t * conns, int max_conn) + conndata_t * conns, int max_conn, int *termsig) #else int hsocket_accept (hsocket_t sock, void (*func) (void *), conndata_t * conns, - int max_conn) + int max_conn, int *termsig) #endif { int i; @@ -227,6 +227,8 @@ hsocket_accept (hsocket_t sock, void (*func) (void *), conndata_t * conns, if (conns[i].sock == -1) { conns[i].sock = 0; + if(*termsig==0) + return 0; continue; } #else @@ -242,6 +244,8 @@ hsocket_accept (hsocket_t sock, void (*func) (void *), conndata_t * conns, else { conns[i].sock = 0; + if(*termsig==0) + return 0; Sleep(10); continue; } @@ -320,12 +324,7 @@ FUNCTION: hsocket_send int hsocket_send (hsocket_t sock, const char *buffer) { - int size; - size = send ((int) sock, buffer, strlen (buffer), 0); - if (size == -1) - return HSOCKET_CAN_NOT_SEND; - - return HSOCKET_OK; + return hsocket_nsend(sock, buffer, strlen(buffer)); } |