Changes with nginx 0.3.50 28 Jun 2006

*) Change: the "proxy_redirect_errors" and "fastcgi_redirect_errors" directives was renamed to the "proxy_intercept_errors" and "fastcgi_intercept_errors" directives. *) Feature: the ngx_http_charset_module supports the recoding from the single byte encodings to the UTF-8 encoding and back. *) Feature: the "X-Accel-Charset" response header line is supported in proxy and FastCGI mode. *) Bugfix: the "" escape symbol in the """ and "'" pairs in the SSI command was removed only if the command also has the "$" symbol. *) Bugfix: the "<!--" string might be added on some conditions in the SSI after inclusion. *) Bugfix: if the "Content-Length: 0" header line was in response, then in nonbuffered proxying mode the client connection was not closed.
nginx · Jun 28, 2006 · f54820c · f54820c
1 parent b16497d
commit f54820c
Show file tree

Hide file tree

Showing 30 changed files with 1,436 additions and 205 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,26 @@
 
+Changes with nginx 0.3.50                                        28 Jun 2006
+
+    *) Change: the "proxy_redirect_errors" and "fastcgi_redirect_errors" 
+       directives was renamed to the "proxy_intercept_errors" and 
+       "fastcgi_intercept_errors" directives.
+
+    *) Feature: the ngx_http_charset_module supports the recoding from the 
+       single byte encodings to the UTF-8 encoding and back.
+
+    *) Feature: the "X-Accel-Charset" response header line is supported in 
+       proxy and FastCGI mode.
+
+    *) Bugfix: the "\" escape symbol in the "\"" and "\'" pairs in the SSI 
+       command was removed only if the command also has the "$" symbol.
+
+    *) Bugfix: the "<!--" string might be added on some conditions in the 
+       SSI after inclusion.
+
+    *) Bugfix: if the "Content-Length: 0" header line was in response, then 
+       in nonbuffered proxying mode the client connection was not closed.
+
+
 Changes with nginx 0.3.49                                        31 May 2006
 
     *) Bugfix: in the "set" directive.

diff --git a/CHANGES.ru b/CHANGES.ru
@@ -1,4 +1,27 @@
 
+Изменения в nginx 0.3.50                                          28.06.2006
+
+    *) Изменение: директивы proxy_redirect_errors и fastcgi_redirect_errors 
+       переименованы соответственно в proxy_intercept_errors и 
+       fastcgi_intercept_errors.
+
+    *) Добавление: модуль ngx_http_charset_module поддерживает 
+       перекодирование из однобайтных кодировок в UTF-8 и обратно.
+
+    *) Добавление: в режиме прокси и FastCGI поддерживается строка 
+       заголовка "X-Accel-Charset" в ответе бэкенда.
+
+    *) Исправление: символ "\" в парах "\"" и "\'" в SSI командах убирался 
+       только, если также использовался символ "$".
+
+    *) Исправление: при некоторых условиях в SSI после вставки могла быть 
+       добавлена строка "<!--".
+
+    *) Исправление: если в заголовке ответа была строка 
+       "Content-Length: 0", при использовании небуферизированного 
+       проксировании не закрывалось соединение с клиентом.
+
+
 Изменения в nginx 0.3.49                                          31.05.2006
 
     *) Исправление: в директиве set.

diff --git a/auto/install b/auto/install
@@ -30,6 +30,8 @@ install:	$NGX_OBJS${ngx_dirsep}nginx${ngx_binext}	\
 		|| mkdir -p '`dirname "$NGX_CONF_PATH"`'
 
 	cp conf/koi-win '`dirname "$NGX_CONF_PATH"`'
+	cp conf/koi-utf '`dirname "$NGX_CONF_PATH"`'
+	cp conf/win-utf '`dirname "$NGX_CONF_PATH"`'
 
 	test -f '`dirname "$NGX_CONF_PATH"`/mime.types' || \
 		cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types'

diff --git a/auto/types/sizeof b/auto/types/sizeof
@@ -54,7 +54,7 @@ case $ngx_size in
             ngx_max_value=2147483647
         fi
 
-        ngx_max_len='sizeof("-2147483648") - 1'
+        ngx_max_len='(sizeof("-2147483648") - 1)'
     ;;
 
     8)
@@ -64,7 +64,7 @@ case $ngx_size in
             ngx_max_value=9223372036854775807L
         fi
 
-        ngx_max_len='sizeof("-9223372036854775808") - 1'
+        ngx_max_len='(sizeof("-9223372036854775808") - 1)'
     ;;
 
     *)

diff --git a/conf/koi-utf b/conf/koi-utf
@@ -0,0 +1,103 @@
+
+charset_map  koi8-r  utf-8 {
+
+    80  E282AC ; # euro
+
+    95  E280A2 ; # bullet
+
+    9A  C2A0 ;   # &nbsp;
+
+    9E  C2B7 ;   # &middot;
+
+    A3  D191 ;   # small yo
+    A4  D194 ;   # small Ukrainian ye
+
+    A6  D196 ;   # small Ukrainian i
+    A7  D197 ;   # small Ukrainian yi
+
+    AD  D291 ;   # small Ukrainian soft g
+    AE  D19E ;   # small Byelorussian short u
+
+    B0  C2B0 ;   # &deg;
+
+    B3  D081 ;   # capital YO
+    B4  D084 ;   # capital Ukrainian YE
+
+    B6  D086 ;   # capital Ukrainian I
+    B7  D087 ;   # capital Ukrainian YI
+
+    B9  E28496 ; # numero sign
+
+    BD  D290 ;   # capital Ukrainian soft G
+    BE  D18E ;   # capital Byelorussian short U
+
+    BF  C2A9 ;   # (C)
+
+    C0  D18E ;   # small yu
+    C1  D0B0 ;   # small a
+    C2  D0B1 ;   # small b
+    C3  D186 ;   # small ts
+    C4  D0B4 ;   # small d
+    C5  D0B5 ;   # small ye
+    C6  D184 ;   # small f
+    C7  D0B3 ;   # small g
+    C8  D185 ;   # small kh
+    C9  D0B8 ;   # small i
+    CA  D0B9 ;   # small j
+    CB  D0BA ;   # small k
+    CC  D0BB ;   # small l
+    CD  D0BC ;   # small m
+    CE  D0BD ;   # small n
+    CF  D0BE ;   # small o
+
+    D0  D0BF ;   # small p
+    D1  D18F ;   # small ya
+    D2  D180 ;   # small r
+    D3  D181 ;   # small s
+    D4  D182 ;   # small t
+    D5  D183 ;   # small u
+    D6  D0B6 ;   # small zh
+    D7  D0B2 ;   # small v
+    D8  D18C ;   # small soft sign
+    D9  D18B ;   # small y
+    DA  D0B7 ;   # small z
+    DB  D188 ;   # small sh
+    DC  D18D ;   # small e
+    DD  D189 ;   # small shch
+    DE  D187 ;   # small ch
+    DF  D18A ;   # small hard sign
+
+    E0  D0AE ;   # capital YU
+    E1  D090 ;   # capital A
+    E2  D091 ;   # capital B
+    E3  D0A6 ;   # capital TS
+    E4  D094 ;   # capital D
+    E5  D095 ;   # capital YE
+    E6  D0A4 ;   # capital F
+    E7  D093 ;   # capital G
+    E8  D0A5 ;   # capital KH
+    E9  D098 ;   # capital I
+    EA  D099 ;   # capital J
+    EB  D09A ;   # capital K
+    EC  D09B ;   # capital L
+    ED  D09C ;   # capital M
+    EE  D09D ;   # capital N
+    EF  D09E ;   # capital O
+
+    F0  D09F ;   # capital P
+    F1  D0AF ;   # capital YA
+    F2  D0A0 ;   # capital R
+    F3  D0A1 ;   # capital S
+    F4  D0A2 ;   # capital T
+    F5  D0A3 ;   # capital U
+    F6  D096 ;   # capital ZH
+    F7  D092 ;   # capital V
+    F8  D0AC ;   # capital soft sign
+    F9  D0AB ;   # capital Y
+    FA  D097 ;   # capital Z
+    FB  D0A8 ;   # capital SH
+    FC  D0AD ;   # capital E
+    FD  D0A9 ;   # capital SHCH
+    FE  D0A7 ;   # capital CH
+    FF  D0AA ;   # capital hard sign
+}
diff --git a/conf/koi-win b/conf/koi-win
@@ -13,7 +13,7 @@ charset_map  koi8-r  windows-1251 {
     A4  BA ; # small Ukrainian ye
 
     A6  B3 ; # small Ukrainian i
-    A7  BF ; # small Ukrainian j
+    A7  BF ; # small Ukrainian yi
 
     AD  B4 ; # small Ukrainian soft g
     AE  A2 ; # small Byelorussian short u
@@ -24,9 +24,9 @@ charset_map  koi8-r  windows-1251 {
     B4  AA ; # capital Ukrainian YE
 
     B6  B2 ; # capital Ukrainian I
-    B7  AF ; # capital Ukrainian J
+    B7  AF ; # capital Ukrainian YI
 
-    B9  B9 ; # No
+    B9  B9 ; # numero sign
 
     BD  A5 ; # capital Ukrainian soft G
     BE  A1 ; # capital Byelorussian short U

diff --git a/conf/nginx.conf b/conf/nginx.conf
@@ -20,7 +20,7 @@ http {
 
     #log_format  main  '$remote_addr - $remote_user [$time_local] $status '
     #                  '"$request" $body_bytes_sent "$http_referer" '
-    #                  '"$http_user_agent" "http_x_forwarded_for"';
+    #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
     #access_log  logs/access.log  main;
 
@@ -46,6 +46,15 @@ http {
             index  index.html index.htm;
         }
 
+        #error_page  404              /404.html;
+
+        # redirect server error pages to the static page /50x.html
+        #
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+
         # proxy the PHP scripts to Apache listening on 127.0.0.1:80
         #
         #location ~ \.php$ {
@@ -67,9 +76,6 @@ http {
         #location ~ /\.ht {
         #    deny  all;
         #}
-
-        #error_page  404              /404.html;
-        #error_page  500 502 503 504  /50x.html;
     }
 
 

diff --git a/conf/win-utf b/conf/win-utf
@@ -0,0 +1,122 @@
+
+charset_map  windows-1251  utf-8 {
+
+    82  E2809A ; # single low-9 quotation mark
+
+    84  E2809E ; # double low-9 quotation mark
+    85  E280A6 ; # ellipsis
+    86  E280A0 ; # dagger
+    87  E280A1 ; # double dagger
+    88  E282AC ; # euro
+    89  E280B0 ; # per mille
+
+    91  E28098 ; # left single quotation mark
+    92  E28099 ; # right single quotation mark
+    93  E2809C ; # left double quotation mark
+    94  E2809D ; # right double quotation mark
+    95  E280A2 ; # bullet
+    96  E28093 ; # en dash
+    97  E28094 ; # em dash
+
+    99  E284A2 ; # trade mark sign
+
+    A0  C2A0 ;   # &nbsp;
+    A1  D18E ;   # capital Byelorussian short U
+    A2  D19E ;   # small Byelorussian short u
+
+    A4  C2A4 ;   # currency sign
+    A5  D290 ;   # capital Ukrainian soft G
+    A6  C2A6 ;   # borken bar
+    A7  C2A7 ;   # section sign
+    A8  D081 ;   # capital YO
+    A9  C2A9 ;   # (C)
+    AA  D084 ;   # capital Ukrainian YE
+    AB  C2AB ;   # left-pointing double angle quotation mark
+    AC  C2AC ;   # not sign
+    AD  C2AD ;   # soft hypen
+    AE  C2AE ;   # (R)
+    AF  D087 ;   # capital Ukrainian YI
+
+    B0  C2B0 ;   # &deg;
+    B1  C2B1 ;   # plus-minus sign
+    B2  D086 ;   # capital Ukrainian I
+    B3  D196 ;   # small Ukrainian i
+    B4  D291 ;   # small Ukrainian soft g
+    B5  C2B5 ;   # micro sign
+    B6  C2B6 ;   # pilcrow sign
+    B7  C2B7 ;   # &middot;
+    B8  D191 ;   # small yo
+    B9  E28496 ; # numero sign
+    BA  D194 ;   # small Ukrainian ye
+    BB  C2BB ;   # right-pointing double angle quotation mark
+
+    BF  D197 ;   # small Ukrainian yi
+
+    C0  D090 ;   # capital A
+    C1  D091 ;   # capital B
+    C2  D092 ;   # capital V
+    C3  D093 ;   # capital G
+    C4  D094 ;   # capital D
+    C5  D095 ;   # capital YE
+    C6  D096 ;   # capital ZH
+    C7  D097 ;   # capital Z
+    C8  D098 ;   # capital I
+    C9  D099 ;   # capital J
+    CA  D09A ;   # capital K
+    CB  D09B ;   # capital L
+    CC  D09C ;   # capital M
+    CD  D09D ;   # capital N
+    CE  D09E ;   # capital O
+    CF  D09F ;   # capital P
+
+    D0  D0A0 ;   # capital R
+    D1  D0A1 ;   # capital S
+    D2  D0A2 ;   # capital T
+    D3  D0A3 ;   # capital U
+    D4  D0A4 ;   # capital F
+    D5  D0A5 ;   # capital KH
+    D6  D0A6 ;   # capital TS
+    D7  D0A7 ;   # capital CH
+    D8  D0A8 ;   # capital SH
+    D9  D0A9 ;   # capital SHCH
+    DA  D0AA ;   # capital hard sign
+    DB  D0AB ;   # capital Y
+    DC  D0AC ;   # capital soft sign
+    DD  D0AD ;   # capital E
+    DE  D0AE ;   # capital YU
+    DF  D0AF ;   # capital YA
+
+    E0  D0B0 ;   # small a
+    E1  D0B1 ;   # small b
+    E2  D0B2 ;   # small v
+    E3  D0B3 ;   # small g
+    E4  D0B4 ;   # small d
+    E5  D0B5 ;   # small ye
+    E6  D0B6 ;   # small zh
+    E7  D0B7 ;   # small z
+    E8  D0B8 ;   # small i
+    E9  D0B9 ;   # small j
+    EA  D0BA ;   # small k
+    EB  D0BB ;   # small l
+    EC  D0BC ;   # small m
+    ED  D0BD ;   # small n
+    EE  D0BE ;   # small o
+    EF  D0BF ;   # small p
+
+    F0  D180 ;   # small r
+    F1  D181 ;   # small s
+    F2  D182 ;   # small t
+    F3  D183 ;   # small u
+    F4  D184 ;   # small f
+    F5  D185 ;   # small kh
+    F6  D186 ;   # small ts
+    F7  D187 ;   # small ch
+    F8  D188 ;   # small sh
+    F9  D189 ;   # small shch
+    FA  D18A ;   # small hard sign
+    FB  D18B ;   # small y
+    FC  D18C ;   # small soft sign
+    FD  D18D ;   # small e
+    FE  D18E ;   # small yu
+    FF  D18F ;   # small ya
+}
diff --git a/html/50x.html b/html/50x.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+<title>The page is temporarily unavailable</title>
+<style>
+body { font-family: Tahoma, Verdana, Arial, sans-serif; }
+</style>
+</head>
+<body bgcolor="white" text="black">
+<p>
+The page you are looking for is temporarily unavailable.<br/>
+Please try again later.
+</p>
+</body>
+</html>
diff --git a/src/core/nginx.h b/src/core/nginx.h
@@ -8,7 +8,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VER          "nginx/0.3.49"
+#define NGINX_VER          "nginx/0.3.50"
 
 #define NGINX_VAR          "NGINX"
 #define NGX_OLDPID_EXT     ".oldbin"

diff --git a/src/core/ngx_inet.h b/src/core/ngx_inet.h
@@ -99,7 +99,6 @@ typedef struct {
 
     unsigned      uri_part:1;
     unsigned      port_only:1;
-    unsigned      virtual:1;
 } ngx_inet_upstream_t;