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/ssl mod_ssl.c
Date Tue, 24 Jun 2003 21:40:32 GMT
wrowe       2003/06/24 14:40:32

  Modified:    modules/ssl mod_ssl.c
  Log:
    Narrow the scope of several OPENSSL-specific setup and teardown calls
    to only OpenSSL based builds.
  
    Also introduce success result for the registered cleanup callback
    to clean up a compiler emit.
  
  Revision  Changes    Path
  1.86      +9 -2      httpd-2.0/modules/ssl/mod_ssl.c
  
  Index: mod_ssl.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.c,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- mod_ssl.c	17 Jun 2003 17:44:40 -0000	1.85
  +++ mod_ssl.c	24 Jun 2003 21:40:32 -0000	1.86
  @@ -235,7 +235,7 @@
       /*
        * Try to kill the internals of the SSL library.
        */
  -#ifdef OPENSSL_VERSION_NUMBER
  +#ifdef HAVE_OPENSSL
   #if OPENSSL_VERSION_NUMBER >= 0x00907001
       /* Corresponds to OPENSSL_load_builtin_modules():
        * XXX: borrowed from apps.h, but why not CONF_modules_free()
  @@ -249,7 +249,11 @@
   #if HAVE_ENGINE_LOAD_BUILTIN_ENGINES
       ENGINE_cleanup();
   #endif
  +#ifdef HAVE_OPENSSL
  +#if OPENSSL_VERSION_NUMBER >= 0x00907001
       CRYPTO_cleanup_all_ex_data();
  +#endif
  +#endif
       ERR_remove_state(0);
       ERR_free_strings();
       /* 
  @@ -257,6 +261,7 @@
        *       (when enabled) at this late stage in the game:
        * CRYPTO_mem_leaks_fp(stderr);
        */
  +    return APR_SUCCESS;
   }
   
   static int ssl_hook_pre_config(apr_pool_t *pconf,
  @@ -267,12 +272,14 @@
        * code can successfully test the SSL environment.
        */
       CRYPTO_malloc_init();
  +#ifdef HAVE_OPENSSL
       ERR_load_crypto_strings();
  +#endif
       SSL_library_init();
   #if HAVE_ENGINE_LOAD_BUILTIN_ENGINES
       ENGINE_load_builtin_engines();
   #endif
  -#ifdef OPENSSL_VERSION_NUMBER
  +#ifdef HAVE_OPENSSL
   #if OPENSSL_VERSION_NUMBER >= 0x00907001
       OPENSSL_load_builtin_modules();
   #endif
  
  
  

Mime
View raw message