200610

Change the kludge for determining the current version of Apache we're
building against. Claim to be building against 2.0.55 if not told
otherwise. The exact version matters less than knowing which API to
use.

3 files changed, 12 insertions, 3 deletions

diff --git a/mod_nss.c b/mod_nss.c
index b7b9e24..b46169f 100644
--- a/mod_nss.c
+++ b/mod_nss.c
@@ -399,7 +399,7 @@ static void nss_register_hooks(apr_pool_t *p)
 
     ap_hook_pre_connection(nss_hook_pre_connection,NULL,NULL, APR_HOOK_MIDDLE);
     ap_hook_post_config   (nss_init_Module,        NULL,NULL, APR_HOOK_MIDDLE);
-#ifndef AP_SERVER_MAJORVERSION_NUMBER
+#if AP_SERVER_MINORVERSION_NUMBER < 2 /* See comment in mod_nss.h */
     ap_hook_http_method   (nss_hook_http_scheme,   NULL,NULL, APR_HOOK_MIDDLE);
 #else
     ap_hook_http_scheme   (nss_hook_http_scheme,   NULL,NULL, APR_HOOK_MIDDLE);
diff --git a/mod_nss.h b/mod_nss.h
index c777c4d..117290f 100644
--- a/mod_nss.h
+++ b/mod_nss.h
@@ -327,8 +327,17 @@ typedef struct
 } cipher_properties;
 
 /* Compatibility between Apache 2.0.x and 2.2.x. The numeric version of
- * the version first appeared in Apache 2.2.0 */
+ * the version first appeared in Apache 2.0.56-dev. I picked 2.0.55 as it
+ * is the last version without this define. This is used for more than just
+ * the below defines. It also determines which API is used.
+ */
 #ifndef AP_SERVER_MAJORVERSION_NUMBER
+#define AP_SERVER_MAJORVERSION_NUMBER 2
+#define AP_SERVER_MINORVERSION_NUMBER 0
+#define AP_SERVER_PATCHLEVEL_NUMBER   55
+#endif
+
+#if AP_SERVER_MINORVERSION_NUMBER < 2
 typedef struct regex_t ap_regex_t;
 #define AP_REG_EXTENDED REG_EXTENDED
 #define AP_REG_NOSUB REG_NOSUB
diff --git a/nss_engine_vars.c b/nss_engine_vars.c
index a6e2fe8..8002bb1 100644
--- a/nss_engine_vars.c
+++ b/nss_engine_vars.c
@@ -101,7 +101,7 @@ char *nss_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r,
         else if (strcEQ(var, "REQUEST_METHOD"))
             result = (char *)(r->method);
         else if (strcEQ(var, "REQUEST_SCHEME"))
-#ifndef AP_SERVER_MAJORVERSION_NUMBER
+#if AP_SERVER_MINORVERSION_NUMBER < 2 /* See comment in mod_nss.h */
             result = (char *)ap_http_method(r);
 #else
             result = (char *)ap_http_scheme(r);