Skip to content

Commit ebd9fbd

Browse files
igorsysoevkolbyjack
igorsysoev
authored and
kolbyjack
committed
Changes with nginx 0.3.55 28 Jul 2006
 *) 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 was switches to a next upstream. *) Bugfix: on some condition while reconfiguration character codes inside the "charset_map" may be treated invalid; bug appeared in 0.3.50.
1 parent 2b3fe49 commit ebd9fbd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+871
-118
lines changed

‎CHANGES

+27-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
11

2+
Changes with nginx 0.3.55 28 Jul 2006
3+
4+
*) Feature: the "stub" parameter in the "include" SSI command.
5+
6+
*) Feature: the "block" SSI command.
7+
8+
*) Feature: the unicode2nginx script was added to contrib.
9+
10+
*) Bugfix: if a "root" was specified by variable only, then the root
11+
was relative to a server prefix.
12+
13+
*) Bugfix: if the request contained "//" or "/./" and escaped symbols
14+
after them, then the proxied request was sent unescaped.
15+
16+
*) Bugfix: the $r->headers_in("Cookie") of the ngx_http_perl_module now
17+
returns all "Cookie" header lines.
18+
19+
*) Bugfix: a segmentation fault occurred if
20+
"client_body_in_file_only on" was used and nginx was switches to a
21+
next upstream.
22+
23+
*) Bugfix: on some condition while reconfiguration character codes
24+
inside the "charset_map" may be treated invalid; bug appeared in
25+
0.3.50.
26+
27+
228
Changes with nginx 0.3.54 11 Jul 2006
329

430
*) Feature: nginx now logs the subrequest information to the error log.
@@ -156,7 +182,7 @@ Changes with nginx 0.3.45 06 May 2006
156182

157183
Changes with nginx 0.3.44 04 May 2006
158184

159-
*) Feature: the "wait" parameter in the SSI "include" command.
185+
*) Feature: the "wait" parameter in the "include" SSI command.
160186

161187
*) Feature: the Ukrainian and Byelorussian characters were added to
162188
koi-win conversion table.

‎CHANGES.ru

+28-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,31 @@
11

2+
Изменения в nginx 0.3.55 28.07.2006
3+
4+
*) Добавление: параметр stub в команде SSI include.
5+
6+
*) Добавление: команда SSI block.
7+
8+
*) Добавление: скрипт unicode2nginx добавлен в contrib.
9+
10+
*) Исправление: если root был задан только переменной, то корень
11+
задавался относительно префикса сервера.
12+
13+
*) Исправление: если в запросе был "//" или "/.", и после этого
14+
закодированные символы в виде "%XX", то проксируемый запрос
15+
передавался незакодированным.
16+
17+
*) Исправление: метод $r->headers_in("Cookie") модуля
18+
ngx_http_perl_module теперь возвращает все строки "Cookie" в
19+
заголовке запроса.
20+
21+
*) Исправление: происходил segmentation fault, если использовался
22+
"client_body_in_file_only on" и делался переход к следующему бэкенду.
23+
24+
*) Исправление: при некоторых условиях во время переконфигурации коды
25+
символов в внутри директивы charset_map могли считаться неверными;
26+
ошибка появилась в 0.3.50.
27+
28+
229
Изменения в nginx 0.3.54 11.07.2006
330

431
*) Добавление: nginx теперь записывает в лог информацию о подзапросах.
@@ -161,7 +188,7 @@
161188
162189
Изменения в nginx 0.3.44 04.05.2006
163190
164-
*) Добавление: параметр wait в команде SSI inlcude.
191+
*) Добавление: параметр wait в команде SSI include.
165192
166193
*) Добавление: в таблицу перекодировки koi-win добавлены украинские и
167194
белорусские символы.

‎auto/make

+4-2
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,10 @@ ngx_objs=`echo $ngx_all_objs $ngx_modules_obj \
175175
| sed -e "s/ *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \
176176
-e "s/\//$ngx_regex_dirsep/g"`
177177

178-
ngx_libs=${CORE_LIBS:+`echo $NGX_LD_OPT $CORE_LIBS \
179-
| sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`}
178+
if test -n "$NGX_LD_OPT$CORE_LIBS"; then
179+
ngx_libs=`echo $NGX_LD_OPT $CORE_LIBS \
180+
| sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`
181+
fi
180182

181183
ngx_link=${CORE_LINK:+`echo $CORE_LINK \
182184
| sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`}

‎conf/koi-utf

+6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11

2+
# This map is not a full koi8-r <> utf8 map: it does not contain
3+
# box-drawing and some other characters. Besides this map contains
4+
# several koi8-u and Byelorussian letters which are not in koi8-r.
5+
# If you need a full and standard map, use contrib/unicode2nginx/koi-utf
6+
# map instead.
7+
28
charset_map koi8-r utf-8 {
39

410
80 E282AC ; # euro

‎conf/mime.types

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ types {
1414
image/png png;
1515
image/x-icon ico;
1616
image/x-jng jng;
17+
image/vnd.wap.wbmp wbmp;
1718

1819
application/java-archive jar war ear;
1920
application/mac-binhex40 hqx;

‎conf/win-utf

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11

2+
# This map is not a full windows-1251 <> utf8 map: it does not
3+
# contain Serbian and Macedonian letters. If you need a full map,
4+
# use contrib/unicode2nginx/win-utf map instead.
5+
26
charset_map windows-1251 utf-8 {
37

48
82 E2809A ; # single low-9 quotation mark

‎contrib/README

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11

2-
geo2nginx.pl by Andrei Nigmatulin
2+
geo2nginx.pl by Andrei Nigmatulin
3+
4+
The perl script to convert CSV geoip database ( free download
5+
at http://www.maxmind.com/app/geoip_country ) to format, suitable
6+
for use by the ngx_http_geo_module.
7+
8+
9+
unicode2nginx by Maxim Dounin
10+
11+
The perl script to convert unicode mappings ( available
12+
at http://www.unicode.org/Public/MAPPINGS/ ) to the nginx
13+
configuration file format.
14+
Two generated full maps for windows-1251 and koi8-r.
315

4-
The perl script to convert CSV geoip database (free download
5-
at http://www.maxmind.com/app/geoip_country) to format, suitable
6-
for use with ngx_http_geo_module.

‎contrib/unicode2nginx/koi-utf

+131
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
charset_map koi8-r utf-8 {
2+
3+
80 E29480 ; # BOX DRAWINGS LIGHT HORIZONTAL
4+
81 E29482 ; # BOX DRAWINGS LIGHT VERTICAL
5+
82 E2948C ; # BOX DRAWINGS LIGHT DOWN AND RIGHT
6+
83 E29490 ; # BOX DRAWINGS LIGHT DOWN AND LEFT
7+
84 E29494 ; # BOX DRAWINGS LIGHT UP AND RIGHT
8+
85 E29498 ; # BOX DRAWINGS LIGHT UP AND LEFT
9+
86 E2949C ; # BOX DRAWINGS LIGHT VERTICAL AND RIGHT
10+
87 E294A4 ; # BOX DRAWINGS LIGHT VERTICAL AND LEFT
11+
88 E294AC ; # BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
12+
89 E294B4 ; # BOX DRAWINGS LIGHT UP AND HORIZONTAL
13+
8A E294BC ; # BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
14+
8B E29680 ; # UPPER HALF BLOCK
15+
8C E29684 ; # LOWER HALF BLOCK
16+
8D E29688 ; # FULL BLOCK
17+
8E E2968C ; # LEFT HALF BLOCK
18+
8F E29690 ; # RIGHT HALF BLOCK
19+
90 E29691 ; # LIGHT SHADE
20+
91 E29692 ; # MEDIUM SHADE
21+
92 E29693 ; # DARK SHADE
22+
93 E28CA0 ; # TOP HALF INTEGRAL
23+
94 E296A0 ; # BLACK SQUARE
24+
95 E28899 ; # BULLET OPERATOR
25+
96 E2889A ; # SQUARE ROOT
26+
97 E28988 ; # ALMOST EQUAL TO
27+
98 E289A4 ; # LESS-THAN OR EQUAL TO
28+
99 E289A5 ; # GREATER-THAN OR EQUAL TO
29+
9A C2A0 ; # NO-BREAK SPACE
30+
9B E28CA1 ; # BOTTOM HALF INTEGRAL
31+
9C C2B0 ; # DEGREE SIGN
32+
9D C2B2 ; # SUPERSCRIPT TWO
33+
9E C2B7 ; # MIDDLE DOT
34+
9F C3B7 ; # DIVISION SIGN
35+
A0 E29590 ; # BOX DRAWINGS DOUBLE HORIZONTAL
36+
A1 E29591 ; # BOX DRAWINGS DOUBLE VERTICAL
37+
A2 E29592 ; # BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
38+
A3 D191 ; # CYRILLIC SMALL LETTER IO
39+
A4 E29593 ; # BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
40+
A5 E29594 ; # BOX DRAWINGS DOUBLE DOWN AND RIGHT
41+
A6 E29595 ; # BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
42+
A7 E29596 ; # BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
43+
A8 E29597 ; # BOX DRAWINGS DOUBLE DOWN AND LEFT
44+
A9 E29598 ; # BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
45+
AA E29599 ; # BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
46+
AB E2959A ; # BOX DRAWINGS DOUBLE UP AND RIGHT
47+
AC E2959B ; # BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
48+
AD E2959C ; # BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
49+
AE E2959D ; # BOX DRAWINGS DOUBLE UP AND LEFT
50+
AF E2959E ; # BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
51+
B0 E2959F ; # BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
52+
B1 E295A0 ; # BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
53+
B2 E295A1 ; # BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
54+
B3 D081 ; # CYRILLIC CAPITAL LETTER IO
55+
B4 E295A2 ; # BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
56+
B5 E295A3 ; # BOX DRAWINGS DOUBLE VERTICAL AND LEFT
57+
B6 E295A4 ; # BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
58+
B7 E295A5 ; # BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
59+
B8 E295A6 ; # BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
60+
B9 E295A7 ; # BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
61+
BA E295A8 ; # BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
62+
BB E295A9 ; # BOX DRAWINGS DOUBLE UP AND HORIZONTAL
63+
BC E295AA ; # BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
64+
BD E295AB ; # BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
65+
BE E295AC ; # BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
66+
BF C2A9 ; # COPYRIGHT SIGN
67+
C0 D18E ; # CYRILLIC SMALL LETTER YU
68+
C1 D0B0 ; # CYRILLIC SMALL LETTER A
69+
C2 D0B1 ; # CYRILLIC SMALL LETTER BE
70+
C3 D186 ; # CYRILLIC SMALL LETTER TSE
71+
C4 D0B4 ; # CYRILLIC SMALL LETTER DE
72+
C5 D0B5 ; # CYRILLIC SMALL LETTER IE
73+
C6 D184 ; # CYRILLIC SMALL LETTER EF
74+
C7 D0B3 ; # CYRILLIC SMALL LETTER GHE
75+
C8 D185 ; # CYRILLIC SMALL LETTER HA
76+
C9 D0B8 ; # CYRILLIC SMALL LETTER I
77+
CA D0B9 ; # CYRILLIC SMALL LETTER SHORT I
78+
CB D0BA ; # CYRILLIC SMALL LETTER KA
79+
CC D0BB ; # CYRILLIC SMALL LETTER EL
80+
CD D0BC ; # CYRILLIC SMALL LETTER EM
81+
CE D0BD ; # CYRILLIC SMALL LETTER EN
82+
CF D0BE ; # CYRILLIC SMALL LETTER O
83+
D0 D0BF ; # CYRILLIC SMALL LETTER PE
84+
D1 D18F ; # CYRILLIC SMALL LETTER YA
85+
D2 D180 ; # CYRILLIC SMALL LETTER ER
86+
D3 D181 ; # CYRILLIC SMALL LETTER ES
87+
D4 D182 ; # CYRILLIC SMALL LETTER TE
88+
D5 D183 ; # CYRILLIC SMALL LETTER U
89+
D6 D0B6 ; # CYRILLIC SMALL LETTER ZHE
90+
D7 D0B2 ; # CYRILLIC SMALL LETTER VE
91+
D8 D18C ; # CYRILLIC SMALL LETTER SOFT SIGN
92+
D9 D18B ; # CYRILLIC SMALL LETTER YERU
93+
DA D0B7 ; # CYRILLIC SMALL LETTER ZE
94+
DB D188 ; # CYRILLIC SMALL LETTER SHA
95+
DC D18D ; # CYRILLIC SMALL LETTER E
96+
DD D189 ; # CYRILLIC SMALL LETTER SHCHA
97+
DE D187 ; # CYRILLIC SMALL LETTER CHE
98+
DF D18A ; # CYRILLIC SMALL LETTER HARD SIGN
99+
E0 D0AE ; # CYRILLIC CAPITAL LETTER YU
100+
E1 D090 ; # CYRILLIC CAPITAL LETTER A
101+
E2 D091 ; # CYRILLIC CAPITAL LETTER BE
102+
E3 D0A6 ; # CYRILLIC CAPITAL LETTER TSE
103+
E4 D094 ; # CYRILLIC CAPITAL LETTER DE
104+
E5 D095 ; # CYRILLIC CAPITAL LETTER IE
105+
E6 D0A4 ; # CYRILLIC CAPITAL LETTER EF
106+
E7 D093 ; # CYRILLIC CAPITAL LETTER GHE
107+
E8 D0A5 ; # CYRILLIC CAPITAL LETTER HA
108+
E9 D098 ; # CYRILLIC CAPITAL LETTER I
109+
EA D099 ; # CYRILLIC CAPITAL LETTER SHORT I
110+
EB D09A ; # CYRILLIC CAPITAL LETTER KA
111+
EC D09B ; # CYRILLIC CAPITAL LETTER EL
112+
ED D09C ; # CYRILLIC CAPITAL LETTER EM
113+
EE D09D ; # CYRILLIC CAPITAL LETTER EN
114+
EF D09E ; # CYRILLIC CAPITAL LETTER O
115+
F0 D09F ; # CYRILLIC CAPITAL LETTER PE
116+
F1 D0AF ; # CYRILLIC CAPITAL LETTER YA
117+
F2 D0A0 ; # CYRILLIC CAPITAL LETTER ER
118+
F3 D0A1 ; # CYRILLIC CAPITAL LETTER ES
119+
F4 D0A2 ; # CYRILLIC CAPITAL LETTER TE
120+
F5 D0A3 ; # CYRILLIC CAPITAL LETTER U
121+
F6 D096 ; # CYRILLIC CAPITAL LETTER ZHE
122+
F7 D092 ; # CYRILLIC CAPITAL LETTER VE
123+
F8 D0AC ; # CYRILLIC CAPITAL LETTER SOFT SIGN
124+
F9 D0AB ; # CYRILLIC CAPITAL LETTER YERU
125+
FA D097 ; # CYRILLIC CAPITAL LETTER ZE
126+
FB D0A8 ; # CYRILLIC CAPITAL LETTER SHA
127+
FC D0AD ; # CYRILLIC CAPITAL LETTER E
128+
FD D0A9 ; # CYRILLIC CAPITAL LETTER SHCHA
129+
FE D0A7 ; # CYRILLIC CAPITAL LETTER CHE
130+
FF D0AA ; # CYRILLIC CAPITAL LETTER HARD SIGN
131+
}

‎contrib/unicode2nginx/unicode-to-nginx.pl

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/usr/bin/perl -w
2+
3+
# Convert unicode mappings to nginx configuration file format.
4+
5+
# You may find useful mappings in various places, including
6+
# unicode.org official site:
7+
#
8+
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP1251.TXT
9+
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT
10+
11+
# Needs perl 5.6 or later.
12+
13+
# Written by Maxim Dounin, [email protected]
14+
15+
###############################################################################
16+
17+
require 5.006;
18+
19+
while (<>) {
20+
# Skip comments and empty lines
21+
22+
next if /^#/;
23+
next if /^\s*$/;
24+
chomp;
25+
26+
# Convert mappings
27+
28+
if (/^\s*0x(..)\s*0x(....)\s*(#.*)/) {
29+
# Mapping <from-code> <unicode-code> "#" <unicode-name>
30+
my $cs_code = $1;
31+
my $un_code = $2;
32+
my $un_name = $3;
33+
34+
# Produce UTF-8 sequence from character code;
35+
36+
my $un_utf8 = join('', map { sprintf("%02X", $_) } unpack("C*", pack("U", hex($un_code))));
37+
38+
print " $cs_code $un_utf8 ; $un_name\n";
39+
40+
} else {
41+
warn "Unrecognized line: '$_'";
42+
}
43+
}
44+
45+
###############################################################################

0 commit comments

Comments
 (0)