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 CHANGES
Date Thu, 23 Oct 2003 13:12:39 GMT
jorton      2003/10/23 06:12:38

  Modified:    modules/ssl ssl_engine_vars.c
               .        CHANGES
  Log:
  * modules/ssl/ssl_engine_vars.c (ssl_var_log_handler_c): Fix
  segfault on a non-SSL request.
  
  PR: 22741
  Submitted by: Gary E. Miller <gem@rellim.com>
  
  Revision  Changes    Path
  1.25      +1 -1      httpd-2.0/modules/ssl/ssl_engine_vars.c
  
  Index: ssl_engine_vars.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_vars.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -u -r1.24 -r1.25
  --- ssl_engine_vars.c	14 Jul 2003 17:28:14 -0000	1.24
  +++ ssl_engine_vars.c	23 Oct 2003 13:12:38 -0000	1.25
  @@ -655,7 +655,7 @@
       SSLConnRec *sslconn = myConnConfig(r->connection);
       char *result;
   
  -    if (sslconn->ssl == NULL)
  +    if (sslconn == NULL || sslconn->ssl == NULL)
           return NULL;
       result = NULL;
       if (strEQ(a, "version"))
  
  
  
  1.1297    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1296
  retrieving revision 1.1297
  diff -u -u -r1.1296 -r1.1297
  --- CHANGES	22 Oct 2003 16:45:53 -0000	1.1296
  +++ CHANGES	23 Oct 2003 13:12:38 -0000	1.1297
  @@ -2,6 +2,9 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) mod_ssl: Fix segfault on a non-SSL request if the the 'c' log
  +     format code is used. PR 22741. [Gary E. Miller <gem@rellim.com>]
  +
     *) Set the scoreboard state to indicate logging prior to running 
        logging hooks so that server-status will show 'L' for hung loggers
        instead of 'W'.  [Jeff Trawick]
  
  
  

Mime
View raw message