From 08e63d46ded2584fea1e7547fa2e958ab978f42f Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 14 Aug 2006 15:09:38 +0000 Subject: nginx-0.3.58-RELEASE import *) Feature: the "error_page" directive supports the variables. *) Change: now the procfs interface instead of sysctl is used on Linux. *) Change: now the "Content-Type" header line is inherited from first response when the "X-Accel-Redirect" was used. *) Bugfix: the "error_page" directive did not redirect the 413 error. *) Bugfix: the trailing "?" did not remove old arguments if no new arguments were added to a rewritten URI. *) Bugfix: nginx could not run on 64-bit FreeBSD 7.0-CURRENT. --- src/http/modules/perl/nginx.xs | 6 ++---- src/http/modules/perl/ngx_http_perl_module.c | 7 ------- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'src/http/modules/perl') diff --git a/src/http/modules/perl/nginx.xs b/src/http/modules/perl/nginx.xs index 8e287a6b2..53b6a9230 100644 --- a/src/http/modules/perl/nginx.xs +++ b/src/http/modules/perl/nginx.xs @@ -116,10 +116,8 @@ send_http_header(r, ...) } } else { - if (r->headers_out.content_type.len == 0) { - if (ngx_http_set_content_type(r) != NGX_OK) { - XSRETURN_EMPTY; - } + if (ngx_http_set_content_type(r) != NGX_OK) { + XSRETURN_EMPTY; } } diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c index b3e117584..6f979c661 100644 --- a/src/http/modules/perl/ngx_http_perl_module.c +++ b/src/http/modules/perl/ngx_http_perl_module.c @@ -226,13 +226,6 @@ ngx_http_perl_handle_request(ngx_http_request_t *r) ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "perl handler"); - /* mod_perl's content handler assumes that content type was already set */ - - if (ngx_http_set_content_type(r) != NGX_OK) { - ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); - return; - } - ctx = ngx_http_get_module_ctx(r, ngx_http_perl_module); if (ctx == NULL) { -- cgit