Changeset 482f47f in mod_gnutls

Timestamp:

Apr 8, 2005, 6:31:04 PM (15 years ago)

Author:

Paul Querna <chip@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, msva, proxy-ticket, upstream

Children:

f2d7e3c

Parents:

5a6446d

Message:

include support for 2.0.xx

Files:

• include/mod_gnutls.h.in (modified) (2 diffs)
• src/mod_gnutls.c (modified) (1 diff)

include/mod_gnutls.h.in

@@ -26 +26 @@
 #include "apr_strings.h"
 #include "apr_tables.h"
+#include "ap_release.h"
 
 #ifndef __mod_gnutls_h_inc
@@ -46 +47 @@
 
 #define MOD_GNUTLS_DEBUG @OOO_MAINTAIN@
+
+/* Recent Versions of 2.1 renamed several hooks. This allows us to 
+   compile on 2.0.xx  */
+#if AP_SERVER_MINORVERSION_NUMBER >= 1
+#if AP_SERVER_PATCHLEVEL_NUMBER >= 3
+#define USING_2_1_RECENT 1
+#endif
+#endif 
+
+#ifndef USING_2_1_RECENT
+#define USING_2_1_RECENT 0
+#endif
 
 typedef enum 

src/mod_gnutls.c

@@ -527 +527 @@
     ap_hook_child_init(mod_gnutls_hook_child_init, NULL, NULL,
                         APR_HOOK_MIDDLE);
+#if USING_2_1_RECENT
     ap_hook_http_scheme(mod_gnutls_hook_http_scheme, NULL, NULL,
                         APR_HOOK_MIDDLE);
+#else
+    ap_hook_http_method(mod_gnutls_hook_http_scheme, NULL, NULL,
+                        APR_HOOK_MIDDLE);
+#endif
     ap_hook_default_port(mod_gnutls_hook_default_port, NULL, NULL,
                          APR_HOOK_MIDDLE);