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/loggers mod_log_config.c
Date Sat, 19 Apr 2003 03:06:31 GMT
trawick     2003/04/18 20:06:31

  Modified:    docs/manual/mod mod_log_config.xml mod_log_config.html.en
               modules/loggers mod_log_config.c
  Log:
  as Andre' pointed out, we don't need %{pid/tid}P since the user
  can do %P/%{tid}P or %{pid}P/%{tid}P
  
  Revision  Changes    Path
  1.22      +3 -3      httpd-2.0/docs/manual/mod/mod_log_config.xml
  
  Index: mod_log_config.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_log_config.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mod_log_config.xml	18 Apr 2003 19:40:10 -0000	1.21
  +++ mod_log_config.xml	19 Apr 2003 03:06:30 -0000	1.22
  @@ -111,9 +111,9 @@
           <td>The process ID of the child that serviced the request.</td></tr>
   
       <tr><td><code>%...{<var>format</var>}P</code></td>
  -        <td>The process ID and or thread id of the child that serviced the 
  -        request.  Valid formats are <code>pid</code>, <code>tid</code>,
  -        and <code>pid/tid</code>.</td></tr>
  +        <td>The process ID or thread id of the child that serviced the 
  +        request.  Valid formats are <code>pid</code> and <code>tid</code>.
  +        </td></tr>
   
       <tr><td><code>%...q</code></td>
           <td>The query string (prepended with a <code>?</code> if a query
  
  
  
  1.31      +3 -3      httpd-2.0/docs/manual/mod/mod_log_config.html.en
  
  Index: mod_log_config.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_log_config.html.en,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- mod_log_config.html.en	18 Apr 2003 19:40:10 -0000	1.30
  +++ mod_log_config.html.en	19 Apr 2003 03:06:30 -0000	1.31
  @@ -117,9 +117,9 @@
   <tr class="odd"><td><code>%...P</code></td>
           <td>The process ID of the child that serviced the request.</td></tr>
   <tr><td><code>%...{<var>format</var>}P</code></td>
  -        <td>The process ID and or thread id of the child that serviced the 
  -        request.  Valid formats are <code>pid</code>, <code>tid</code>,
  -        and <code>pid/tid</code>.</td></tr>
  +        <td>The process ID or thread id of the child that serviced the 
  +        request.  Valid formats are <code>pid</code> and <code>tid</code>.
  +        </td></tr>
   <tr class="odd"><td><code>%...q</code></td>
           <td>The query string (prepended with a <code>?</code> if a query
           string exists, otherwise an empty string)</td></tr>
  
  
  
  1.104     +5 -12     httpd-2.0/modules/loggers/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/loggers/mod_log_config.c,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- mod_log_config.c	18 Apr 2003 19:40:11 -0000	1.103
  +++ mod_log_config.c	19 Apr 2003 03:06:30 -0000	1.104
  @@ -616,25 +616,18 @@
   static const char *log_pid_tid(request_rec *r, char *a)
   {
       if (*a == '\0' || !strcmp(a, "pid")) {
  -        return apr_psprintf(r->pool, "%ld", (long)getpid());
  +        return apr_psprintf(r->pool, "%" APR_PID_T_FMT, getpid());
       }
  -    else {
  +    else if (!strcmp(a, "tid")) {
   #if APR_HAS_THREADS
           apr_os_thread_t tid = apr_os_thread_current();
   #else
           int tid = 0; /* APR will format "0" anyway but an arg is needed */
   #endif
  -
  -        if (!strcmp(a, "pid/tid")) {
  -            return apr_psprintf(r->pool, "%ld/%pT", (long)getpid(), &tid);
  -        }
  -        else if (!strcmp(a, "tid")) {
  -            return apr_psprintf(r->pool, "%pT", &tid);
  -        }
  -        else { /* bogus string */
  -            return a;
  -        }
  +        return apr_psprintf(r->pool, "%pT", &tid);
       }
  +    /* bogus format */
  +    return a;
   }
   
   static const char *log_connection_status(request_rec *r, char *a)
  
  
  

Mime
View raw message