2010-05-25
2010-05-25 09:06:17 by Martin Jonsson <marty@roxen.com>
-
9016a84befb93b8f9f05d874b9f06e815f5ac864
(10 lines)
(+7/-3)
[
Show
| Annotate
]
Branch: 5.2
HTTP compression fix to make sure we use the request's final content type to
determine compression usage if it's been overridden somewhere in the request.
Rev: server/protocols/http.pike:1.619
2:
// Modified by Francesco Chemolli to add throttling capabilities.
// Copyright © 1996 - 2009, Roxen IS.
- constant cvs_version = "$Id: http.pike,v 1.618 2010/05/19 14:33:51 marty Exp $";
+ constant cvs_version = "$Id: http.pike,v 1.619 2010/05/25 09:06:17 marty Exp $";
// #define REQUEST_DEBUG
#define MAGIC_ERROR
2286: Inside #if defined(HTTP_COMPRESSION)
mapping(string:int) compress_exact_mimetypes = conf->http_compr_exact_mimes;
mapping(string:int) compress_main_mimetypes = conf->http_compr_main_mimes;
- mimetype = (mimetype / ";")[0]; // We are not interested in the charset spec.
+ if (mimetype)
+ // We are not interested in the charset spec.
+ mimetype = (mimetype / ";")[0];
return (conf->http_compr_enabled &&
mimetype &&
2489:
}
#ifdef HTTP_COMPRESSION
- if(compression_enabled_for_mimetype (file->type)) {
+ if(compression_enabled_for_mimetype (get_response_content_type (file)) ||
+ (misc->vary && misc->vary["content-type"])) {
// Notify proxies etc. that we depend on the Accept-Encoding header,
// but we don't want to register it as a vary callback since it's
// handled directly by the protocol cache.