IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

read and process upstream header in cycle,

Browse Source 
this fixes the case when local FastCGI server sends many warnings in stderr
This commit is contained in:
Igor Sysoev 2008-12-01 14:08:00 +00:00
parent c6016b25cf
commit 15fbaa6612
1 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/http/ngx_http_upstream.c
View File

@ -1114,62 +1114,59 @@ ngx_http_upstream_process_header(ngx_event_t *rev)
#endif #endif
} }
n = c->recv(c, u->buffer.last, u->buffer.end - u->buffer.last); for ( ;; ) {
if (n == NGX_AGAIN) { n = c->recv(c, u->buffer.last, u->buffer.end - u->buffer.last);
if (n == NGX_AGAIN) {
#if 0 #if 0
ngx_add_timer(rev, u->read_timeout); ngx_add_timer(rev, u->read_timeout);
#endif #endif
if (ngx_handle_read_event(rev, 0) == NGX_ERROR) { if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
ngx_http_upstream_finalize_request(r, u, ngx_http_upstream_finalize_request(r, u,
NGX_HTTP_INTERNAL_SERVER_ERROR); NGX_HTTP_INTERNAL_SERVER_ERROR);
return;
}
return; return;
} }
return; if (n == 0) {
}
if (n == 0) {
ngx_log_error(NGX_LOG_ERR, rev->log, 0,
"upstream prematurely closed connection");
}
if (n == NGX_ERROR || n == 0) {
ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
return;
}
u->buffer.last += n;
#if 0
u->valid_header_in = 0;
u->peer.cached = 0;
#endif
rc = u->process_header(r);
if (rc == NGX_AGAIN) {
#if 0
ngx_add_timer(rev, u->read_timeout);
#endif
if (u->buffer.pos == u->buffer.end) {
ngx_log_error(NGX_LOG_ERR, rev->log, 0, ngx_log_error(NGX_LOG_ERR, rev->log, 0,
"upstream sent too big header"); "upstream prematurely closed connection");
}
ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_INVALID_HEADER); if (n == NGX_ERROR || n == 0) {
ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
return; return;
} }
if (ngx_handle_read_event(rev, 0) == NGX_ERROR) { u->buffer.last += n;
ngx_http_upstream_finalize_request(r, u,
NGX_HTTP_INTERNAL_SERVER_ERROR); #if 0
return; u->valid_header_in = 0;
u->peer.cached = 0;
#endif
rc = u->process_header(r);
if (rc == NGX_AGAIN) {
if (u->buffer.pos == u->buffer.end) {
ngx_log_error(NGX_LOG_ERR, rev->log, 0,
"upstream sent too big header");
ngx_http_upstream_next(r, u,
NGX_HTTP_UPSTREAM_FT_INVALID_HEADER);
return;
}
continue;
} }
return; break;
} }
if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) { if (rc == NGX_HTTP_UPSTREAM_INVALID_HEADER) {