Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 5340:13a5f4765887

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: posted requests handling after ssl handshake errors. Missing call to ngx_http_run_posted_request() resulted in a main request hang if subrequest's ssl handshake with an upstream server failed for some reason. Reported by Aviram Cohen.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 23 Aug 2013 22:18:46 +0400
parents 12b750d35162
children 1608b1135a1d
comparison
equal deleted inserted replaced
5339:ee2a4c68fb35 5340:13a5f4765887
1336 } 1336 }
1337 1337
1338 c->write->handler = ngx_http_upstream_handler; 1338 c->write->handler = ngx_http_upstream_handler;
1339 c->read->handler = ngx_http_upstream_handler; 1339 c->read->handler = ngx_http_upstream_handler;
1340 1340
1341 c = r->connection;
1342
1341 ngx_http_upstream_send_request(r, u); 1343 ngx_http_upstream_send_request(r, u);
1342 1344
1343 return; 1345 ngx_http_run_posted_requests(c);
1344 } 1346 return;
1347 }
1348
1349 c = r->connection;
1345 1350
1346 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); 1351 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
1347 1352
1353 ngx_http_run_posted_requests(c);
1348 } 1354 }
1349 1355
1350 #endif 1356 #endif
1351 1357
1352 1358