mirror of
https://github.com/nginx/nginx.git
synced 2025-02-25 18:55:26 -06:00
add MSIE padding for Chrome too
This commit is contained in:
parent
bdc154bb73
commit
3d12873adb
@ -31,13 +31,13 @@ static u_char ngx_http_error_tail[] =
|
|||||||
;
|
;
|
||||||
|
|
||||||
|
|
||||||
static u_char ngx_http_msie_stub[] =
|
static u_char ngx_http_msie_padding[] =
|
||||||
"<!-- The padding to disable MSIE's friendly error page -->" CRLF
|
"<!-- a padding to disable MSIE and Chrome friendly error page -->" CRLF
|
||||||
"<!-- The padding to disable MSIE's friendly error page -->" CRLF
|
"<!-- a padding to disable MSIE and Chrome friendly error page -->" CRLF
|
||||||
"<!-- The padding to disable MSIE's friendly error page -->" CRLF
|
"<!-- a padding to disable MSIE and Chrome friendly error page -->" CRLF
|
||||||
"<!-- The padding to disable MSIE's friendly error page -->" CRLF
|
"<!-- a padding to disable MSIE and Chrome friendly error page -->" CRLF
|
||||||
"<!-- The padding to disable MSIE's friendly error page -->" CRLF
|
"<!-- a padding to disable MSIE and Chrome friendly error page -->" CRLF
|
||||||
"<!-- The padding to disable MSIE's friendly error page -->" CRLF
|
"<!-- a padding to disable MSIE and Chrome friendly error page -->" CRLF
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
||||||
@ -598,12 +598,12 @@ ngx_http_send_special_response(ngx_http_request_t *r,
|
|||||||
r->headers_out.content_length_n = ngx_http_error_pages[err].len
|
r->headers_out.content_length_n = ngx_http_error_pages[err].len
|
||||||
+ len;
|
+ len;
|
||||||
if (clcf->msie_padding
|
if (clcf->msie_padding
|
||||||
&& r->headers_in.msie
|
&& (r->headers_in.msie || r->headers_in.chrome)
|
||||||
&& r->http_version >= NGX_HTTP_VERSION_10
|
&& r->http_version >= NGX_HTTP_VERSION_10
|
||||||
&& err >= NGX_HTTP_LEVEL_300)
|
&& err >= NGX_HTTP_LEVEL_300)
|
||||||
{
|
{
|
||||||
r->headers_out.content_length_n +=
|
r->headers_out.content_length_n +=
|
||||||
sizeof(ngx_http_msie_stub) - 1;
|
sizeof(ngx_http_msie_padding) - 1;
|
||||||
msie_padding = 1;
|
msie_padding = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -671,8 +671,8 @@ ngx_http_send_special_response(ngx_http_request_t *r,
|
|||||||
}
|
}
|
||||||
|
|
||||||
b->memory = 1;
|
b->memory = 1;
|
||||||
b->pos = ngx_http_msie_stub;
|
b->pos = ngx_http_msie_padding;
|
||||||
b->last = ngx_http_msie_stub + sizeof(ngx_http_msie_stub) - 1;
|
b->last = ngx_http_msie_padding + sizeof(ngx_http_msie_padding) - 1;
|
||||||
|
|
||||||
out[1].next = &out[2];
|
out[1].next = &out[2];
|
||||||
out[2].buf = b;
|
out[2].buf = b;
|
||||||
|
Loading…
Reference in New Issue
Block a user