]>
Commit | Line | Data |
---|---|---|
0e467b1f AM |
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 | ||
bcbc8512 ER |
6 | --- httpd-2.3.8/docs/error/include/bottom.html~ 2007-07-31 22:49:08.000000000 +0300 |
7 | +++ httpd-2.3.8/docs/error/include/bottom.html 2010-09-01 13:12:26.494207986 +0300 | |
8 | @@ -5,7 +5,7 @@ | |
0e467b1f AM |
9 | |
10 | <h2>Error <!--#echo encoding="none" var="REDIRECT_STATUS" --></h2> | |
11 | <address> | |
12 | - <a href="/"><!--#echo var="SERVER_NAME" --></a><br /> | |
0e467b1f | 13 | + <a href="/"><!--#echo encoding="entity" var="SERVER_NAME" --></a><br /> |
bcbc8512 | 14 | <span><!--#echo var="SERVER_SOFTWARE" --></span> |
0e467b1f AM |
15 | </address> |
16 | </body> | |
50d8e16a AM |
17 | --- httpd-2.2.0.org/server/util_script.c 2005-11-10 16:20:05.000000000 +0100 |
18 | +++ httpd-2.2.0/server/util_script.c 2005-12-02 23:04:50.848272000 +0100 | |
19 | @@ -224,8 +224,7 @@ | |
0e467b1f AM |
20 | |
21 | apr_table_addn(e, "SERVER_SIGNATURE", ap_psignature("", r)); | |
5aafc919 | 22 | apr_table_addn(e, "SERVER_SOFTWARE", ap_get_server_banner()); |
0e467b1f AM |
23 | - apr_table_addn(e, "SERVER_NAME", |
24 | - ap_escape_html(r->pool, ap_get_server_name(r))); | |
25 | + apr_table_addn(e, "SERVER_NAME", ap_get_server_name(r)); | |
50d8e16a | 26 | apr_table_addn(e, "SERVER_ADDR", r->connection->local_ip); /* Apache */ |
0e467b1f | 27 | apr_table_addn(e, "SERVER_PORT", |
50d8e16a | 28 | apr_psprintf(r->pool, "%u", ap_get_server_port(r))); |