~ubuntu-branches/debian/squeeze/nginx/squeeze

« back to all changes in this revision

Viewing changes to src/http/ngx_http_special_response.c

Committer: Bazaar Package Importer
Author(s): Kartik Mistry
Date: 2010-06-16 01:26:51 UTC
mfrom: (1.1.16 upstream)
Revision ID: james.westby@ubuntu.com-20100616012651-0kldmspg3i91mynk

Tags: 0.7.67-1

New upstream release

files modified:
.pc/fix_reloading_ipv6.diff/src/core/ngx_cycle.c

CHANGES

CHANGES.ru

auto/cc/conf

auto/cc/gcc

auto/feature

auto/lib/openssl/conf

auto/lib/openssl/make

auto/lib/openssl/makefile.bcc

auto/lib/openssl/makefile.msvc

auto/lib/zlib/make

auto/modules

auto/unix

debian/changelog

src/core/nginx.h

src/core/ngx_cycle.c

src/core/ngx_file.c

src/core/ngx_open_file_cache.c

src/core/ngx_string.c

src/core/ngx_times.c

src/core/ngx_times.h

src/event/modules/ngx_devpoll_module.c

src/event/modules/ngx_epoll_module.c

src/event/modules/ngx_eventport_module.c

src/event/modules/ngx_kqueue_module.c

src/event/modules/ngx_poll_module.c

src/event/modules/ngx_rtsig_module.c

src/event/modules/ngx_select_module.c

src/event/modules/ngx_win32_select_module.c

src/event/ngx_event.c

src/event/ngx_event_openssl.c

src/event/ngx_event_openssl.h

src/http/modules/ngx_http_autoindex_module.c

src/http/modules/ngx_http_chunked_filter_module.c

src/http/modules/ngx_http_dav_module.c

src/http/modules/ngx_http_fastcgi_module.c

src/http/modules/ngx_http_flv_module.c

src/http/modules/ngx_http_geo_module.c

src/http/modules/ngx_http_geoip_module.c

src/http/modules/ngx_http_gzip_static_module.c

src/http/modules/ngx_http_image_filter_module.c

src/http/modules/ngx_http_index_module.c

src/http/modules/ngx_http_memcached_module.c

src/http/modules/ngx_http_proxy_module.c

src/http/modules/ngx_http_random_index_module.c

src/http/modules/ngx_http_referer_module.c

src/http/modules/ngx_http_rewrite_module.c

src/http/modules/ngx_http_ssi_filter_module.c

src/http/modules/ngx_http_static_module.c

src/http/modules/ngx_http_userid_filter_module.c

src/http/modules/perl/nginx.pm

src/http/modules/perl/nginx.xs

src/http/modules/perl/ngx_http_perl_module.c

src/http/ngx_http_cache.h

src/http/ngx_http_copy_filter_module.c

src/http/ngx_http_core_module.c

src/http/ngx_http_core_module.h

src/http/ngx_http_file_cache.c

src/http/ngx_http_header_filter_module.c

src/http/ngx_http_parse.c

src/http/ngx_http_request.c

src/http/ngx_http_request.h

src/http/ngx_http_special_response.c

src/http/ngx_http_upstream.c

src/http/ngx_http_upstream.h

src/http/ngx_http_variables.c

src/http/ngx_http_variables.h

src/mail/ngx_mail_pop3_handler.c

src/mail/ngx_mail_proxy_module.c

src/os/unix/ngx_errno.h

src/os/unix/ngx_files.h

src/os/unix/ngx_process.c

src/os/unix/ngx_process_cycle.c

Show diffs side-by-side

added added

removed removed

src/http/ngx_http_special_response.c

;

static u_char ngx_http_msie_stub[] =

"" CRLF

static u_char ngx_http_msie_padding[] =

"" CRLF

;

517

518

r->err_status = overwrite;

519

520

r->zero_in_uri = 0;

521

522

520

if (ngx_http_complex_value(r, &err_page->value, &uri) != NGX_OK) {

523

521

return NGX_ERROR;

524

522

}

598

596

r->headers_out.content_length_n = ngx_http_error_pages[err].len

599

597

+ len;

600

598

if (clcf->msie_padding

601

&& r->headers_in.msie

599

&& (r->headers_in.msie || r->headers_in.chrome)

602

600

&& r->http_version >= NGX_HTTP_VERSION_10

603

601

&& err >= NGX_HTTP_LEVEL_300)

604

602

{

605

603

r->headers_out.content_length_n +=

606

sizeof(ngx_http_msie_stub) - 1;

604

sizeof(ngx_http_msie_padding) - 1;

607

605

msie_padding = 1;

608

606

}

609

607

671

669

}

672

670

673

671

b->memory = 1;

674

b->pos = ngx_http_msie_stub;

675

b->last = ngx_http_msie_stub + sizeof(ngx_http_msie_stub) - 1;

672

b->pos = ngx_http_msie_padding;

673

b->last = ngx_http_msie_padding + sizeof(ngx_http_msie_padding) - 1;

676

674

677

675

out[1].next = &out[2];

678

676

out[2].buf = b;

Older »