]> git.sesse.net Git - vlc/commitdiff
* modules/misc/httpd.c: win32 fix for non-blocking sockets.
authorGildas Bazin <gbazin@videolan.org>
Sun, 27 Apr 2003 14:11:26 +0000 (14:11 +0000)
committerGildas Bazin <gbazin@videolan.org>
Sun, 27 Apr 2003 14:11:26 +0000 (14:11 +0000)
modules/misc/httpd.c

index 7d295e7e353cab36ab8069e21361a3d939ecd1bf..76a8472b1dd27bb52952338df438576342013fa2 100644 (file)
@@ -2,7 +2,7 @@
  * httpd.c
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: httpd.c,v 1.12 2003/04/27 03:08:36 fenrir Exp $
+ * $Id: httpd.c,v 1.13 2003/04/27 14:11:26 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -1801,7 +1801,12 @@ static void httpd_Thread( httpd_sys_t *p_httpt )
                               p_con->p_buffer + p_con->i_buffer,
                               p_con->i_buffer_size - p_con->i_buffer, 0 );
 
-                if( ( i_len < 0 && errno != EAGAIN && errno != EINTR )||
+
+#if defined( WIN32 ) || defined( UNDER_CE )
+                if( ( i_len < 0 && WSAGetLastError() == !WSAEWOULDBLOCK ) ||
+#else
+                if( ( i_len < 0 && errno != EAGAIN && errno != EINTR ) ||
+#endif
                     ( i_len == 0 ) )
                 {
                     httpd_connection_t *p_next = p_con->p_next;