From 8f1255877c4b64f83fce75baa4d903797e00e815 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 28 Jul 2006 15:16:17 +0000
Subject: nginx-0.3.55-RELEASE import

    *) Feature: the "stub" parameter in the "include" SSI command.

    *) Feature: the "block" SSI command.

    *) Feature: the unicode2nginx script was added to contrib.

    *) Bugfix: if a "root" was specified by variable only, then the root
       was relative to a server prefix.

    *) Bugfix: if the request contained "//" or "/./" and escaped symbols
       after them, then the proxied request was sent unescaped.

    *) Bugfix: the $r->headers_in("Cookie") of the ngx_http_perl_module now
       returns all "Cookie" header lines.

    *) Bugfix: a segmentation fault occurred if
       "client_body_in_file_only on" was used and nginx switched to a next
       upstream.

    *) Bugfix: on some condition while reconfiguration character codes
       inside the "charset_map" may be treated invalid; the bug had
       appeared in 0.3.50.
---
 conf/koi-utf    | 6 ++++++
 conf/mime.types | 1 +
 conf/win-utf    | 4 ++++
 3 files changed, 11 insertions(+)

(limited to 'conf')

diff --git a/conf/koi-utf b/conf/koi-utf
index 2faca0006..e7974ff6a 100644
--- a/conf/koi-utf
+++ b/conf/koi-utf
@@ -1,4 +1,10 @@
 
+# This map is not a full koi8-r <> utf8 map: it does not contain
+# box-drawing and some other characters.  Besides this map contains
+# several koi8-u and Byelorussian letters which are not in koi8-r.
+# If you need a full and standard map, use contrib/unicode2nginx/koi-utf
+# map instead.
+
 charset_map  koi8-r  utf-8 {
 
     80  E282AC ; # euro
diff --git a/conf/mime.types b/conf/mime.types
index 818133a4a..497308b9c 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -14,6 +14,7 @@ types {
     image/png                             png;
     image/x-icon                          ico;
     image/x-jng                           jng;
+    image/vnd.wap.wbmp                    wbmp;
 
     application/java-archive              jar war ear;
     application/mac-binhex40              hqx;
diff --git a/conf/win-utf b/conf/win-utf
index e8e830e0f..ed8bc007a 100644
--- a/conf/win-utf
+++ b/conf/win-utf
@@ -1,4 +1,8 @@
 
+# This map is not a full windows-1251 <> utf8 map: it does not
+# contain Serbian and Macedonian letters.  If you need a full map,
+# use contrib/unicode2nginx/win-utf map instead.
+
 charset_map  windows-1251  utf-8 {
 
     82  E2809A ; # single low-9 quotation mark
-- 
cgit v1.2.3