[Fedora-directory-commits] mod_nss mod_nss.c, 1.12, 1.13 mod_nss.h, 1.12, 1.13 nss_engine_vars.c, 1.6, 1.7

[Doctor Conrad]

Author: rcritten

Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29645

Modified Files:
	mod_nss.c mod_nss.h nss_engine_vars.c 
Log Message:
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.



Index: mod_nss.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/mod_nss.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_nss.c	20 Jun 2006 20:25:20 -0000	1.12
+++ mod_nss.c	3 Aug 2006 13:29:05 -0000	1.13
@@ -399,7 +399,7 @@
 
     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);


Index: mod_nss.h
===================================================================
RCS file: /cvs/dirsec/mod_nss/mod_nss.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_nss.h	20 Jun 2006 20:25:20 -0000	1.12
+++ mod_nss.h	3 Aug 2006 13:29:05 -0000	1.13
@@ -327,8 +327,17 @@
 } 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


Index: nss_engine_vars.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_vars.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nss_engine_vars.c	7 Apr 2006 20:17:12 -0000	1.6
+++ nss_engine_vars.c	3 Aug 2006 13:29:05 -0000	1.7
@@ -101,7 +101,7 @@
         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);