Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_core_module.c @ 236:c982febb7588 NGINX_0_4_3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.4.3 *) Change: now the 499 error could not be redirected using an "error_page" directive. *) Feature: the Solaris 10 event ports support. *) Feature: the ngx_http_browser_module. *) Bugfix: a segmentation fault may occur while redirecting the 400 error to the proxied server using an "proxy_pass" directive. *) Bugfix: a segmentation fault occurred if an unix domain socket was used in an "proxy_pass" directive; bug appeared in 0.3.47. *) Bugfix: SSI did work with memcached and nonbuffered responses. *) Workaround: of the Sun Studio PAUSE hardware capability bug.
author Igor Sysoev <http://sysoev.ru>
date Tue, 26 Sep 2006 00:00:00 +0400
parents 38e7b94d63ac
children 500a3242dff6
comparison
equal deleted inserted replaced
235:f622c719b711 236:c982febb7588
512 r->lingering_close = 1; 512 r->lingering_close = 1;
513 513
514 } else { 514 } else {
515 r->lingering_close = 0; 515 r->lingering_close = 0;
516 } 516 }
517 } 517
518
519 r->valid_unparsed_uri = 1;
520 r->valid_location = 1;
521
522 if (!r->internal) {
523 r->phase_handler = 0; 518 r->phase_handler = 0;
524 519
525 } else { 520 } else {
526 cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module); 521 cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
527 r->phase_handler = cmcf->phase_engine.server_rewrite_index; 522 r->phase_handler = cmcf->phase_engine.server_rewrite_index;
528 } 523 }
524
525 if (r->unparsed_uri.len) {
526 r->valid_unparsed_uri = 1;
527 }
528
529 r->valid_location = 1;
529 530
530 r->write_event_handler = ngx_http_core_run_phases; 531 r->write_event_handler = ngx_http_core_run_phases;
531 ngx_http_core_run_phases(r); 532 ngx_http_core_run_phases(r);
532 } 533 }
533 534
2882 return NGX_CONF_ERROR; 2883 return NGX_CONF_ERROR;
2883 } 2884 }
2884 2885
2885 err->status = ngx_atoi(value[i].data, value[i].len); 2886 err->status = ngx_atoi(value[i].data, value[i].len);
2886 2887
2887 if (err->status == NGX_ERROR) { 2888 if (err->status == NGX_ERROR || err->status == 499) {
2888 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 2889 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2889 "invalid value \"%V\"", &value[i]); 2890 "invalid value \"%V\"", &value[i]);
2890 return NGX_CONF_ERROR; 2891 return NGX_CONF_ERROR;
2891 } 2892 }
2892 2893