Commit 0fca9ab5 authored by Paul Querna's avatar Paul Querna
Browse files

Accept URLs for ServerAdmin. 

PR: 28174
Reviewed by: Andr� Malo, Brad Nicholes, Jean-Jacques Clar, Paul Querna


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

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Changes with Apache 2.0.51









  *) Allow URLs for ServerAdmin. PR 28174. 









     [Paul Querna]

















  *) initialize server arrays prior to calling ap_setup_prelinked_modules









     so that static modules can push Defines values when registering









     hooks just like DSO modules can ["Philippe M. Chiasson" <gozer cpan.org>]


































STATUS



+1
−5



























Changes for STATUS: 1 added line, 5 removed lines.



Original line number
Diff line number
Diff line









APACHE 2.0 STATUS:                                              -*-text-*-









Last modified at [$Date: 2004/07/10 04:05:51 $]









Last modified at [$Date: 2004/07/10 04:45:22 $]



















Release:




















@@ -158,10 +158,6 @@ PATCHES TO BACKPORT FROM 2.1







         http://www.apache.org/~nd/header_always_2.0.diff









       +1: nd



















    *) Allow URLs for ServerAdmin. PR 28174.









         server/core.c: r1.274









       +1: nd, bnicholes, jjclar



















    *) mod_rewrite: Fix confused map cache (with maps in different VHs using









       the same name). PR 26462. (2.0 + 1.3)









       A patch for 1.3 is here (2.0 goes similar):


































server/core.c



+4
−2



























Changes for server/core.c: 4 added lines, 2 removed lines.



Original line number
Diff line number
Diff line







@@ -2306,8 +2306,10 @@ AP_DECLARE(const char *) ap_psignature(const char *prefix, request_rec *r)







    if (conf->server_signature == srv_sig_withmail) {









        return apr_pstrcat(r->pool, prefix, "<address>", 









                           ap_get_server_version(),









                           " Server at <a href=\"mailto:",









                           r->server->server_admin, "\">",









                           " Server at <a href=\"",









                           ap_is_url(r->server->server_admin) ? "" : "mailto:",









                           ap_escape_html(r->pool, r->server->server_admin),









                           "\">",









                           ap_escape_html(r->pool, ap_get_server_name(r)),









                           "</a> Port ", sport,









                           "</address>\n", NULL);