You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2009/05/04 23:37:10 UTC

svn commit: r771455 - /httpd/httpd/trunk/modules/ssl/ssl_engine_io.c

Author: rpluem
Date: Mon May  4 21:37:09 2009
New Revision: 771455

URL: http://svn.apache.org/viewvc?rev=771455&view=rev
Log:
* Optimize access to server_rec.

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_io.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_io.c?rev=771455&r1=771454&r2=771455&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c Mon May  4 21:37:09 2009
@@ -1059,11 +1059,11 @@
         return APR_SUCCESS;
     }
 
-    server = mySrvFromConn(c);
+    server = sslconn->server;
     if (sslconn->is_proxy) {
         const char *hostname_note;
 
-        sc = mySrvConfig(sslconn->server);
+        sc = mySrvConfig(server);
         if ((n = SSL_connect(filter_ctx->pssl)) <= 0) {
             ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, c,
                           "SSL Proxy connect failed");
@@ -1096,7 +1096,7 @@
                  apr_table_get(c->notes, "proxy-request-hostname")) != NULL)) {
             const char *hostname;
 
-            hostname = ssl_var_lookup(NULL, c->base_server, c, NULL,
+            hostname = ssl_var_lookup(NULL, server, c, NULL,
                                       "SSL_CLIENT_S_DN_CN");
             apr_table_unset(c->notes, "proxy-request-hostname");
             if (strcasecmp(hostname, hostname_note)) {