httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/arch/win32 mod_isapi.c
Date Wed, 12 Jun 2002 16:56:27 GMT
wrowe       2002/06/12 09:56:27

  Modified:    modules/aaa mod_auth_digest.c
               modules/arch/win32 mod_isapi.c
  Log:
    Use the new APR_TIME_FROM_SEC() wrapper
  
  Revision  Changes    Path
  1.65      +4 -3      httpd-2.0/modules/aaa/mod_auth_digest.c
  
  Index: mod_auth_digest.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_digest.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- mod_auth_digest.c	17 May 2002 11:33:08 -0000	1.64
  +++ mod_auth_digest.c	12 Jun 2002 16:56:27 -0000	1.65
  @@ -145,8 +145,8 @@
   
   #define DFLT_ALGORITHM  "MD5"
   
  -#define DFLT_NONCE_LIFE (300*APR_USEC_PER_SEC)
  -#define NEXTNONCE_DELTA (30*APR_USEC_PER_SEC)
  +#define DFLT_NONCE_LIFE APR_TIME_FROM_SEC(300)
  +#define NEXTNONCE_DELTA APR_TIME_FROM_SEC(30)
   
   
   #define NONCE_TIME_LEN  (((sizeof(apr_time_t)+2)/3)*4)
  @@ -543,7 +543,7 @@
                              t, NULL);
       }
   
  -    ((digest_config_rec *) config)->nonce_lifetime = lifetime * APR_USEC_PER_SEC;
  +    ((digest_config_rec *) config)->nonce_lifetime = APR_TIME_FROM_SEC(lifetime);
       return NULL;
   }
   
  @@ -1073,6 +1073,7 @@
           t.time = (*otn_counter)++;
       }
       else {
  +        /* XXX: WHAT IS THIS CONSTANT? */
           t.time = 42;
       }
       len = apr_base64_encode_binary(nonce, t.arr, sizeof(t.arr));
  
  
  
  1.80      +1 -1      httpd-2.0/modules/arch/win32/mod_isapi.c
  
  Index: mod_isapi.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/arch/win32/mod_isapi.c,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- mod_isapi.c	4 Jun 2002 02:21:36 -0000	1.79
  +++ mod_isapi.c	12 Jun 2002 16:56:27 -0000	1.80
  @@ -96,7 +96,7 @@
   #include "mod_isapi.h"
   
   /* Retry frequency for a failed-to-load isapi .dll */
  -#define ISAPI_RETRY ( 30 * APR_USEC_PER_SEC )
  +#define ISAPI_RETRY APR_TIME_FROM_SEC(30)
   
   /**********************************************************
    *
  
  
  

Mime
View raw message