Added encoding="none" for the ssi-output of REDIRECT_ERROR_NOTES.

This fixes the output of HTML-tags through the above env-var (e.g.
<p> instead of &lt;p&gt;).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96524 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/error/HTTP_BAD_GATEWAY.html.var b/docs/error/HTTP_BAD_GATEWAY.html.var
index 94a054d397aa89d4eff2dda6a7edca15c7f2e7b0..dca9177d2d5676a1faf3ce7a265aafb4c1f31f31 100644 (file)
--- a/docs/error/HTTP_BAD_GATEWAY.html.var
+++ b/docs/error/HTTP_BAD_GATEWAY.html.var
@@ -10,7 +10,7 @@ Body:----------de--
 
   <!--#if expr="$REDIRECT_ERROR_NOTES" -->
     <!--#include virtual="include/spacer.html" -->
-    <!--#echo var="REDIRECT_ERROR_NOTES" -->
+    <!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
   <!--#endif -->
      
 <!--#include virtual="include/bottom.html" -->
@@ -27,7 +27,7 @@ Body:----------en--
 
   <!--#if expr="$REDIRECT_ERROR_NOTES" -->
     <!--#include virtual="include/spacer.html" -->
-    <!--#echo var="REDIRECT_ERROR_NOTES" -->
+    <!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
   <!--#endif -->
     
 <!--#include virtual="include/bottom.html" -->
@@ -45,7 +45,7 @@ Body:----------es--
 
   <!--#if expr="$REDIRECT_ERROR_NOTES" -->
     <!--#include virtual="include/spacer.html" -->
-    <!--#echo var="REDIRECT_ERROR_NOTES" -->
+    <!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
   <!--#endif -->
     
 <!--#include virtual="include/bottom.html" -->
@@ -63,7 +63,7 @@ Body:----------fr--
 
   <!--#if expr="$REDIRECT_ERROR_NOTES" -->
     <!--#include virtual="include/spacer.html" -->
-    <!--#echo var="REDIRECT_ERROR_NOTES" -->
+    <!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
   <!--#endif -->
 
 <!--#include virtual="include/bottom.html" -->   
@@ -81,7 +81,7 @@ Body:----------nl--
 
   <!--#if expr="$REDIRECT_ERROR_NOTES" -->
     <!--#include virtual="include/spacer.html" -->
-    <!--#echo var="REDIRECT_ERROR_NOTES" -->
+    <!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
   <!--#endif -->
 
 <!--#include virtual="include/bottom.html" -->
@@ -99,7 +99,7 @@ Body:----------sv--
 
   <!--#if expr="$REDIRECT_ERROR_NOTES" -->
     <!--#include virtual="include/spacer.html" -->
-    <!--#echo var="REDIRECT_ERROR_NOTES" -->
+    <!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
   <!--#endif -->
 
 <!--#include virtual="include/bottom.html" -->   
@@ -117,7 +117,7 @@ Body:----------it--
 
   <!--#if expr="$REDIRECT_ERROR_NOTES" -->
     <!--#include virtual="include/spacer.html" -->
-    <!--#echo var="REDIRECT_ERROR_NOTES" -->
+    <!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
   <!--#endif -->
 
 <!--#include virtual="include/bottom.html" -->

diff --git a/docs/error/HTTP_INTERNAL_SERVER_ERROR.html.var b/docs/error/HTTP_INTERNAL_SERVER_ERROR.html.var
index d26227ed1b0219761e13ad04dc9b07e2f8b3464d..d6f636a52b0743f53ab2f219ac9467816c10459a 100644 (file)
--- a/docs/error/HTTP_INTERNAL_SERVER_ERROR.html.var
+++ b/docs/error/HTTP_INTERNAL_SERVER_ERROR.html.var
@@ -13,7 +13,7 @@ Body:----------de--
     <!--#include virtual="include/spacer.html" -->
 
     Fehlermeldung:
-    <br /><!--#echo var="REDIRECT_ERROR_NOTES" -->
+    <br /><!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
 
   <!--#else -->
 
@@ -41,7 +41,7 @@ Body:----------en--
     <!--#include virtual="include/spacer.html" -->
 
     Error message:
-    <br /><!--#echo var="REDIRECT_ERROR_NOTES" -->
+    <br /><!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
 
   <!--#else -->
 
@@ -69,7 +69,7 @@ Body:----------es--
     <!--#include virtual="include/spacer.html" -->
 
     Mensaje de error:
-    <br /><!--#echo var="REDIRECT_ERROR_NOTES" -->
+    <br /><!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
 
   <!--#else -->
 
@@ -99,7 +99,7 @@ Body:----------fr--
     <!--#include virtual="include/spacer.html" -->
 
     Message d'erreur:
-    <br /><!--#echo var="REDIRECT_ERROR_NOTES" -->
+    <br /><!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
 
   <!--#else -->
 
@@ -125,7 +125,7 @@ Body:----------nl--
     <!--#include virtual="include/spacer.html" -->
 
     Foutbericht:
-    <br /><!--#echo var="REDIRECT_ERROR_NOTES" -->
+    <br /><!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
 
   <!--#else -->
 
@@ -153,7 +153,7 @@ Body:----------sv--
     <!--#include virtual="include/spacer.html" -->
 
     Felmeddelande:
-    <br /><!--#echo var="REDIRECT_ERROR_NOTES" -->
+    <br /><!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
 
   <!--#else -->
 
@@ -181,7 +181,7 @@ Body:----------it--
     <!--#include virtual="include/spacer.html" -->
 
     Messaggio di errore:
-    <br /><!--#echo var="REDIRECT_ERROR_NOTES" -->
+    <br /><!--#echo encoding="none" var="REDIRECT_ERROR_NOTES" -->
 
   <!--#else -->
 

diff --git a/docs/error/include/top.html b/docs/error/include/top.html
index ec25b8adbc84d4f0c776a8b9c14a26dcc2675c8c..7f69e5815c711ed9a02cfd06d302c29b33ebf6e6 100644 (file)
--- a/docs/error/include/top.html
+++ b/docs/error/include/top.html
@@ -4,10 +4,10 @@
 <!--#if expr="! $CHARACTER_ENCODING" -->
 <!--#set var="CHARACTER_ENCODING" value="ISO-8859-1" -->
 <!--#endif -->
-<?xml version="1.0" encoding="<!--#echo var="CHARACTER_ENCODING" -->"?>
+<?xml version="1.0" encoding="<!--#echo encoding="none" var="CHARACTER_ENCODING" -->"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<!--#echo var="CONTENT_LANGUAGE" -->">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<!--#echo encoding="none" var="CONTENT_LANGUAGE" -->">
 <head>
 <title><!--#echo var="TITLE" --></title>
 <link rev="made" href="mailto:<!--#echo encoding="none" var="SERVER_ADMIN" -->" />