svn commit: r224718 - /httpd/httpd/trunk/modules/metadata/mod_setenvif.c

[jo...@apache.org]

Author: jorton
Date: Mon Jul 25 05:28:42 2005
New Revision: 224718

URL: http://svn.apache.org/viewcvs?rev=224718&view=rev
Log:
* modules/metadata/mod_setenvif.c: Unconditionally include mod_ssl.h.
(setenvif_post_config): Fix prototype fubar.

Modified:
    httpd/httpd/trunk/modules/metadata/mod_setenvif.c

Modified: httpd/httpd/trunk/modules/metadata/mod_setenvif.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/metadata/mod_setenvif.c?rev=224718&r1=224717&r2=224718&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_setenvif.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_setenvif.c Mon Jul 25 05:28:42 2005
@@ -94,6 +94,7 @@
 #include "http_log.h"
 #include "http_protocol.h"
 
+#include "mod_ssl.h"
 
 enum special {
     SPECIAL_NOT,
@@ -121,11 +122,7 @@
 } 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 @@
     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;