httpd-2.0.45-encode.patch

   1 * don't HTML-escape the SERVER_NAME variable
   2 * do escape SERVER_NAME in error docs
   3 * remove dates from error pages (#86474), since they won't be in the right
   4 language
   5
   6 diff -ur httpd-2.2.0.org/docs/error/include/bottom.html httpd-2.2.0/docs/error/include/bottom.html
   7 --- httpd-2.2.0.org/docs/error/include/bottom.html      2004-11-20 21:16:24.000000000 +0100
   8 +++ httpd-2.2.0/docs/error/include/bottom.html  2005-12-02 23:04:57.540690250 +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 diff -ur httpd-2.2.0.org/server/util_script.c httpd-2.2.0/server/util_script.c
  23 --- httpd-2.2.0.org/server/util_script.c        2005-11-10 16:20:05.000000000 +0100
  24 +++ httpd-2.2.0/server/util_script.c    2005-12-02 23:04:50.848272000 +0100
  25 @@ -224,8 +224,7 @@
  26
  27      apr_table_addn(e, "SERVER_SIGNATURE", ap_psignature("", r));
  28      apr_table_addn(e, "SERVER_SOFTWARE", ap_get_server_banner());
  29 -    apr_table_addn(e, "SERVER_NAME",
  30 -                   ap_escape_html(r->pool, ap_get_server_name(r)));
  31 +    apr_table_addn(e, "SERVER_NAME", ap_get_server_name(r));
  32      apr_table_addn(e, "SERVER_ADDR", r->connection->local_ip);  /* Apache */
  33      apr_table_addn(e, "SERVER_PORT",
  34                    apr_psprintf(r->pool, "%u", ap_get_server_port(r)));