httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_util.c
Date Tue, 02 Dec 2003 14:23:25 GMT
jorton      2003/12/02 06:23:25

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/ssl Tag: APACHE_2_0_BRANCH ssl_util.c
  Log:
  Backport from HEAD:
  
  * ssl_util.c (ssl_util_thread_cleanup): Clear the id_callback.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.186 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.185
  retrieving revision 1.988.2.186
  diff -u -u -r1.988.2.185 -r1.988.2.186
  --- CHANGES	2 Dec 2003 14:11:19 -0000	1.988.2.185
  +++ CHANGES	2 Dec 2003 14:23:22 -0000	1.988.2.186
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.49
   
  +  *) mod_ssl: Fix segfaults at startup if other modules which use OpenSSL
  +     are also loaded.  [Joe Orton]
  +
     *) mod_ssl: Use human-readable OpenSSL error strings in logs; use
        thread-safe interface for retrieving error strings.  [Joe Orton]
   
  
  
  
  1.751.2.569 +1 -8      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.568
  retrieving revision 1.751.2.569
  diff -u -u -r1.751.2.568 -r1.751.2.569
  --- STATUS	2 Dec 2003 14:21:26 -0000	1.751.2.568
  +++ STATUS	2 Dec 2003 14:23:23 -0000	1.751.2.569
  @@ -80,13 +80,6 @@
         +1: stoddard
         +1 (concept): trawick (looks reasonable when compared with worker)
   
  -    * Don't leave the OpenSSL "id_callback" pointer dangling after
  -      unloading mod_ssl; this fixes segfaults during startup if
  -      other modules (or libraries used by other modules, e.g. PHP
  -      stuff) use OpenSSL.
  -      modules/ssl/ssl_util.c: r1.40
  -      +1: jorton, trawick, stoddard
  -
       * Prevent mod_proxy from sending an invalid status-line to clients
         in some cases.
         modules/proxy/proxy_http.c: r1.172
  
  
  
  No                   revision
  No                   revision
  1.35.2.3  +1 -0      httpd-2.0/modules/ssl/ssl_util.c
  
  Index: ssl_util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_util.c,v
  retrieving revision 1.35.2.2
  retrieving revision 1.35.2.3
  diff -u -u -r1.35.2.2 -r1.35.2.3
  --- ssl_util.c	16 May 2003 18:12:19 -0000	1.35.2.2
  +++ ssl_util.c	2 Dec 2003 14:23:25 -0000	1.35.2.3
  @@ -454,6 +454,7 @@
   static apr_status_t ssl_util_thread_cleanup(void *data)
   {
       CRYPTO_set_locking_callback(NULL);
  +    CRYPTO_set_id_callback(NULL);
   
       /* Let the registered mutex cleanups do their own thing 
        */
  
  
  

Mime
View raw message