You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jf...@apache.org on 2018/10/17 12:48:18 UTC

svn commit: r1844090 - in /httpd/httpd/trunk/modules/ssl: mod_ssl.c ssl_engine_kernel.c ssl_private.h

Author: jfclere
Date: Wed Oct 17 12:48:18 2018
New Revision: 1844090

URL: http://svn.apache.org/viewvc?rev=1844090&view=rev
Log:
rollback 1844001.

Modified:
    httpd/httpd/trunk/modules/ssl/mod_ssl.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
    httpd/httpd/trunk/modules/ssl/ssl_private.h

Modified: httpd/httpd/trunk/modules/ssl/mod_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/mod_ssl.c?rev=1844090&r1=1844089&r2=1844090&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/mod_ssl.c (original)
+++ httpd/httpd/trunk/modules/ssl/mod_ssl.c Wed Oct 17 12:48:18 2018
@@ -776,8 +776,6 @@ static void ssl_register_hooks(apr_pool_
                               AUTHZ_PROVIDER_VERSION,
                               &ssl_authz_provider_verify_client,
                               AP_AUTH_INTERNAL_PER_CONF);
-    ap_register_provider(p, "mod_ssl" , "ssl_variables", "0",
-                         ssl_hook_GetVars());
 }
 
 module AP_MODULE_DECLARE_DATA ssl_module = {

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c?rev=1844090&r1=1844089&r2=1844090&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c Wed Oct 17 12:48:18 2018
@@ -2697,8 +2697,3 @@ int ssl_callback_SRPServerParams(SSL *ss
 }
 
 #endif /* HAVE_SRP */
-
-const char * const *ssl_hook_GetVars()
-{
-   return ssl_hook_Fixup_vars;
-}

Modified: httpd/httpd/trunk/modules/ssl/ssl_private.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_private.h?rev=1844090&r1=1844089&r2=1844090&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_private.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_private.h Wed Oct 17 12:48:18 2018
@@ -899,7 +899,6 @@ int          ssl_hook_Fixup(request_rec
 int          ssl_hook_ReadReq(request_rec *);
 int          ssl_hook_Upgrade(request_rec *);
 void         ssl_hook_ConfigTest(apr_pool_t *pconf, server_rec *s);
-const char* const      *ssl_hook_GetVars(void);
 
 /** Apache authz provisders */
 extern const authz_provider ssl_authz_provider_require_ssl;