diff options
| author | Yann Ylavic <ylavic@apache.org> | 2018-01-08 15:58:57 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2018-01-08 15:58:57 +0000 |
| commit | 1de2691583ec6204cd0a190c5c46efa5b528dcea (patch) | |
| tree | ba64ccaddfc7a0d70eece87dc5fc528c87e4fcb9 | |
| parent | 41483be113b71924230cf5cbbaf022d660b09525 (diff) | |
| download | httpd-1de2691583ec6204cd0a190c5c46efa5b528dcea.tar.gz | |
mod_md is backported in this branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mod_md@1820579 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | modules/ssl/ssl_engine_init.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index 0cfa766da4..2c26564126 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -32,22 +32,6 @@ #include "mpm_common.h" #include "mod_md.h" -/* Use the header, once mod_md is backported. break the dependency loop for now. */ -#define MOD_MD_BACKPORTED 0 -#if MOD_MD_BACKPORTED -#include "mod_md.h" -#else -APR_DECLARE_OPTIONAL_FN(int, - md_is_managed, (struct server_rec *)); -APR_DECLARE_OPTIONAL_FN(apr_status_t, - md_get_certificate, (struct server_rec *, apr_pool_t *, - const char **pkeyfile, - const char **pcertfile)); -APR_DECLARE_OPTIONAL_FN(int, - md_is_challenge, (struct conn_rec *, const char *, - X509 **pcert, EVP_PKEY **pkey)); -#endif - APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ssl, SSL, int, init_server, (server_rec *s,apr_pool_t *p,int is_proxy,SSL_CTX *ctx), (s,p,is_proxy,ctx), OK, DECLINED) |