summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2009-06-30 17:12:19 (GMT)
committer Nokis Mavrogiannopoulos <nmav@gnutls.org>2009-06-30 17:12:19 (GMT)
commit7e67487c0ab67eca34b0945f0d92365773cab9c4 (patch)
treea489be3077fd627ee6a4b864303426f9974c4067
parent0e13d67991fe10019f7fb1fa848f1788a4679b53 (diff)
Applied patch to allow building with Apache 2.4. Patch by Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com>.
-rw-r--r--include/mod_gnutls.h.in4
-rw-r--r--src/gnutls_cache.c8
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;
52 52
53/* Recent Versions of 2.1 renamed several hooks. This allows us to 53/* Recent Versions of 2.1 renamed several hooks. This allows us to
54 compile on 2.0.xx */ 54 compile on 2.0.xx */
55#if AP_SERVER_MINORVERSION_NUMBER >= 1 55#if AP_SERVER_MINORVERSION_NUMBER >= 2 || (AP_SERVER_MINORVERSION_NUMBER == 1 && AP_SERVER_PATCHLEVEL_NUMBER >= 3)
56#if AP_SERVER_PATCHLEVEL_NUMBER >= 3
57#define USING_2_1_RECENT 1 56#define USING_2_1_RECENT 1
58#endif
59#endif 57#endif
60 58
61#ifndef USING_2_1_RECENT 59#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 @@
38#define MC_TAG_LEN sizeof(MC_TAG) 38#define MC_TAG_LEN sizeof(MC_TAG)
39#define STR_SESSION_LEN (GNUTLS_SESSION_ID_STRING_LEN + MC_TAG_LEN) 39#define STR_SESSION_LEN (GNUTLS_SESSION_ID_STRING_LEN + MC_TAG_LEN)
40 40
41#if MODULE_MAGIC_NUMBER_MAJOR < 20081201
42#define ap_unixd_config unixd_config
43#endif
44
41char *mgs_session_id2sz(unsigned char *id, int idlen, 45char *mgs_session_id2sz(unsigned char *id, int idlen,
42 char *str, int strsize) 46 char *str, int strsize)
43{ 47{
@@ -544,9 +548,9 @@ static int dbm_cache_post_config(apr_pool_t *p, server_rec *s,
544#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE) 548#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
545 /* Running as Root */ 549 /* Running as Root */
546 if (geteuid() == 0) { 550 if (geteuid() == 0) {
547 chown(path1, unixd_config.user_id, -1); 551 chown(path1, ap_unixd_config.user_id, -1);
548 if (path2 != NULL) { 552 if (path2 != NULL) {
549 chown(path2, unixd_config.user_id, -1); 553 chown(path2, ap_unixd_config.user_id, -1);
550 } 554 }
551 } 555 }
552#endif 556#endif