From: Daniel Gruno Date: Tue, 1 May 2012 12:13:02 +0000 (+0000) Subject: Add syntax highlighting to this doc as well X-Git-Tag: 2.5.0-alpha~6929 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fbc52884eabb2084baa8f78fa0a1cf67b4c4c57;p=thirdparty%2Fapache%2Fhttpd.git Add syntax highlighting to this doc as well git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1332626 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/dns-caveats.html.en b/docs/manual/dns-caveats.html.en index 7b8ed2d9e79..2e4e3444d6e 100644 --- a/docs/manual/dns-caveats.html.en +++ b/docs/manual/dns-caveats.html.en @@ -46,13 +46,14 @@

A Simple Example

-

- # This is a misconfiguration example, do not use on your server
- <VirtualHost www.example.dom>
- ServerAdmin webgirl@example.dom
- DocumentRoot /www/example
- </VirtualHost> -

+ 
+# This is a misconfiguration example, do not use on your server
+<VirtualHost www.example.dom>
+  ServerAdmin webgirl@example.dom
+  DocumentRoot /www/example
+</VirtualHost>
+
+

In order for the server to function properly, it absolutely needs to have two pieces of information about each virtual host: the @@ -68,13 +69,14 @@

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

-

- # This is a misconfiguration example, do not use on your server
- <VirtualHost 192.0.2.1>
- ServerAdmin webgirl@example.dom
- DocumentRoot /www/example
- </VirtualHost> -

+ 
+# This is a misconfiguration example, do not use on your server
+<VirtualHost 192.0.2.1>
+  ServerAdmin webgirl@example.dom
+  DocumentRoot /www/example
+</VirtualHost>
+
+

This time httpd needs to use reverse DNS to find the ServerName for this virtualhost. If that reverse @@ -87,13 +89,14 @@

Here is a snippet that avoids both of these problems:

-

- <VirtualHost 192.0.2.1>
- ServerName www.example.dom
- ServerAdmin webgirl@example.dom
- DocumentRoot /www/example
- </VirtualHost> -

+ 
+<VirtualHost 192.0.2.1>
+  ServerName www.example.dom
+  ServerAdmin webgirl@example.dom
+  DocumentRoot /www/example
+</VirtualHost>
+
+
top

Denial of Service

@@ -101,21 +104,17 @@

Consider this configuration snippet:

-

- <VirtualHost www.example1.dom>
- - ServerAdmin webgirl@example1.dom
- DocumentRoot /www/example1
- - </VirtualHost>
-
- <VirtualHost www.example2.dom>
- - ServerAdmin webguy@example2.dom
- DocumentRoot /www/example2
- - </VirtualHost> -

+ 
+<VirtualHost www.example1.dom>
+  ServerAdmin webgirl@example1.dom
+  DocumentRoot /www/example1
+</VirtualHost>
+<VirtualHost www.example2.dom>
+  ServerAdmin webguy@example2.dom
+  DocumentRoot /www/example2
+</VirtualHost>
+
+

Suppose that you've assigned 192.0.2.1 to www.example1.dom and 192.0.2.2 to diff --git a/docs/manual/dns-caveats.xml b/docs/manual/dns-caveats.xml index c715450f10c..2ff924b1028 100644 --- a/docs/manual/dns-caveats.xml +++ b/docs/manual/dns-caveats.xml @@ -37,13 +37,13 @@

A Simple Example - - # This is a misconfiguration example, do not use on your server
- <VirtualHost www.example.dom>
- ServerAdmin webgirl@example.dom
- DocumentRoot /www/example
- </VirtualHost> - + +# This is a misconfiguration example, do not use on your server +<VirtualHost www.example.dom> + ServerAdmin webgirl@example.dom + DocumentRoot /www/example +</VirtualHost> +

In order for the server to function properly, it absolutely needs to have two pieces of information about each virtual host: the @@ -59,13 +59,13 @@

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

- - # This is a misconfiguration example, do not use on your server
- <VirtualHost 192.0.2.1>
- ServerAdmin webgirl@example.dom
- DocumentRoot /www/example
- </VirtualHost> - + +# This is a misconfiguration example, do not use on your server +<VirtualHost 192.0.2.1> + ServerAdmin webgirl@example.dom + DocumentRoot /www/example +</VirtualHost> +

This time httpd needs to use reverse DNS to find the ServerName for this virtualhost. If that reverse @@ -78,13 +78,13 @@

Here is a snippet that avoids both of these problems:

- - <VirtualHost 192.0.2.1>
- ServerName www.example.dom
- ServerAdmin webgirl@example.dom
- DocumentRoot /www/example
- </VirtualHost> - + +<VirtualHost 192.0.2.1> + ServerName www.example.dom + ServerAdmin webgirl@example.dom + DocumentRoot /www/example +</VirtualHost> +
@@ -92,21 +92,16 @@

Consider this configuration snippet:

- - <VirtualHost www.example1.dom>
- - ServerAdmin webgirl@example1.dom
- DocumentRoot /www/example1
- - </VirtualHost>
-
- <VirtualHost www.example2.dom>
- - ServerAdmin webguy@example2.dom
- DocumentRoot /www/example2
- - </VirtualHost> - + +<VirtualHost www.example1.dom> + ServerAdmin webgirl@example1.dom + DocumentRoot /www/example1 +</VirtualHost> +<VirtualHost www.example2.dom> + ServerAdmin webguy@example2.dom + DocumentRoot /www/example2 +</VirtualHost> +

Suppose that you've assigned 192.0.2.1 to www.example1.dom and 192.0.2.2 to