httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/generators mod_info.c
Date Sat, 01 Nov 2003 16:29:57 GMT
trawick     2003/11/01 08:29:57

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/generators Tag: APACHE_2_0_BRANCH mod_info.c
  Log:
  backport this from Apache 2.1-dev:
  
   Fix mod_info to use the real config file name, not the default
   config file name.
  
  Submitted by:  Aryeh Katz <aryeh@secured-services.com>
  Reviewed by:   trawick, striker, nd
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.178 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.177
  retrieving revision 1.988.2.178
  diff -u -r1.988.2.177 -r1.988.2.178
  --- CHANGES	1 Nov 2003 16:22:15 -0000	1.988.2.177
  +++ CHANGES	1 Nov 2003 16:29:56 -0000	1.988.2.178
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.49
   
  +  *) Fix mod_info to use the real config file name, not the default
  +     config file name.  [Aryeh Katz <aryeh@secured-services.com>]
  +
     *) Set the scoreboard state to indicate logging prior to running 
        logging hooks so that server-status will show 'L' for hung loggers
        instead of 'W'.  [Jeff Trawick]
  
  
  
  1.751.2.518 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.517
  retrieving revision 1.751.2.518
  diff -u -r1.751.2.517 -r1.751.2.518
  --- STATUS	1 Nov 2003 16:22:15 -0000	1.751.2.517
  +++ STATUS	1 Nov 2003 16:29:56 -0000	1.751.2.518
  @@ -256,11 +256,6 @@
           modules/filters/mod_ext_filter.c r1.5
         +1: trawick, nd
   
  -    * Fix mod_info to use the real config file name, not the default
  -      config file name.
  -        modules/generators/mod_info.c r1.151
  -      +1: trawick, striker, nd
  -
       * When UseCanonicalName is set to OFF, allow ap_get_server_port to 
         check r->connection->local_addr->port before defaulting to 
         server->port or ap_default_port()
  
  
  
  No                   revision
  No                   revision
  1.49.2.2  +1 -1      httpd-2.0/modules/generators/mod_info.c
  
  Index: mod_info.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_info.c,v
  retrieving revision 1.49.2.1
  retrieving revision 1.49.2.2
  diff -u -r1.49.2.1 -r1.49.2.2
  --- mod_info.c	3 Feb 2003 17:31:40 -0000	1.49.2.1
  +++ mod_info.c	1 Nov 2003 16:29:57 -0000	1.49.2.2
  @@ -405,7 +405,7 @@
               ap_rprintf(r, "<dt><strong>Server Root:</strong> "
                           "<tt>%s</tt></dt>\n", ap_server_root);
               ap_rprintf(r, "<dt><strong>Config File:</strong> "
  -		       "<tt>%s</tt></dt>\n", SERVER_CONFIG_FILE);
  +		       "<tt>%s</tt></dt>\n", ap_conftree->filename);
               ap_rputs("</dl><hr />", r);
           }
           for (modp = ap_top_module; modp; modp = modp->next) {
  
  
  

Mime
View raw message