httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/standard mod_log_config.c
Date Fri, 03 Nov 2000 03:08:32 GMT
stoddard    00/11/02 19:08:32

  Modified:    src      CHANGES
               src/modules/standard mod_log_config.c
  Log:
  Merge the 1.3 patch to add support for logging query string in
  such a way that "%m %U%q %H" is the same as "%r".
  
  Revision  Changes    Path
  1.305     +4 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.304
  retrieving revision 1.305
  diff -u -r1.304 -r1.305
  --- CHANGES	2000/11/03 03:00:57	1.304
  +++ CHANGES	2000/11/03 03:08:29	1.305
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0a8
   
  +  *) Merge the 1.3 patch to add support for logging query string in 
  +     such a way that "%m %U%q %H" is the same as "%r".
  +     [Bill Stoddard]
  +
     *) Port three log methods from mod_log_config 1.3 to 2.0: 
        CLF compliant '-' byte count, method and protocol.
        [Bill Stoddard]
  
  
  
  1.39      +10 -1     apache-2.0/src/modules/standard/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_log_config.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- mod_log_config.c	2000/11/03 03:00:57	1.38
  +++ mod_log_config.c	2000/11/03 03:08:31	1.39
  @@ -149,7 +149,8 @@
    * %...v:  the configured name of the server (i.e. which virtual host?)
    * %...V:  the server name according to the UseCanonicalName setting
    * %...m:  the request method
  - * %...h:  the request protocol
  + * %...H:  the request protocol
  + * %...q:  the query string prepended by "?", or empty if no query string
    *
    * The '...' can be nothing at all (e.g. "%h %u %r %s %b"), or it can
    * indicate conditions for inclusion of the item (which will cause it
  @@ -357,6 +358,11 @@
   {
       return r->protocol;
   }
  +static const char *log_request_query(request_rec *r, char *a)
  +{
  +    return (r->args != NULL) ? apr_pstrcat(r->pool, "?", r->args, NULL)
  +                             : "";
  +}
   static const char *log_status(request_rec *r, char *a)
   {
       return pfmt(r->pool, r->status);
  @@ -583,6 +589,9 @@
       },
       {
           'm', log_request_method, 0
  +    },
  +    {
  +        'q', log_request_query, 0
       },
       {
           'c', log_connection_status, 0
  
  
  

Mime
View raw message