cvs commit: apache/src http_request.c mod_log_config.c

[Brian Behlendorf <br...@hyperreal.com>]

brian       97/01/20 01:30:52

  Modified:    src       http_request.c mod_log_config.c
  Log:
  Reviewed by:	Randy Terbush, Brian Behlendorf
  Submitted by:	Dean Gaudet
  
  Two problems.  The first is that every call to make_sub_request wasn't
  copying the original request's request_time.  The second was that
  mod_log_config was defaulting to "do not want_orig" for %T (i.e. %>T was
  default not %<T).  Try the following patch or use %<T.
  
  I considered copying the time right inside make_sub_request.  I also
  considered making make_sub_request a static function.  Both may be the
  right thing to do...   In hotwired's code I keep track of time statistics
  and other stuff that is "global" to a particular request in the conn_rec
  structure.  Mostly because I am lazy.  But it does avoid this problem
  where you have to copy the values from request to sub request.
  
  Revision  Changes    Path
  1.39      +2 -1      apache/src/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_request.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -C3 -r1.38 -r1.39
  *** http_request.c	1997/01/20 04:28:10	1.38
  --- http_request.c	1997/01/20 09:30:50	1.39
  ***************
  *** 601,606 ****
  --- 601,607 ----
        char *udir;
        
        rnew = make_sub_request (r);
  +     rnew->request_time = r->request_time;
        rnew->connection = r->connection; 
        rnew->server = r->server;
        rnew->request_config = create_request_config (rnew->pool);
  ***************
  *** 684,690 ****
    
        rnew = make_sub_request (r);
        fdir = make_dirstr (rnew->pool, r->filename, count_dirs (r->filename));
  !     
        rnew->connection = r->connection; /* For now... */
        rnew->server = r->server;
        rnew->request_config = create_request_config (rnew->pool);
  --- 685,691 ----
    
        rnew = make_sub_request (r);
        fdir = make_dirstr (rnew->pool, r->filename, count_dirs (r->filename));
  !     rnew->request_time = r->request_time;
        rnew->connection = r->connection; /* For now... */
        rnew->server = r->server;
        rnew->request_config = create_request_config (rnew->pool);
  
  
  
  1.24      +1 -1      apache/src/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_log_config.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -C3 -r1.23 -r1.24
  *** mod_log_config.c	1997/01/20 09:19:07	1.23
  --- mod_log_config.c	1997/01/20 09:30:50	1.24
  ***************
  *** 353,359 ****
        { 'l', log_remote_logname, 0 },
        { 'u', log_remote_user, 0 },
        { 't', log_request_time, 0 },
  !     { 'T', log_request_duration, 0 },
        { 'r', log_request_line, 1 },
        { 'f', log_request_file, 0 },
        { 'U', log_request_uri, 1 },
  --- 353,359 ----
        { 'l', log_remote_logname, 0 },
        { 'u', log_remote_user, 0 },
        { 't', log_request_time, 0 },
  !     { 'T', log_request_duration, 1 },
        { 'r', log_request_line, 1 },
        { 'f', log_request_file, 0 },
        { 'U', log_request_uri, 1 },