mirror of
https://github.com/nginx/nginx.git
synced 2025-01-05 23:07:49 +08:00
1b73583ba2
*) Bugfix: on Solaris and Linux there may be too many "recvmsg() returned not enough data" alerts. *) Bugfix: there were the "writev() failed (22: Invalid argument)" errors on Solaris in proxy mode without sendfile. On other platforms that do not support sendfile at all the process got caught in an endless loop. *) Bugfix: segmentation fault on Solaris in proxy mode and using sendfile. *) Bugfix: segmentation fault on Solaris. *) Bugfix: on-line upgrade did not work on Linux. *) Bugfix: the ngx_http_autoindex_module module did not escape the spaces, the quotes, and the percent signs in the directory listing. *) Change: the decrease of the copy operations. *) Feature: the userid_p3p directive.
161 lines
3.8 KiB
C
161 lines
3.8 KiB
C
|
|
/*
|
|
* Copyright (C) Igor Sysoev
|
|
*/
|
|
|
|
|
|
#include <ngx_config.h>
|
|
#include <ngx_core.h>
|
|
#include <ngx_event.h>
|
|
|
|
|
|
ssize_t ngx_wsarecv(ngx_connection_t *c, u_char *buf, size_t size)
|
|
{
|
|
int rc;
|
|
u_long bytes, flags;
|
|
WSABUF wsabuf[1];
|
|
ngx_err_t err;
|
|
ngx_event_t *rev;
|
|
|
|
wsabuf[0].buf = (char *) buf;
|
|
wsabuf[0].len = size;
|
|
flags = 0;
|
|
bytes = 0;
|
|
|
|
rc = WSARecv(c->fd, wsabuf, 1, &bytes, &flags, NULL, NULL);
|
|
|
|
ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
|
|
"WSARecv: fd:%d rc:%d %ul of %z", c->fd, rc, bytes, size);
|
|
|
|
rev = c->read;
|
|
|
|
if (rc == -1) {
|
|
rev->ready = 0;
|
|
err = ngx_socket_errno;
|
|
|
|
if (err == WSAEWOULDBLOCK) {
|
|
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
|
|
"WSARecv() not ready");
|
|
return NGX_AGAIN;
|
|
}
|
|
|
|
rev->error = 1;
|
|
ngx_connection_error(c, err, "WSARecv() failed");
|
|
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
if (bytes < size) {
|
|
rev->ready = 0;
|
|
}
|
|
|
|
if (bytes == 0) {
|
|
rev->eof = 1;
|
|
}
|
|
|
|
return bytes;
|
|
}
|
|
|
|
|
|
ssize_t ngx_overlapped_wsarecv(ngx_connection_t *c, u_char *buf, size_t size)
|
|
{
|
|
int rc;
|
|
u_long bytes, flags;
|
|
WSABUF wsabuf[1];
|
|
ngx_err_t err;
|
|
ngx_event_t *rev;
|
|
LPWSAOVERLAPPED ovlp;
|
|
|
|
rev = c->read;
|
|
|
|
if (!rev->ready) {
|
|
ngx_log_error(NGX_LOG_ALERT, c->log, 0, "second wsa post");
|
|
return NGX_AGAIN;
|
|
}
|
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
|
|
"rev->complete: %d", rev->complete);
|
|
|
|
if (rev->complete) {
|
|
rev->complete = 0;
|
|
|
|
if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
|
|
if (rev->ovlp.error) {
|
|
ngx_connection_error(c, rev->ovlp.error, "WSARecv() failed");
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
|
|
"WSARecv ovlp: fd:%d %ul of %z",
|
|
c->fd, rev->available, size);
|
|
|
|
return rev->available;
|
|
}
|
|
|
|
if (WSAGetOverlappedResult(c->fd, (LPWSAOVERLAPPED) &rev->ovlp,
|
|
&bytes, 0, NULL) == 0) {
|
|
ngx_connection_error(c, ngx_socket_errno,
|
|
"WSARecv() or WSAGetOverlappedResult() failed");
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
|
|
"WSARecv: fd:%d %ul of %z", c->fd, bytes, size);
|
|
|
|
return bytes;
|
|
}
|
|
|
|
ovlp = (LPWSAOVERLAPPED) &rev->ovlp;
|
|
ngx_memzero(ovlp, sizeof(WSAOVERLAPPED));
|
|
wsabuf[0].buf = (char *) buf;
|
|
wsabuf[0].len = size;
|
|
flags = 0;
|
|
bytes = 0;
|
|
|
|
rc = WSARecv(c->fd, wsabuf, 1, &bytes, &flags, ovlp, NULL);
|
|
|
|
rev->complete = 0;
|
|
|
|
ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
|
|
"WSARecv ovlp: fd:%d rc:%d %ul of %z",
|
|
c->fd, rc, bytes, size);
|
|
|
|
if (rc == -1) {
|
|
err = ngx_socket_errno;
|
|
if (err == WSA_IO_PENDING) {
|
|
rev->active = 1;
|
|
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
|
|
"WSARecv() posted");
|
|
return NGX_AGAIN;
|
|
}
|
|
|
|
rev->error = 1;
|
|
ngx_connection_error(c, err, "WSARecv() failed");
|
|
return NGX_ERROR;
|
|
}
|
|
|
|
if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
|
|
|
|
/*
|
|
* if a socket was bound with I/O completion port
|
|
* then GetQueuedCompletionStatus() would anyway return its status
|
|
* despite that WSARecv() was already complete
|
|
*/
|
|
|
|
rev->active = 1;
|
|
return NGX_AGAIN;
|
|
}
|
|
|
|
if (bytes == 0) {
|
|
rev->eof = 1;
|
|
rev->ready = 0;
|
|
|
|
} else {
|
|
rev->ready = 1;
|
|
}
|
|
|
|
rev->active = 0;
|
|
|
|
return bytes;
|
|
}
|