From: Joe Orton <jorton@apache.org>
Date: Mon, 25 Jul 2005 12:28:42 +0000 (+0000)
Subject: * modules/metadata/mod_setenvif.c: Unconditionally include mod_ssl.h.
X-Git-Tag: 2.1.7~5^2~73
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e5a4018913f7346bb7b80bcd9d0095bd3d58a47;p=apache

* modules/metadata/mod_setenvif.c: Unconditionally include mod_ssl.h.
(setenvif_post_config): Fix prototype fubar.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@224718 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c
index 0010e3a943..2d568cc0fc 100644
--- a/modules/metadata/mod_setenvif.c
+++ b/modules/metadata/mod_setenvif.c
@@ -94,6 +94,7 @@
 #include "http_log.h"
 #include "http_protocol.h"
 
+#include "mod_ssl.h"
 
 enum special {
     SPECIAL_NOT,
@@ -121,11 +122,7 @@ typedef struct {
 } sei_cfg_rec;
 
 module AP_MODULE_DECLARE_DATA setenvif_module;
-#if (MODULE_MAGIC_NUMBER_MAJOR > 20020903)
-#include "mod_ssl.h"
-#else
-APR_DECLARE_OPTIONAL_FN(apr_array_header_t *, ssl_extlist_by_oid, (request_rec *r, const char *oidstr));
-#endif
+
 static APR_OPTIONAL_FN_TYPE(ssl_extlist_by_oid) *ssl_extlist_by_oid_func = NULL;
 
 /*
@@ -630,8 +627,8 @@ static int match_headers(request_rec *r)
     return DECLINED;
 }
 
-static int
-setenvif_post_config()
+static int setenvif_post_config(apr_pool_t *pconf, apr_pool_t *plog,
+                                apr_pool_t *ptemp, server_rec *s)
 {
     ssl_extlist_by_oid_func = APR_RETRIEVE_OPTIONAL_FN(ssl_extlist_by_oid);
     return OK;