nginx-0.0.1-2002-12-15-09:25:09 import

1 files changed, 26 insertions, 16 deletions

diff --git a/src/os/win32/ngx_sendv.c b/src/os/win32/ngx_sendv.c
index 7bf590eb7..452df9f15 100644
--- a/src/os/win32/ngx_sendv.c
+++ b/src/os/win32/ngx_sendv.c
@@ -6,29 +6,39 @@
 #include <ngx_log.h>
 #include <ngx_sendv.h>
 
+#include <ngx_string.h>
+
 ssize_t ngx_sendv(ngx_connection_t *c, ngx_iovec_t *iovec, int n)
 {
-     int        rc;
-     size_t     sent;
-     ngx_err_t  err;
+    int         rc;
+    size_t      sent;
+    ngx_err_t   err;
+
+#if 0
+    /* STUB: WSABUF must be 4-byte aligned. Undocumented WSAEINVAL error */
+    ngx_iovec_t iov[10];
+    ngx_memcpy(iov, iovec, n * sizeof(ngx_iovec_t));
+#endif
+
+    sent = 0;
 
-     ngx_log_debug(c->log, "WSASend() start");
+    ngx_log_debug(c->log, "WSASend: %d, %d, %08x" _ c->fd _ n _ iovec);
 
-     rc = WSASend(c->fd, iovec, n, &sent, 0, NULL, NULL);
+    rc = WSASend(c->fd, iovec, n, &sent, 0, NULL, NULL);
 
-     ngx_log_debug(c->log, "WSASend() done");
+    ngx_log_debug(c->log, "WSASend() done");
 
-     if (rc == -1) {
-         err = ngx_socket_errno;
+    if (rc == SOCKET_ERROR) {
+        err = ngx_socket_errno;
 
-         if (err == NGX_EAGAIN) {
-             ngx_log_error(NGX_LOG_INFO, c->log, err, "WSASend() eagain");
-             return NGX_AGAIN;
-         }
+        if (err == NGX_EAGAIN) {
+            ngx_log_error(NGX_LOG_INFO, c->log, err, "WSASend() eagain");
+            return NGX_AGAIN;
+        }
 
-         ngx_log_error(NGX_LOG_ERR, c->log, err, "WSASend() failed");
-         return NGX_ERROR;
-     }
+        ngx_log_error(NGX_LOG_ERR, c->log, err, "WSASend() failed");
+        return NGX_ERROR;
+    }
 
-     return sent;
+    return sent;
 }