Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DE79F200CDE for ; Tue, 8 Aug 2017 15:33:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DCDCE16741A; Tue, 8 Aug 2017 13:33:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2C64616740B for ; Tue, 8 Aug 2017 15:33:50 +0200 (CEST) Received: (qmail 39190 invoked by uid 500); 8 Aug 2017 13:33:49 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 39181 invoked by uid 99); 8 Aug 2017 13:33:49 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Aug 2017 13:33:49 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 640D13A0334 for ; Tue, 8 Aug 2017 13:33:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1804422 - in /httpd/httpd/branches/trunk-md: ./ modules/ssl/ssl_engine_init.c Date: Tue, 08 Aug 2017 13:33:45 -0000 To: cvs@httpd.apache.org From: icing@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170808133348.640D13A0334@svn01-us-west.apache.org> archived-at: Tue, 08 Aug 2017 13:33:51 -0000 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;