mirror of https://github.com/nginx/nginx
Merge c93981e2e9 into c70457482c
This commit is contained in:
commit
0da61a9acf
|
|
@ -274,6 +274,11 @@ eintr:
|
||||||
"sendfile() was interrupted");
|
"sendfile() was interrupted");
|
||||||
goto eintr;
|
goto eintr;
|
||||||
|
|
||||||
|
case EIO: /*Unspecified error while reading from in_fd.*/
|
||||||
|
ngx_log_error(NGX_LOG_ERR, c->log, EIO,
|
||||||
|
"sendfile() reading %s", file->file->name.data);
|
||||||
|
return NGX_ERROR;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
c->write->error = 1;
|
c->write->error = 1;
|
||||||
ngx_connection_error(c, err, "sendfile() failed");
|
ngx_connection_error(c, err, "sendfile() failed");
|
||||||
|
|
@ -358,6 +363,11 @@ ngx_linux_sendfile_thread(ngx_connection_t *c, ngx_buf_t *file, size_t size)
|
||||||
return NGX_AGAIN;
|
return NGX_AGAIN;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ctx->err == EIO) { /*Unspecified error while reading from in_fd.*/
|
||||||
|
ngx_log_error(NGX_LOG_ERR, c->log, EIO,
|
||||||
|
"sendfile() reading %s", file->file->name.data);
|
||||||
|
return NGX_ERROR;
|
||||||
|
|
||||||
if (ctx->err) {
|
if (ctx->err) {
|
||||||
wev->error = 1;
|
wev->error = 1;
|
||||||
ngx_connection_error(c, ctx->err, "sendfile() failed");
|
ngx_connection_error(c, ctx->err, "sendfile() failed");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue