httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@apache.org>
Subject Re: cvs commit: httpd-2.0/modules/ssl mod_ssl.h ssl_engine_kernel.c
Date Fri, 04 Apr 2003 04:17:42 GMT
Sorry... but -1.  You need a version check here because 0.9.6 isn't
going away anytime soon.

Bill

At 09:57 PM 4/3/2003, trawick@apache.org wrote:
>trawick     2003/04/03 19:57:10
>
>  Modified:    .        CHANGES
>               modules/ssl mod_ssl.h ssl_engine_kernel.c
>  Log:
>  Fix a compile failure with recent OpenSSL and picky compilers
>  (e.g., OpenSSL 0.9.7a and xlc_r on AIX).
>  
>  The OpenSSL info callback field changed recently from a generic
>  function pointer to a specific one, and ssl_callback_LogTracingState
>  wasn't quite right.
>  
>  old:
>  ssl.h:        void (*info_callback)();
>  
>  new:
>  ssl.h:        void (*info_callback)(const SSL *ssl,int type,int val);
>  
>  Revision  Changes    Path
>  1.1136    +3 -0      httpd-2.0/CHANGES
>  
>  Index: CHANGES
>  ===================================================================
>  RCS file: /home/cvs/httpd-2.0/CHANGES,v
>  retrieving revision 1.1135
>  retrieving revision 1.1136
>  diff -u -r1.1135 -r1.1136
>  --- CHANGES   4 Apr 2003 01:10:55 -0000       1.1135
>  +++ CHANGES   4 Apr 2003 03:57:09 -0000       1.1136
>  @@ -2,6 +2,9 @@
>   
>     [Remove entries to the current 2.0 section below, when backported]
>   
>  +  *) Fix a compile failure with recent OpenSSL and picky compilers
>  +     (e.g., OpenSSL 0.9.7a and xlc_r on AIX).  [Jeff Trawick]
>  +
>     *) Fix a build problem with passing unsupported --enable-layout
>        args to apr and apr-util.  This broke binbuild.sh as well as
>        user-specified layout parameters.  PR 18649 [Justin Erenkrantz,
>  
>  
>  
>  1.129     +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.128
>  retrieving revision 1.129
>  diff -u -r1.128 -r1.129
>  --- mod_ssl.h 3 Apr 2003 04:54:20 -0000       1.128
>  +++ mod_ssl.h 4 Apr 2003 03:57:10 -0000       1.129
>  @@ -588,7 +588,7 @@
>   int          ssl_callback_NewSessionCacheEntry(SSL *, SSL_SESSION *);
>   SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *, unsigned char *, int, int *);
>   void         ssl_callback_DelSessionCacheEntry(SSL_CTX *, SSL_SESSION *);
>  -void         ssl_callback_LogTracingState(SSL *, int, int);
>  +void         ssl_callback_LogTracingState(const SSL *, int, int);
>   
>   /*  Session Cache Support  */
>   void         ssl_scache_init(server_rec *, apr_pool_t *);
>  
>  
>  
>  1.88      +1 -1      httpd-2.0/modules/ssl/ssl_engine_kernel.c
>  
>  Index: ssl_engine_kernel.c
>  ===================================================================
>  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_kernel.c,v
>  retrieving revision 1.87
>  retrieving revision 1.88
>  diff -u -r1.87 -r1.88
>  --- ssl_engine_kernel.c       3 Apr 2003 04:54:20 -0000       1.87
>  +++ ssl_engine_kernel.c       4 Apr 2003 03:57:10 -0000       1.88
>  @@ -1745,7 +1745,7 @@
>    * SSL handshake and does SSL record layer stuff. We use it to
>    * trace OpenSSL's processing in out SSL logfile.
>    */
>  -void ssl_callback_LogTracingState(SSL *ssl, int where, int rc)
>  +void ssl_callback_LogTracingState(const SSL *ssl, int where, int rc)
>   {
>       conn_rec *c;
>       server_rec *s;
>  
>  
>  


Mime
View raw message