Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 1270:b8fab2c5dac9 stable-0.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r1260 merge: if subrequest response was buffered in file, then subrequest was finalized with 0 code, ngx_http_writer() was not set, and response part in file was lost
author Igor Sysoev <igor@sysoev.ru>
date Thu, 05 Jul 2007 11:42:11 +0000
parents e84e5b6befe4
children be2b895d31e0
comparison
equal deleted inserted replaced
1269:56f2d7ff4034 1270:b8fab2c5dac9
2155 return; 2155 return;
2156 } 2156 }
2157 2157
2158 r->connection->log->action = "sending to client"; 2158 r->connection->log->action = "sending to client";
2159 2159
2160 if (rc == 0 && r == r->main && !r->post_action) { 2160 if (rc == 0) {
2161 rc = ngx_http_send_special(r, NGX_HTTP_LAST); 2161 if (r == r->main) {
2162 if (!r->post_action) {
2163 rc = ngx_http_send_special(r, NGX_HTTP_LAST);
2164 }
2165
2166 } else {
2167 if (r->out) {
2168 rc = NGX_AGAIN;
2169 }
2170 }
2162 } 2171 }
2163 2172
2164 ngx_http_finalize_request(r, rc); 2173 ngx_http_finalize_request(r, rc);
2165 } 2174 }
2166 2175