Backport: Use HTML 2.0 <hr> for error pages. PR 30732

PR:
Obtained from:
Submitted by:	nd
Reviewed by:	nd, jorton, trawick, jerenkrantz

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

diff --git a/CHANGES b/CHANGES
index b02c228bb69a2278ac661cb718e724a83d157871..d956cfc6bc45f1006939fb1ac2db648033e5c202 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 Changes with Apache 2.0.52
 
+  *) Use HTML 2.0 <hr> for error pages. PR 30732 [André Malo]
+
   *) Fix the global mutex crash when the global mutex is never allocated
      due to disabled/empty caches. [Jess Holle <jessh ptc.com>]
 

diff --git a/STATUS b/STATUS
index 2d35bc4609b2d79e73ae11750ce2581ccbaa8e0f..17df1a5ed5a2dd54c6d22ae5785e29b1bb44072e 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/09/23 17:08:25 $]
+Last modified at [$Date: 2004/09/23 17:27:20 $]
 
 Release:
 
@@ -100,10 +100,6 @@ PATCHES TO BACKPORT FROM 2.1
            in this patch.
        minfrin: The excess "else" condition has been removed in v1.10.
 
-    *) Use HTML 2.0 <hr> for error pages. PR 30732
-         modules/http/http_protocol.c: r1.483
-       +1: nd, jorton, trawick, jerenkrantz
-
     *) mod_rewrite: Fix 0 bytes write into random memory position. PR 31036.
        (2.0 + 1.3)
          http://www.apache.org/~nd/dbmmap_1.3.patch

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index f99bec83d7ca874748eb56cdceb949f3140dab7e..d9e56ff4c4ec012c073ecc9c55a833946cd2a6fa 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -2411,7 +2411,7 @@ AP_DECLARE(void) ap_send_error_response(request_rec *r, int recursive_error)
                       "\nerror was encountered while trying to use an "
                       "ErrorDocument to handle the request.</p>\n", NULL);
         }
-        ap_rvputs_proto_in_ascii(r, ap_psignature("<hr />\n", r), NULL);
+        ap_rvputs_proto_in_ascii(r, ap_psignature("<hr>\n", r), NULL);
         ap_rvputs_proto_in_ascii(r, "</body></html>\n", NULL);
     }
     ap_finalize_request_protocol(r);