From aea01f8d69f9a53be2127a7c7c859e22925962e4 Mon Sep 17 00:00:00 2001 From: Colm MacCarthaigh Date: Wed, 14 Feb 2007 01:34:25 +0000 Subject: [PATCH] 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/trunk@507346 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/bind.xml | 6 +++--- docs/manual/bind.xml.de | 6 +++--- docs/manual/bind.xml.fr | 6 +++--- docs/manual/bind.xml.ja | 6 +++--- docs/manual/bind.xml.ko | 6 +++--- docs/manual/dns-caveats.xml | 14 +++++++------- docs/manual/dns-caveats.xml.ja | 14 +++++++------- docs/manual/dns-caveats.xml.ko | 14 +++++++------- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/docs/manual/bind.xml b/docs/manual/bind.xml index 428df9b9f0..b5c72a98c8 100644 --- a/docs/manual/bind.xml +++ b/docs/manual/bind.xml @@ -80,8 +80,8 @@ and port 8080 on another, use

- Listen 192.170.2.1:80
- Listen 192.170.2.5:8000 + Listen 192.0.2.1:80
+ Listen 192.0.2.5:8000

IPv6 addresses must be enclosed in square brackets, as in the @@ -128,7 +128,7 @@ Listen 0.0.0.0:80
- Listen 192.170.2.1:80 + Listen 192.0.2.1:80

If your platform supports it and you want Apache to handle IPv4 and diff --git a/docs/manual/bind.xml.de b/docs/manual/bind.xml.de index 8be316336d..bc9873d0a8 100644 --- a/docs/manual/bind.xml.de +++ b/docs/manual/bind.xml.de @@ -82,8 +82,8 @@ Sie an:

- Listen 192.170.2.1:80
- Listen 192.170.2.5:8000 + Listen 192.0.2.1:80
+ Listen 192.0.2.5:8000

IPv6-Adressen müssen wie im folgenden Beispiel in eckigen @@ -136,7 +136,7 @@ Listen 0.0.0.0:80
- Listen 192.170.2.1:80 + Listen 192.0.2.1:80

Wenn Sie möchten, dass der Apache IPv4- und IPv6-Verbindungen an diff --git a/docs/manual/bind.xml.fr b/docs/manual/bind.xml.fr index 4b493f23f4..7ba2507f84 100644 --- a/docs/manual/bind.xml.fr +++ b/docs/manual/bind.xml.fr @@ -84,8 +84,8 @@ adresses + ports, spécifiez :

- Listen 192.170.2.1:80
- Listen 192.170.2.5:8000 + Listen 192.0.2.1:80
+ Listen 192.0.2.5:8000

Les adresses IPv6 sont acceptées, pourvu qu'elles soient spécifiées @@ -143,7 +143,7 @@ Listen 0.0.0.0:80
- Listen 192.170.2.1:80 + Listen 192.0.2.1:80

Pour qu'Apache manipule les connexions IPv4 et IPv6 sur des interfaces diff --git a/docs/manual/bind.xml.ja b/docs/manual/bind.xml.ja index c39b107df1..0f152abdb7 100644 --- a/docs/manual/bind.xml.ja +++ b/docs/manual/bind.xml.ja @@ -79,8 +79,8 @@

- Listen 192.170.2.1:80
- Listen 192.170.2.5:8000 + Listen 192.0.2.1:80
+ Listen 192.0.2.5:8000

$B$H$7$^$9!#(B @@ -129,7 +129,7 @@ Listen 0.0.0.0:80
- Listen 192.170.2.1:80 + Listen 192.0.2.1:80

$B>r7o$rK~$?$9%W%i%C%H%[!<%`$G!"(BApache $B$,(B diff --git a/docs/manual/bind.xml.ko b/docs/manual/bind.xml.ko index ee07dfb845..6d59c7c109 100644 --- a/docs/manual/bind.xml.ko +++ b/docs/manual/bind.xml.ko @@ -74,8 +74,8 @@ ÇÏ·Á¸é,

- Listen 192.170.2.1:80
- Listen 192.170.2.5:8000 + Listen 192.0.2.1:80
+ Listen 192.0.2.5:8000

IPv6 ÁÖ¼Ò´Â ´ÙÀ½°ú °°ÀÌ ´ë°ýÈ£·Î ¹­¾î¾ß ÇÑ´Ù:

@@ -118,7 +118,7 @@ Listen 0.0.0.0:80
- Listen 192.170.2.1:80 + Listen 192.0.2.1:80

Ç÷¡Æû¿¡¼­ Áö¿øÇÏ¸ç ¾ÆÆÄÄ¡°¡ ¼­·Î ´Ù¸¥ ¼ÒÄÏÀ¸·Î IPv4 diff --git a/docs/manual/dns-caveats.xml b/docs/manual/dns-caveats.xml index 44a569141c..df7ce15dde 100644 --- a/docs/manual/dns-caveats.xml +++ b/docs/manual/dns-caveats.xml @@ -56,11 +56,11 @@ to this virtual host (prior to Apache version 1.2 the server would not even boot).

-

Suppose that www.abc.dom has address 10.0.0.1. +

Suppose that www.abc.dom has address 192.0.2.1. Then consider this configuration snippet:

- <VirtualHost 10.0.0.1>
+ <VirtualHost 192.0.2.1>
ServerAdmin webgirl@abc.dom
DocumentRoot /www/abc
</VirtualHost> @@ -79,7 +79,7 @@

Here is a snippet that avoids both of these problems:

- <VirtualHost 10.0.0.1>
+ <VirtualHost 192.0.2.1>
ServerName www.abc.dom
ServerAdmin webgirl@abc.dom
DocumentRoot /www/abc
@@ -119,18 +119,18 @@ </VirtualHost> -

Suppose that you've assigned 10.0.0.1 to - www.abc.dom and 10.0.0.2 to +

Suppose that you've assigned 192.0.2.1 to + www.abc.dom and 192.0.2.2 to www.def.dom. Furthermore, suppose that def.dom has control of their own DNS. With this config you have put def.dom into a position where they can steal all traffic destined to abc.dom. To do so, all they have to do is set www.def.dom to - 10.0.0.1. Since they control their own DNS you can't stop them + 192.0.2.1. Since they control their own DNS you can't stop them from pointing the www.def.dom record wherever they wish.

-

Requests coming in to 10.0.0.1 (including all those where +

Requests coming in to 192.0.2.1 (including all those where users typed in URLs of the form http://www.abc.dom/whatever) will all be served by the def.dom virtual host. To better understand why diff --git a/docs/manual/dns-caveats.xml.ja b/docs/manual/dns-caveats.xml.ja index b2f8c2b52d..18126a2208 100644 --- a/docs/manual/dns-caveats.xml.ja +++ b/docs/manual/dns-caveats.xml.ja @@ -55,11 +55,11 @@ $B$=$7$F!"$=$N%P!<%A%c%k%[%9%H$KBP$9$k%R%C%H$K$O1~Ez$,$J$5$l$^$;$s(B (Apache 1.2 $B0JA0$G$O5/F0$9$i$7$^$;$s(B)$B!#(B

-

www.abc.dom $B$N%"%I%l%9$,(B 10.0.0.1 +

www.abc.dom $B$N%"%I%l%9$,(B 192.0.2.1 $B$@$H$7$^$9!#$G$O!" - <VirtualHost 10.0.0.1>
+ <VirtualHost 192.0.2.1>
ServerAdmin webgirl@abc.dom
DocumentRoot /www/abc
</VirtualHost> @@ -78,7 +78,7 @@

$Be5-$NLdBj$r2r7h$7$F$$$^$9!#(B

- <VirtualHost 10.0.0.1>
+ <VirtualHost 192.0.2.1>
ServerName www.abc.dom
ServerAdmin webgirl@abc.dom
DocumentRoot /www/abc
@@ -113,18 +113,18 @@ </VirtualHost> -

10.0.0.1 $B$r(B www.abc.dom $B$K!"(B - 10.0.0.2 $B$r(B www.def.dom $B$K3d$jEv$F$F$$$k$H$7$^$9!#(B +

192.0.2.1 $B$r(B www.abc.dom $B$K!"(B + 192.0.2.2 $B$r(B www.def.dom $B$K3d$jEv$F$F$$$k$H$7$^$9!#(B $B$^$?!"(Bdef.dom $B$O8\5R<+?H$N(B DNS $B$N@)8f2<$K$"$k$H$7$^$9!#$3$N@_Dj$G!"(Babc.dom $B$K8~$1$i$l$?%H%i%U%#%C%/A4$F$rC%$&$3$H$,$G$-$k0LCV$K(B def.dom $B$r@_CV$G$-$F$$$^$9!#8e$OC1$K(B - www.def.dom $B$,(B 10.0.0.1 $B$r;2>H$9$k$h$&$K(B + www.def.dom $B$,(B 192.0.2.1 $B$r;2>H$9$k$h$&$K(B $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 www.def.dom $B%l%3!<%I$,9%$-$J>l=j$r;X$9$h$&$K(B $B@_Dj$G$-$F$7$^$&$N$r;_$a$5$;$k$3$H$,$G$-$^$;$s!#(B

-

10.0.0.1 $B$KBP$9$k%j%/%(%9%H(B +

192.0.2.1 $B$KBP$9$k%j%/%(%9%H(B (http://www.abc.dom/whatever $B7A<0$N(B URL $B$rF~NO$7$?%f!<%6$+$i$N$b$NA4$F$r4^$_$^$9(B) $B$O!"(Bdef.dom $B%P!<%A%c%k%[%9%H$G1~Ez$5$l$^$9!#(B diff --git a/docs/manual/dns-caveats.xml.ko b/docs/manual/dns-caveats.xml.ko index 691803cbe3..06afbbd0c4 100644 --- a/docs/manual/dns-caveats.xml.ko +++ b/docs/manual/dns-caveats.xml.ko @@ -53,11 +53,11 @@ ÀÌ °¡»óÈ£½ºÆ®´Â ¿äû¿¡ ÀÀ´äÇÒ ¼ö ¾ø´Ù. (¾ÆÆÄÄ¡ 1.2 ÀÌÀü ¹öÀü¿¡¼­´Â ½ÉÁö¾î ¼­¹ö°¡ ºÎÆõµ ¾ÈÇÑ´Ù.)

-

www.abc.domÀÇ ÁÖ¼Ò°¡ 10.0.0.1À̶ó°í °¡Á¤ÇÏÀÚ. +

www.abc.domÀÇ ÁÖ¼Ò°¡ 192.0.2.1À̶ó°í °¡Á¤ÇÏÀÚ. ±×¸®°í ´ÙÀ½ ¼³Á¤À» º¸¶ó:

- <VirtualHost 10.0.0.1>
+ <VirtualHost 192.0.2.1>
ServerAdmin webgirl@abc.dom
DocumentRoot /www/abc
</VirtualHost> @@ -74,7 +74,7 @@

¾Æ·¡ °æ¿ì ÀÌ µÎ°¡Áö ¹®Á¦°¡ ¾ø´Ù.

- <VirtualHost 10.0.0.1>
+ <VirtualHost 192.0.2.1>
ServerName www.abc.dom
ServerAdmin webgirl@abc.dom
DocumentRoot /www/abc
@@ -107,18 +107,18 @@ </VirtualHost> -

´ç½ÅÀÌ www.abc.dom¿¡ 10.0.0.1, - www.def.dom¿¡ 10.0.0.2¸¦ ÇÒ´çÇß´Ù°í ÇÏÀÚ. +

´ç½ÅÀÌ www.abc.dom¿¡ 192.0.2.1, + www.def.dom¿¡ 192.0.2.2¸¦ ÇÒ´çÇß´Ù°í ÇÏÀÚ. ¶Ç, def.domÀº ÀÚü DNS¸¦ »ç¿ëÇÑ´Ù°í °¡Á¤ÇÏÀÚ. ÀÌ ¼³Á¤°ú ÇÔ²² def.domÀ» abc.domÀ¸·Î °¡´Â ¸ðµç Åë½ÅÀ» °¡·Îç ¼ö ÀÖ´Â Àå¼Ò¿¡ µÎ¾ú´Ù. ±×·¸´Ù¸é ±×µéÀº - www.def.domÀ» 10.0.0.1·Î ¼³Á¤Çϱ⸸ ÇÏ¸é µÈ´Ù. + www.def.domÀ» 192.0.2.1·Î ¼³Á¤Çϱ⸸ ÇÏ¸é µÈ´Ù. ±×µéÀÌ ÀÚü DNS¸¦ »ç¿ëÇϱ⶧¹®¿¡ ´ç½ÅÀº ±×µéÀÌ ¿øÇϴµ¥·Î www.def.dom ·¹Äڵ带 ¼³Á¤ÇÏ´Â °ÍÀ» ¸·À» ¼ö ¾ø´Ù.

(»ç¿ëÀÚ°¡ http://www.abc.dom/whatever Çü½ÄÀÇ - URLÀ» ÀÔ·ÂÇÏ´Â °æ¿ì¸¦ Æ÷ÇÔÇÏ¿©) 10.0.0.1·Î ¿À´Â ¸ðµç ¿äûÀ» + URLÀ» ÀÔ·ÂÇÏ´Â °æ¿ì¸¦ Æ÷ÇÔÇÏ¿©) 192.0.2.1·Î ¿À´Â ¸ðµç ¿äûÀ» def.dom °¡»óÈ£½ºÆ®°¡ ¼­ºñ½ºÇÏ°Ô µÈ´Ù. ¿Ö ÀÌ·± ÀÏÀÌ ÀϾ´ÂÁö ÀÌÇØÇÏ·Á¸é ¾ÆÆÄÄ¡°¡ ¾î¶»°Ô °¡»óÈ£½ºÆ®·Î ¿À´Â ¿äûÀ» ó¸®ÇÏ´ÂÁö¿¡ ´ëÇÑ ¼³¸íÀÌ ÇÊ¿äÇÏ´Ù. -- 2.40.0