httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Sat, 10 Apr 2004 21:44:43 GMT
nd          2004/04/10 14:44:43

  Modified:    .        CHANGES
               server   core.c
  Log:
  accept URLs as ServerAdmin contact. If it's not recognized as an URL, assume
  an email address and prepend it with mailto: in server outputs.
  
  PR: 28174
  
  Revision  Changes    Path
  1.1454    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1453
  retrieving revision 1.1454
  diff -u -u -r1.1453 -r1.1454
  --- CHANGES	10 Apr 2004 20:23:51 -0000	1.1453
  +++ CHANGES	10 Apr 2004 21:44:43 -0000	1.1454
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) Accept URLs for the ServerAdmin directive. If the supplied
  +     argument is not recognized as an URL, assume it's a mail address.
  +     PR 28174.  [André Malo]
  +
     *) mod_rewrite no longer confuses the RewriteMap caches if
        different maps defined in different virtual hosts use the
        same map name. PR 26462.  [André Malo]
  
  
  
  1.274     +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.273
  retrieving revision 1.274
  diff -u -u -r1.273 -r1.274
  --- core.c	10 Apr 2004 18:40:53 -0000	1.273
  +++ core.c	10 Apr 2004 21:44:43 -0000	1.274
  @@ -2322,8 +2322,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