httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Sat, 10 Jul 2004 04:45:23 GMT
pquerna     2004/07/09 21:45:23

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               server   Tag: APACHE_2_0_BRANCH core.c
  Log:
  Accept URLs for ServerAdmin.
  
  PR: 28174
  Reviewed by: André Malo, Brad Nicholes, Jean-Jacques Clar, Paul Querna
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.312 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.311
  retrieving revision 1.988.2.312
  diff -u -r1.988.2.311 -r1.988.2.312
  --- CHANGES	6 Jul 2004 18:25:13 -0000	1.988.2.311
  +++ CHANGES	10 Jul 2004 04:45:21 -0000	1.988.2.312
  @@ -1,5 +1,8 @@
   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>]
  
  
  
  1.751.2.950 +1 -5      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.949
  retrieving revision 1.751.2.950
  diff -u -r1.751.2.949 -r1.751.2.950
  --- STATUS	10 Jul 2004 04:05:51 -0000	1.751.2.949
  +++ STATUS	10 Jul 2004 04:45:22 -0000	1.751.2.950
  @@ -158,10 +158,6 @@
            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):
  
  
  
  No                   revision
  No                   revision
  1.225.2.23 +4 -2      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.225.2.22
  retrieving revision 1.225.2.23
  diff -u -r1.225.2.22 -r1.225.2.23
  --- core.c	6 Jun 2004 13:23:26 -0000	1.225.2.22
  +++ core.c	10 Jul 2004 04:45:23 -0000	1.225.2.23
  @@ -2306,8 +2306,10 @@
       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);
  
  
  

Mime
View raw message