Mercurial > hg > nginx

comparison src/http/ngx_http_special_response.c @ 3860:39ad979cd31e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix "error_page 497 https://" case patch by Maxim Dounin the bug has been introduced in r3782
author Igor Sysoev <igor@sysoev.ru>
date Tue, 01 Feb 2011 16:18:55 +0000
parents de59ad6bf557
children 55acacac22df 6afb20bf2ad5
comparison
equal deleted inserted replaced
3859:30d4d6187316 3860:39ad979cd31e
568 568
569 if (location == NULL) { 569 if (location == NULL) {
570 return NGX_ERROR; 570 return NGX_ERROR;
571 } 571 }
572 572
573 r->err_status = overwrite > 0 ? overwrite : NGX_HTTP_MOVED_TEMPORARILY; 573 if (overwrite >= NGX_HTTP_MOVED_PERMANENTLY
574 && overwrite <= NGX_HTTP_SEE_OTHER)
575 {
576 r->err_status = overwrite;
577
578 } else {
579 r->err_status = NGX_HTTP_MOVED_TEMPORARILY;
580 }
574 581
575 location->hash = 1; 582 location->hash = 1;
576 ngx_str_set(&location->key, "Location"); 583 ngx_str_set(&location->key, "Location");
577 location->value = uri; 584 location->value = uri;
578 585