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/metadata mod_expires.c mod_headers.c mod_usertrack.c
Date Wed, 17 Jul 2002 16:08:54 GMT
trawick     2002/07/17 09:08:53

  Modified:    modules/loggers mod_log_config.c
               modules/metadata mod_expires.c mod_headers.c mod_usertrack.c
  Log:
  use APR_TIME_T_FMT when formatting apr_time_t
  
  Revision  Changes    Path
  1.87      +3 -2      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.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- mod_log_config.c	30 Jun 2002 03:53:32 -0000	1.86
  +++ mod_log_config.c	17 Jul 2002 16:08:53 -0000	1.87
  @@ -545,12 +545,13 @@
   static const char *log_request_duration(request_rec *r, char *a)
   {
       apr_time_t duration = apr_time_now() - r->request_time;
  -    return apr_psprintf(r->pool, "%qd", apr_time_sec(duration));
  +    return apr_psprintf(r->pool, "%" APR_TIME_T_FMT, apr_time_sec(duration));
   }
   
   static const char *log_request_duration_microseconds(request_rec *r, char *a)
   {
  -    return apr_psprintf(r->pool, "%qd", (apr_time_now() - r->request_time));
  +    return apr_psprintf(r->pool, "%" APR_TIME_T_FMT, 
  +                        (apr_time_now() - r->request_time));
   }
   
   /* These next two routines use the canonical name:port so that log
  
  
  
  1.39      +1 -1      httpd-2.0/modules/metadata/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_expires.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- mod_expires.c	30 Jun 2002 04:30:41 -0000	1.38
  +++ mod_expires.c	17 Jul 2002 16:08:53 -0000	1.39
  @@ -500,7 +500,7 @@
   
       expires = base + additional;
       apr_table_mergen(r->headers_out, "Cache-Control",
  -		    apr_psprintf(r->pool, "max-age=%qd",
  +		    apr_psprintf(r->pool, "max-age=%" APR_TIME_T_FMT,
                                    apr_time_sec(expires - r->request_time)));
       timestr = apr_palloc(r->pool, APR_RFC822_DATE_LEN);
       apr_rfc822_date(timestr, expires);
  
  
  
  1.41      +3 -2      httpd-2.0/modules/metadata/mod_headers.c
  
  Index: mod_headers.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_headers.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- mod_headers.c	28 Jun 2002 08:40:24 -0000	1.40
  +++ mod_headers.c	17 Jul 2002 16:08:53 -0000	1.41
  @@ -182,11 +182,12 @@
   }
   static const char *header_request_duration(request_rec *r, char *a)
   {
  -    return apr_psprintf(r->pool, "D=%qd", (apr_time_now() - r->request_time)); 
  +    return apr_psprintf(r->pool, "D=%" APR_TIME_T_FMT, 
  +                        (apr_time_now() - r->request_time)); 
   }
   static const char *header_request_time(request_rec *r, char *a)
   {
  -    return apr_psprintf(r->pool, "t=%qd", r->request_time);
  +    return apr_psprintf(r->pool, "t=%" APR_TIME_T_FMT, r->request_time);
   }
   static const char *header_request_env_var(request_rec *r, char *a)
   {
  
  
  
  1.39      +2 -1      httpd-2.0/modules/metadata/mod_usertrack.c
  
  Index: mod_usertrack.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_usertrack.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- mod_usertrack.c	30 Jun 2002 04:30:41 -0000	1.38
  +++ mod_usertrack.c	17 Jul 2002 16:08:53 -0000	1.39
  @@ -146,7 +146,8 @@
       dcfg = ap_get_module_config(r->per_dir_config, &usertrack_module);
   
       /* XXX: hmm, this should really tie in with mod_unique_id */
  -    apr_snprintf(cookiebuf, sizeof(cookiebuf), "%s.%qd", rname, apr_time_now());
  +    apr_snprintf(cookiebuf, sizeof(cookiebuf), "%s.%" APR_TIME_T_FMT, rname, 
  +                 apr_time_now());
   
       if (cls->expires) {
   
  
  
  

Mime
View raw message