Skip to content

Commit 966fd55

Browse files
author
Takashi Sato
committed
Merge r507346 from trunk:
Use the specified IPv4 prefix for documentation and examples (192.0.2.0/24) from RFC3330 rather than non-reserved public internet addresses and some RFC1918 addresses. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@654548 13f79535-47bb-0310-9956-ffa450edef68
1 parent 254c0ff commit 966fd55

8 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎docs/manual/bind.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
and port 8080 on another, use</p>
8181

8282
<example>
83-
Listen 192.170.2.1:80<br />
84-
Listen 192.170.2.5:8000
83+
Listen 192.0.2.1:80<br />
84+
Listen 192.0.2.5:8000
8585
</example>
8686

8787
<p>IPv6 addresses must be enclosed in square brackets, as in the
@@ -128,7 +128,7 @@
128128

129129
<example>
130130
Listen 0.0.0.0:80<br />
131-
Listen 192.170.2.1:80
131+
Listen 192.0.2.1:80
132132
</example>
133133

134134
<p>If your platform supports it and you want Apache to handle IPv4 and

‎docs/manual/bind.xml.de‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
Netzwerkinterfaces und Ports zu akzeptieren zu lassen, geben Sie an:</p>
8181

8282
<example>
83-
Listen 192.170.2.1:80<br />
84-
Listen 192.170.2.5:8000
83+
Listen 192.0.2.1:80<br />
84+
Listen 192.0.2.5:8000
8585
</example>
8686

8787
<p>IPv6-Adressen m&uuml;ssen wie im folgenden Beispiel in eckigen
@@ -134,7 +134,7 @@
134134

135135
<example>
136136
Listen 0.0.0.0:80<br />
137-
Listen 192.170.2.1:80
137+
Listen 192.0.2.1:80
138138
</example>
139139

140140
<p>Wenn Sie m&ouml;chten, dass der Apache IPv4- und IPv6-Verbindungen an

‎docs/manual/bind.xml.fr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
de deux couples d'interfaces et ports, utilisez :</p>
8484

8585
<example>
86-
Listen 192.170.2.1:80<br />
87-
Listen 192.170.2.5:8000
86+
Listen 192.0.2.1:80<br />
87+
Listen 192.0.2.5:8000
8888
</example>
8989

9090
<p>Les adresses IPv6 doivent &ecirc;tre entre crochets, comme dans
@@ -134,7 +134,7 @@
134134

135135
<example>
136136
Listen 0.0.0.0:80<br />
137-
Listen 192.170.2.1:80
137+
Listen 192.0.2.1:80
138138
</example>
139139

140140
<p>Si votre plateforme le supporte et si vous souhaitez qu'Apache g&egrave;re

‎docs/manual/bind.xml.ja‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
</p>
8080
8181
<example>
82-
Listen 192.170.2.1:80<br />
83-
Listen 192.170.2.5:8000
82+
Listen 192.0.2.1:80<br />
83+
Listen 192.0.2.5:8000
8484
</example>
8585
8686
<p>$B$H$7$^$9!#(B
@@ -129,7 +129,7 @@
129129
130130
<example>
131131
Listen 0.0.0.0:80<br />
132-
Listen 192.170.2.1:80
132+
Listen 192.0.2.1:80
133133
</example>
134134
135135
<p>$B>r7o$rK~$?$9%W%i%C%H%[!<%`$G!"(BApache $B$,(B

‎docs/manual/bind.xml.ko‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
하려면,</p>
7575

7676
<example>
77-
Listen 192.170.2.1:80<br />
78-
Listen 192.170.2.5:8000
77+
Listen 192.0.2.1:80<br />
78+
Listen 192.0.2.5:8000
7979
</example>
8080

8181
<p>IPv6 주소는 다음과 같이 대괄호로 묶어야 한다:</p>
@@ -118,7 +118,7 @@
118118

119119
<example>
120120
Listen 0.0.0.0:80<br />
121-
Listen 192.170.2.1:80
121+
Listen 192.0.2.1:80
122122
</example>
123123

124124
<p>플래폼에서 지원하며 아파치가 서로 다른 소켓으로 IPv4

‎docs/manual/dns-caveats.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@
5656
to this virtual host (prior to Apache version 1.2 the server
5757
would not even boot).</p>
5858

59-
<p>Suppose that <code>www.abc.dom</code> has address 10.0.0.1.
59+
<p>Suppose that <code>www.abc.dom</code> has address 192.0.2.1.
6060
Then consider this configuration snippet:</p>
6161

6262
<example>
63-
&lt;VirtualHost 10.0.0.1&gt; <br />
63+
&lt;VirtualHost 192.0.2.1&gt; <br />
6464
ServerAdmin webgirl@abc.dom <br />
6565
DocumentRoot /www/abc <br />
6666
&lt;/VirtualHost&gt;
@@ -79,7 +79,7 @@
7979
<p>Here is a snippet that avoids both of these problems:</p>
8080

8181
<example>
82-
&lt;VirtualHost 10.0.0.1&gt; <br />
82+
&lt;VirtualHost 192.0.2.1&gt; <br />
8383
ServerName www.abc.dom <br />
8484
ServerAdmin webgirl@abc.dom <br />
8585
DocumentRoot /www/abc <br />
@@ -115,18 +115,18 @@
115115
&lt;/VirtualHost&gt;
116116
</example>
117117

118-
<p>Suppose that you've assigned 10.0.0.1 to
119-
<code>www.abc.dom</code> and 10.0.0.2 to
118+
<p>Suppose that you've assigned 192.0.2.1 to
119+
<code>www.abc.dom</code> and 192.0.2.2 to
120120
<code>www.def.dom</code>. Furthermore, suppose that
121121
<code>def.dom</code> has control of their own DNS. With this
122122
config you have put <code>def.dom</code> into a position where
123123
they can steal all traffic destined to <code>abc.dom</code>. To
124124
do so, all they have to do is set <code>www.def.dom</code> to
125-
10.0.0.1. Since they control their own DNS you can't stop them
125+
192.0.2.1. Since they control their own DNS you can't stop them
126126
from pointing the <code>www.def.dom</code> record wherever they
127127
wish.</p>
128128

129-
<p>Requests coming in to 10.0.0.1 (including all those where
129+
<p>Requests coming in to 192.0.2.1 (including all those where
130130
users typed in URLs of the form
131131
<code>http://www.abc.dom/whatever</code>) will all be served by
132132
the <code>def.dom</code> virtual host. To better understand why

‎docs/manual/dns-caveats.xml.ja‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@
5555
$B$=$7$F!"$=$N%P!<%A%c%k%[%9%H$KBP$9$k%R%C%H$K$O1~Ez$,$J$5$l$^$;$s(B
5656
(Apache 1.2 $B0JA0$G$O5/F0$9$i$7$^$;$s(B)$B!#(B</p>
5757
58-
<p><code>www.abc.dom</code> $B$N%"%I%l%9$,(B 10.0.0.1
58+
<p><code>www.abc.dom</code> $B$N%"%I%l%9$,(B 192.0.2.1
5959
$B$@$H$7$^$9!#$G$O!"<!$N@_Dj$K$D$$$F9M$($F$_$^$7$g$&!#(B</p>
6060
6161
<example>
62-
&lt;VirtualHost 10.0.0.1&gt; <br />
62+
&lt;VirtualHost 192.0.2.1&gt; <br />
6363
ServerAdmin webgirl@abc.dom <br />
6464
DocumentRoot /www/abc <br />
6565
&lt;/VirtualHost&gt;
@@ -78,7 +78,7 @@
7878
<p>$B<!$NNc$O>e5-$NLdBj$r2r7h$7$F$$$^$9!#(B</p>
7979
8080
<example>
81-
&lt;VirtualHost 10.0.0.1&gt; <br />
81+
&lt;VirtualHost 192.0.2.1&gt; <br />
8282
ServerName www.abc.dom <br />
8383
ServerAdmin webgirl@abc.dom <br />
8484
DocumentRoot /www/abc <br />
@@ -113,18 +113,18 @@
113113
&lt;/VirtualHost&gt;
114114
</example>
115115
116-
<p>10.0.0.1 $B$r(B <code>www.abc.dom</code> $B$K!"(B
117-
10.0.0.2 $B$r(B <code>www.def.dom</code> $B$K3d$jEv$F$F$$$k$H$7$^$9!#(B
116+
<p>192.0.2.1 $B$r(B <code>www.abc.dom</code> $B$K!"(B
117+
192.0.2.2 $B$r(B <code>www.def.dom</code> $B$K3d$jEv$F$F$$$k$H$7$^$9!#(B
118118
$B$^$?!"(B<code>def.dom</code> $B$O8\5R<+?H$N(B DNS
119119
$B$N@)8f2<$K$"$k$H$7$^$9!#$3$N@_Dj$G!"(B<code>abc.dom</code>
120120
$B$K8~$1$i$l$?%H%i%U%#%C%/A4$F$rC%$&$3$H$,$G$-$k0LCV$K(B
121121
<code>def.dom</code> $B$r@_CV$G$-$F$$$^$9!#8e$OC1$K(B
122-
<code>www.def.dom</code> $B$,(B 10.0.0.1 $B$r;2>H$9$k$h$&$K(B
122+
<code>www.def.dom</code> $B$,(B 192.0.2.1 $B$r;2>H$9$k$h$&$K(B
123123
$B@_Dj$9$k$@$1$G$9!#(BDNS $B$O8\5RB&$N(B DNS $B$G%3%s%H%m!<%k$5$l$F$$$k$N$G!"(B
124124
<code>www.def.dom</code> $B%l%3!<%I$,9%$-$J>l=j$r;X$9$h$&$K(B
125125
$B@_Dj$G$-$F$7$^$&$N$r;_$a$5$;$k$3$H$,$G$-$^$;$s!#(B</p>
126126
127-
<p>10.0.0.1 $B$KBP$9$k%j%/%(%9%H(B
127+
<p>192.0.2.1 $B$KBP$9$k%j%/%(%9%H(B
128128
(<code>http://www.abc.dom/whatever</code> $B7A<0$N(B URL
129129
$B$rF~NO$7$?%f!<%6$+$i$N$b$NA4$F$r4^$_$^$9(B)
130130
$B$O!"(B<code>def.dom</code> $B%P!<%A%c%k%[%9%H$G1~Ez$5$l$^$9!#(B

‎docs/manual/dns-caveats.xml.ko‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@
5353
이 가상호스트는 요청에 응답할 수 없다. (아파치 1.2 이전
5454
버전에서는 심지어 서버가 부팅도 안한다.)</p>
5555

56-
<p><code>www.abc.dom</code>의 주소가 10.0.0.1이라고 가정하자.
56+
<p><code>www.abc.dom</code>의 주소가 192.0.2.1이라고 가정하자.
5757
그리고 다음 설정을 보라:</p>
5858

5959
<example>
60-
&lt;VirtualHost 10.0.0.1&gt; <br />
60+
&lt;VirtualHost 192.0.2.1&gt; <br />
6161
ServerAdmin webgirl@abc.dom <br />
6262
DocumentRoot /www/abc <br />
6363
&lt;/VirtualHost&gt;
@@ -74,7 +74,7 @@
7474
<p>아래 경우 이 두가지 문제가 없다.</p>
7575

7676
<example>
77-
&lt;VirtualHost 10.0.0.1&gt; <br />
77+
&lt;VirtualHost 192.0.2.1&gt; <br />
7878
ServerName www.abc.dom <br />
7979
ServerAdmin webgirl@abc.dom <br />
8080
DocumentRoot /www/abc <br />
@@ -107,18 +107,18 @@
107107
&lt;/VirtualHost&gt;
108108
</example>
109109

110-
<p>당신이 <code>www.abc.dom</code>에 10.0.0.1,
111-
<code>www.def.dom</code>에 10.0.0.2를 할당했다고 하자.
110+
<p>당신이 <code>www.abc.dom</code>에 192.0.2.1,
111+
<code>www.def.dom</code>에 192.0.2.2를 할당했다고 하자.
112112
또, <code>def.dom</code>은 자체 DNS를 사용한다고 가정하자.
113113
이 설정과 함께 <code>def.dom</code>을 <code>abc.dom</code>으로
114114
가는 모든 통신을 가로챌 수 있는 장소에 두었다. 그렇다면 그들은
115-
<code>www.def.dom</code>을 10.0.0.1로 설정하기만 하면 된다.
115+
<code>www.def.dom</code>을 192.0.2.1로 설정하기만 하면 된다.
116116
그들이 자체 DNS를 사용하기때문에 당신은 그들이 원하는데로
117117
<code>www.def.dom</code> 레코드를 설정하는 것을 막을 수
118118
없다.</p>
119119

120120
<p>(사용자가 <code>http://www.abc.dom/whatever</code> 형식의
121-
URL을 입력하는 경우를 포함하여) 10.0.0.1로 오는 모든 요청을
121+
URL을 입력하는 경우를 포함하여) 192.0.2.1로 오는 모든 요청을
122122
<code>def.dom</code> 가상호스트가 서비스하게 된다. 왜 이런
123123
일이 일어나는지 이해하려면 아파치가 어떻게 가상호스트로
124124
오는 요청을 처리하는지에 대한 설명이 필요하다.

0 commit comments

Comments
 (0)