Mercurial > hg > nginx
comparison src/http/modules/ngx_http_headers_filter_module.c @ 4513:2dfa4d76e4c5 stable-1.0
Merge of r4491, r4492:
*) Renamed constants and fixed off-by-one error in "msie_padding on"
handling.
*) Added support for the 307 Temporary Redirect.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 05 Mar 2012 13:03:39 +0000 |
parents | 4919fb357a5d |
children |
comparison
equal
deleted
inserted
replaced
4512:cbed47593ce0 | 4513:2dfa4d76e4c5 |
---|---|
147 || (r->headers_out.status != NGX_HTTP_OK | 147 || (r->headers_out.status != NGX_HTTP_OK |
148 && r->headers_out.status != NGX_HTTP_NO_CONTENT | 148 && r->headers_out.status != NGX_HTTP_NO_CONTENT |
149 && r->headers_out.status != NGX_HTTP_PARTIAL_CONTENT | 149 && r->headers_out.status != NGX_HTTP_PARTIAL_CONTENT |
150 && r->headers_out.status != NGX_HTTP_MOVED_PERMANENTLY | 150 && r->headers_out.status != NGX_HTTP_MOVED_PERMANENTLY |
151 && r->headers_out.status != NGX_HTTP_MOVED_TEMPORARILY | 151 && r->headers_out.status != NGX_HTTP_MOVED_TEMPORARILY |
152 && r->headers_out.status != NGX_HTTP_NOT_MODIFIED)) | 152 && r->headers_out.status != NGX_HTTP_SEE_OTHER |
153 && r->headers_out.status != NGX_HTTP_NOT_MODIFIED | |
154 && r->headers_out.status != NGX_HTTP_TEMPORARY_REDIRECT)) | |
153 { | 155 { |
154 return ngx_http_next_header_filter(r); | 156 return ngx_http_next_header_filter(r); |
155 } | 157 } |
156 | 158 |
157 if (conf->expires != NGX_HTTP_EXPIRES_OFF) { | 159 if (conf->expires != NGX_HTTP_EXPIRES_OFF) { |