Changeset 7e67487 in mod_gnutls

Timestamp:

Jun 30, 2009, 1:12:19 PM (14 years ago)

Author:

Nokis Mavrogiannopoulos <nmav@…>

Branches:

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

Children:

f7a7d66

Parents:

0e13d67

git-author:

Nikos Mavrogiannopoulos <nmav@…> (06/30/09 13:12:19)

git-committer:

Nokis Mavrogiannopoulos <nmav@…> (06/30/09 13:12:19)

Message:

Applied patch to allow building with Apache 2.4. Patch by Arfrever Frehtes Taifersar Arahesis <arfrever.fta@…>.

Files:

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

include/mod_gnutls.h.in

@@ -53 +53 @@
 /* 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
+#if AP_SERVER_MINORVERSION_NUMBER >= 2 || (AP_SERVER_MINORVERSION_NUMBER == 1 && AP_SERVER_PATCHLEVEL_NUMBER >= 3)
 #define USING_2_1_RECENT 1
-#endif
 #endif 
 

src/gnutls_cache.c

@@ -38 +38 @@
 #define MC_TAG_LEN sizeof(MC_TAG)
 #define STR_SESSION_LEN (GNUTLS_SESSION_ID_STRING_LEN + MC_TAG_LEN)
+
+#if MODULE_MAGIC_NUMBER_MAJOR < 20081201
+#define ap_unixd_config unixd_config
+#endif
 
 char *mgs_session_id2sz(unsigned char *id, int idlen,
@@ -545 +549 @@
     /* Running as Root */
     if (geteuid() == 0)  {
-        chown(path1, unixd_config.user_id, -1);
+        chown(path1, ap_unixd_config.user_id, -1);
         if (path2 != NULL) { 
-            chown(path2, unixd_config.user_id, -1);
+            chown(path2, ap_unixd_config.user_id, -1);
         }
     }