httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r125749 - /httpd/httpd/branches/2.0.x/STATUS /httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_kernel.c
Date Thu, 20 Jan 2005 09:51:03 GMT
Author: jorton
Date: Thu Jan 20 01:50:59 2005
New Revision: 125749

URL: http://svn.apache.org/viewcvs?view=rev&rev=125749
Log:
Merge r105663 from trunk:

* modules/ssl/ssl_engine_kernel.c (ssl_hook_UserCheck): Fix possible
NULL pointer dereference in some configurations.

PR: 31848
Reviewed by: jorton, wrowe, jim

Modified:
   httpd/httpd/branches/2.0.x/STATUS
   httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_kernel.c

Modified: httpd/httpd/branches/2.0.x/STATUS
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?view=diff&rev=125749&p1=httpd/httpd/branches/2.0.x/STATUS&r1=125748&p2=httpd/httpd/branches/2.0.x/STATUS&r2=125749
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS	(original)
+++ httpd/httpd/branches/2.0.x/STATUS	Thu Jan 20 01:50:59 2005
@@ -148,11 +148,6 @@
        svn rev 106653
        +1: wrowe, nd, trawick
 
-    *) mod_ssl: Fix an possible NULL pointer dereference in some configs.
-       http://nagoya.apache.org/bugzilla/showattachment.cgi?attach_id=13182
-       PR: 31848
-       +1: jorton, wrowe, jim
-
     *) several changes to improve logging of connection-oriented errors, including
        ap_log_cerror() API (needs minor bump in addition to changes below)
          http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.289&r2=1.291

Modified: httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_kernel.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_kernel.c?view=diff&rev=125749&p1=httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_kernel.c&r1=125748&p2=httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_kernel.c&r2=125749
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_kernel.c	(original)
+++ httpd/httpd/branches/2.0.x/modules/ssl/ssl_engine_kernel.c	Thu Jan 20 01:50:59 2005
@@ -860,7 +860,7 @@
      * - ssl not enabled
      * - client did not present a certificate
      */
-    if (!(sc->enabled && sslconn->ssl && sslconn->client_cert) ||
+    if (!(sc->enabled && sslconn && sslconn->ssl && sslconn->client_cert)
||
         !(dc->nOptions & SSL_OPT_FAKEBASICAUTH) || r->user)
     {
         return DECLINED;

Mime
View raw message