httpd-2.0.45-encode.patch

   1
   2 * don't HTML-escape the SERVER_NAME variable
   3 * do escape SERVER_NAME in error docs
   4 * remove dates from error pages (#86474), since they won't be in the right
   5 language
   6
   7 --- httpd-2.0.45/docs/error/include/bottom.html.encode  2003-04-28 11:40:00.000000000 +0100
   8 +++ httpd-2.0.45/docs/error/include/bottom.html 2003-04-28 11:32:42.000000000 +0100
   9 @@ -5,10 +5,8 @@
  10
  11  <h2>Error <!--#echo encoding="none" var="REDIRECT_STATUS" --></h2>
  12  <address>
  13 -  <a href="/"><!--#echo var="SERVER_NAME" --></a><br />
  14 -  <!--#config timefmt="%c" -->
  15 -  <span><!--#echo var="DATE_LOCAL" --><br />
  16 -  <!--#echo var="SERVER_SOFTWARE" --></span>
  17 +  <a href="/"><!--#echo encoding="entity" var="SERVER_NAME" --></a><br />
  18 +  <span><!--#echo var="SERVER_SOFTWARE" --></span>
  19  </address>
  20  </body>
  21  </html>
  22 --- httpd-2.0.45/server/util_script.c.encode    2003-04-28 11:39:45.000000000 +0100
  23 +++ httpd-2.0.45/server/util_script.c   2003-04-28 11:39:23.000000000 +0100
  24 @@ -266,8 +266,7 @@
  25
  26      apr_table_addn(e, "SERVER_SIGNATURE", ap_psignature("", r));
  27      apr_table_addn(e, "SERVER_SOFTWARE", ap_get_server_version());
  28 -    apr_table_addn(e, "SERVER_NAME",
  29 -                   ap_escape_html(r->pool, ap_get_server_name(r)));
  30 +    apr_table_addn(e, "SERVER_NAME", ap_get_server_name(r));
  31      apr_table_addn(e, "SERVER_ADDR", r->connection->local_ip); /* Apache */
  32      apr_table_addn(e, "SERVER_PORT",
  33                   apr_psprintf(r->pool, "%u", ap_get_server_port(r)));