From 7e67487c0ab67eca34b0945f0d92365773cab9c4 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Tue, 30 Jun 2009 17:12:19 +0000 Subject: Applied patch to allow building with Apache 2.4. Patch by Arfrever Frehtes Taifersar Arahesis . --- include/mod_gnutls.h.in | 4 +--- src/gnutls_cache.c | 8 ++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/mod_gnutls.h.in b/include/mod_gnutls.h.in index ec28e07..58eed1b 100644 --- a/include/mod_gnutls.h.in +++ b/include/mod_gnutls.h.in @@ -52,10 +52,8 @@ extern module AP_MODULE_DECLARE_DATA gnutls_module; /* 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 #ifndef USING_2_1_RECENT diff --git a/src/gnutls_cache.c b/src/gnutls_cache.c index e8dcdc6..a0612f9 100644 --- a/src/gnutls_cache.c +++ b/src/gnutls_cache.c @@ -38,6 +38,10 @@ #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, char *str, int strsize) { @@ -544,9 +548,9 @@ static int dbm_cache_post_config(apr_pool_t *p, server_rec *s, #if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE) /* 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); } } #endif -- cgit