Mercurial > hg > nginx-quic
comparison src/http/ngx_http_request.c @ 3245:61962127b166 stable-0.7
merge r3001, r3007, r3013:
fix variuos segfaults:
*) fix segfault if 400 or 414 errors are handled intricately
*) ngx_http_upstream_create() to cleanup the previous upstream after
internal redirect
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 26 Oct 2009 17:09:27 +0000 |
parents | 08570d26c7c5 |
children | 1966ba1d76fd |
comparison
equal
deleted
inserted
replaced
3244:8b2d478de54b | 3245:61962127b166 |
---|---|
382 r->main_conf = cscf->ctx->main_conf; | 382 r->main_conf = cscf->ctx->main_conf; |
383 r->srv_conf = cscf->ctx->srv_conf; | 383 r->srv_conf = cscf->ctx->srv_conf; |
384 r->loc_conf = cscf->ctx->loc_conf; | 384 r->loc_conf = cscf->ctx->loc_conf; |
385 | 385 |
386 rev->handler = ngx_http_process_request_line; | 386 rev->handler = ngx_http_process_request_line; |
387 r->read_event_handler = ngx_http_block_reading; | |
387 | 388 |
388 #if (NGX_HTTP_SSL) | 389 #if (NGX_HTTP_SSL) |
389 | 390 |
390 { | 391 { |
391 ngx_http_ssl_srv_conf_t *sscf; | 392 ngx_http_ssl_srv_conf_t *sscf; |