From: Joe Orton <jorton@apache.org>
Date: Thu, 23 Oct 2003 13:12:38 +0000 (+0000)
Subject: * modules/ssl/ssl_engine_vars.c (ssl_var_log_handler_c): Fix
X-Git-Tag: pre_ajp_proxy~1100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0917d6edc8886a441667ab5a11854071111c4229;p=thirdparty%2Fapache%2Fhttpd.git

* 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>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101534 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 1c46f6c18d0..e1869101162 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [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]
diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index eeb331c0f22..fa4afca610a 100644
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -655,7 +655,7 @@ static const char *ssl_var_log_handler_c(request_rec *r, char *a)
     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"))