Author: is
Date: 2011-11-01 14:15:42 +0000 (Tue, 01 Nov 2011)
New Revision: 4256

Modified:
branches/stable-1.0/
branches/stable-1.0/src/http/modules/perl/nginx.xs
Log:
Merging r4189, r4197:

Perl related fixes:

*) Handling of Content-Encoding set from perl.

This fixes double gzipping in case of gzip filter being enabled while perl
returns already gzipped response.

*) Fixed macro name.



Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:3960-3974,3977-3987,3991-3996,3998,4003-4007,4009-4013,4015-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143,4147-4152,4154-4158,4177,4179,4182-4184,4186-4187,4190-4196,4199-4205,4207,4212,4219-4220,4229-4230,4232,4235,4237
+ /trunk:3960-3974,3977-3987,3991-3996,3998,4003-4007,4009-4013,4015-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143,4147-4152,4154-4158,4177,4179,4182-4184,4186-4187,4189-4197,4199-4205,4207,4212,4219-4220,4229-4230,4232,4235,4237

Modified: branches/stable-1.0/src/http/modules/perl/nginx.xs
===================================================================
--- branches/stable-1.0/src/http/modules/perl/nginx.xs 2011-11-01 14:13:25 UTC (rev 4255)
+++ branches/stable-1.0/src/http/modules/perl/nginx.xs 2011-11-01 14:15:42 UTC (rev 4256)
@@ -474,7 +474,14 @@
r->headers_out.content_length = header;
}

+ if (header->key.len == sizeof("Content-Encoding") - 1
+ && ngx_strncasecmp(header->key.data, "Content-Encoding",
+ sizeof("Content-Encoding") - 1) == 0)
+ {
+ r->headers_out.content_encoding = header;
+ }

+
void
filename(r)
CODE:
@@ -836,7 +843,7 @@
var.len = len;
var.data = lowcase;

- #if (NGX_LOG_DEBUG)
+ #if (NGX_DEBUG)

if (value) {
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel