httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl mod_ssl.h ssl_engine_init.c
Date Wed, 13 Mar 2002 04:59:19 GMT
dougm       02/03/12 20:59:19

  Modified:    modules/ssl mod_ssl.h ssl_engine_init.c
  Log:
  use ptemp in ssl_init_FindCAList() rather than creating a subpool.
  
  Revision  Changes    Path
  1.76      +1 -1      httpd-2.0/modules/ssl/mod_ssl.h
  
  Index: mod_ssl.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- mod_ssl.h	13 Mar 2002 04:14:43 -0000	1.75
  +++ mod_ssl.h	13 Mar 2002 04:59:19 -0000	1.76
  @@ -626,7 +626,7 @@
   /*  module initialization  */
   int          ssl_init_Module(apr_pool_t *, apr_pool_t *, apr_pool_t *, server_rec *);
   void         ssl_init_Engine(server_rec *, apr_pool_t *);
  -void         ssl_init_ConfigureServer(server_rec *, apr_pool_t *, SSLSrvConfigRec *);
  +void         ssl_init_ConfigureServer(server_rec *, apr_pool_t *, apr_pool_t *, SSLSrvConfigRec
*);
   void         ssl_init_CheckServers(server_rec *, apr_pool_t *);
   STACK_OF(X509_NAME) 
               *ssl_init_FindCAList(server_rec *, apr_pool_t *, const char *, const char *);
  
  
  
  1.56      +8 -15     httpd-2.0/modules/ssl/ssl_engine_init.c
  
  Index: ssl_engine_init.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- ssl_engine_init.c	13 Mar 2002 04:49:23 -0000	1.55
  +++ ssl_engine_init.c	13 Mar 2002 04:59:19 -0000	1.56
  @@ -332,7 +332,7 @@
           /*
            * Read the server certificate and key
            */
  -        ssl_init_ConfigureServer(s, p, sc);
  +        ssl_init_ConfigureServer(s, p, ptemp, sc);
       }
   
       /*
  @@ -388,7 +388,9 @@
   /*
    * Configure a particular server
    */
  -void ssl_init_ConfigureServer(server_rec *s, apr_pool_t *p,
  +void ssl_init_ConfigureServer(server_rec *s,
  +                              apr_pool_t *p,
  +                              apr_pool_t *ptemp,
                                 SSLSrvConfigRec *sc)
   {
       SSLModConfigRec *mc = myModConfig(s);
  @@ -556,7 +558,7 @@
               ssl_die();
           }
   
  -        ca_list = ssl_init_FindCAList(s, p,
  +        ca_list = ssl_init_FindCAList(s, ptemp,
                                         sc->szCACertificateFile,
                                         sc->szCACertificatePath);
           if (!ca_list) {
  @@ -976,19 +978,11 @@
   }
   
   STACK_OF(X509_NAME) *ssl_init_FindCAList(server_rec *s,
  -                                         apr_pool_t *p,
  +                                         apr_pool_t *ptemp,
                                            const char *ca_file,
                                            const char *ca_path)
   {
       STACK_OF(X509_NAME) *ca_list;
  -    apr_pool_t *subpool;
  -
  -    /*
  -     * Use a subpool so we don't bloat up the server pool which
  -     * is remains in memory for the complete operation time of
  -     * the server.
  -     */
  -    apr_pool_sub_make(&subpool, p, NULL);
   
       /*
        * Start with a empty stack/list where new
  @@ -1011,7 +1005,7 @@
           apr_finfo_t direntry;
           apr_int32_t finfo_flags = APR_FINFO_MIN|APR_FINFO_NAME;
   
  -        if (apr_dir_open(&dir, ca_path, subpool) != APR_SUCCESS) {
  +        if (apr_dir_open(&dir, ca_path, ptemp) != APR_SUCCESS) {
               ssl_log(s, SSL_LOG_ERROR|SSL_ADD_ERRNO,
                       "Init: Failed to open SSLCACertificatePath `%s'",
                       ca_path);
  @@ -1023,7 +1017,7 @@
               if (direntry.filetype == APR_DIR) {
                   continue; /* don't try to load directories */
               }
  -            file = apr_pstrcat(subpool, ca_path, "/", direntry.name, NULL);
  +            file = apr_pstrcat(ptemp, ca_path, "/", direntry.name, NULL);
               ssl_init_PushCAList(ca_list, s, file);
           }
   
  @@ -1034,7 +1028,6 @@
        * Cleanup
        */
       sk_X509_NAME_set_cmp_func(ca_list, NULL);
  -    apr_pool_destroy(subpool);
   
       return ca_list;
   }
  
  
  

Mime
View raw message