fixing close_socket

git-svn-id: file:///raid/svn-personal/tewi/trunk@46 8739d7e6-ffea-ec47-b151-bdff447c6205

diff --git a/Server/http.c b/Server/http.c
index fdfa00e54eac0783381bbbf070e6a78d7d57fa99..c937fcf177e955243159abc640f3654f1c5cf92f 100644 (file)
--- a/Server/http.c
+++ b/Server/http.c
@@ -66,6 +66,7 @@ int tw_http_parse(SSL* ssl, int sock, struct tw_http_request* req) {
 #endif
                        int n = select(FD_SETSIZE, &fds, NULL, NULL, &tv);
                        if(n <= 0) {
+                               cm_log("HTTP", "Timeout, disconncting");
                                free(header);
                                tw_free_request(req);
                                return -1;

diff --git a/Server/server.c b/Server/server.c
index 5f83de53be80699407c3cc8f614d8b3990d576a1..9140faf3ebcc487bf896e612e51a86b05ce6db90 100644 (file)
--- a/Server/server.c
+++ b/Server/server.c
@@ -687,8 +687,8 @@ cleanup:
                SSL_shutdown(s);
        }
        SSL_free(s);
-       close_socket(sock);
 #endif
+       close_socket(sock);
 #ifdef __MINGW32__
        _endthreadex(0);
 #endif

diff --git a/config.h b/config.h
index 7d9d77097be53184ae63574161d44aacebea675f..34ea876f192b259a8197750572b81da22b5af539 100644 (file)
--- a/config.h
+++ b/config.h
@@ -3,7 +3,7 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
-#undef NO_SSL
+#define NO_SSL
 
 /* DO NOT EDIT BELOW THIS LINE */