nginx-0.0.1-2003-04-23-18:34:42 import

This commit is contained in:
Igor Sysoev 2003-04-23 14:34:42 +00:00
parent 8dcd23e837
commit fb970519d4

View File

@ -371,8 +371,7 @@ static int ngx_http_proxy_process_upstream(ngx_http_proxy_ctx_t *p,
return NGX_DONE; return NGX_DONE;
} }
if (p->tries /* STUB !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ if (p->tries > 1
&& (rc == NGX_HTTP_BAD_GATEWAY && (rc == NGX_HTTP_BAD_GATEWAY
|| rc == NGX_HTTP_GATEWAY_TIME_OUT || rc == NGX_HTTP_GATEWAY_TIME_OUT
|| (rc == NGX_OK || (rc == NGX_OK
@ -1083,7 +1082,12 @@ static int ngx_http_proxy_read_upstream_body(ngx_http_proxy_ctx_t *p)
int rc; int rc;
rc = ngx_event_proxy_read_upstream(p->event_proxy); rc = ngx_event_proxy_read_upstream(p->event_proxy);
if (rc == NGX_OK) {
if (p->event_proxy->fatal_error) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
if (p->event_proxy->upstream_eof && p->event_proxy->upstream_error) {
rc = ngx_event_close_connection(p->connection->read); rc = ngx_event_close_connection(p->connection->read);
} }