httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1804422 - in /httpd/httpd/branches/trunk-md: ./ modules/ssl/ssl_engine_init.c
Date Tue, 08 Aug 2017 13:33:45 GMT
Author: icing
Date: Tue Aug  8 13:33:45 2017
New Revision: 1804422

URL: http://svn.apache.org/viewvc?rev=1804422&view=rev
Log:
mod_ssl uses now mod_md header file for optional function declaration

Modified:
    httpd/httpd/branches/trunk-md/   (props changed)
    httpd/httpd/branches/trunk-md/modules/ssl/ssl_engine_init.c

Propchange: httpd/httpd/branches/trunk-md/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  8 13:33:45 2017
@@ -5,4 +5,4 @@
 /httpd/httpd/branches/trunk-override-index:1793921-1793931
 /httpd/httpd/branches/trunk-test-integration:1777251-1801666
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1804087-1804096
+/httpd/httpd/trunk:1804087-1804421

Modified: httpd/httpd/branches/trunk-md/modules/ssl/ssl_engine_init.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/trunk-md/modules/ssl/ssl_engine_init.c?rev=1804422&r1=1804421&r2=1804422&view=diff
==============================================================================
--- httpd/httpd/branches/trunk-md/modules/ssl/ssl_engine_init.c (original)
+++ httpd/httpd/branches/trunk-md/modules/ssl/ssl_engine_init.c Tue Aug  8 13:33:45 2017
@@ -30,6 +30,7 @@
 #include "mod_ssl.h"
 #include "mod_ssl_openssl.h"
 #include "mpm_common.h"
+#include "mod_md.h"
 
 static apr_status_t ssl_init_ca_cert_path(server_rec *, apr_pool_t *, const char *,
                                           STACK_OF(X509_NAME) *, STACK_OF(X509_INFO) *);
@@ -168,20 +169,8 @@ static void ssl_add_version_components(a
 }
 
 /**************************************************************************************************/
-/* Managed Domains Interface (temporary here) */
+/* Managed Domains Interface */
 
-APR_DECLARE_OPTIONAL_FN(int, 
-                        md_is_managed, (struct server_rec *));
-
-APR_DECLARE_OPTIONAL_FN(apr_status_t, 
-                        md_get_credentials, (struct server_rec *, apr_pool_t *,
-                                             const char **pkeyfile, 
-                                             const char **pcertfile, 
-                                             const char **pchainfile));
-APR_DECLARE_OPTIONAL_FN(int, 
-                        md_is_challenge, (struct conn_rec *, const char *,
-                                          X509 **, EVP_PKEY **));
-                                          
 static APR_OPTIONAL_FN_TYPE(md_is_managed) *md_is_managed;
 static APR_OPTIONAL_FN_TYPE(md_get_credentials) *md_get_credentials;
 static APR_OPTIONAL_FN_TYPE(md_is_challenge) *md_is_challenge;



Mime
View raw message