Changeset 71e9a5c in mod_gnutls for src/gnutls_cache.c

Timestamp:

Aug 22, 2015, 3:53:31 PM (6 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports

Children:

b837187

Parents:

2db6923 (diff), 4addf74 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge tag 'upstream/0.7' into debian

Upstream version 0.7

File:

• src/gnutls_cache.c (modified) (3 diffs)

src/gnutls_cache.c

@@ -3 +3 @@
  *  Copyright 2008 Nikos Mavrogiannopoulos
  *  Copyright 2011 Dash Shendy
+ *  Copyright 2015 Thomas Klute
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -45 +46 @@
 #endif
 
+#ifdef APLOG_USE_MODULE
+APLOG_USE_MODULE(gnutls);
+#endif
+
 char *mgs_session_id2sz(unsigned char *id, int idlen,
         char *str, int strsize) {
@@ -576 +581 @@
 }
 
-int mgs_cache_child_init(apr_pool_t * p, server_rec * s,
-        mgs_srvconf_rec * sc) {
+#if HAVE_APR_MEMCACHE
+int mgs_cache_child_init(apr_pool_t * p,
+                         server_rec * s,
+                         mgs_srvconf_rec * sc)
+#else
+int mgs_cache_child_init(apr_pool_t * p __attribute__((unused)),
+                         server_rec * s __attribute__((unused)),
+                         mgs_srvconf_rec * sc)
+#endif
+{
     if (sc->cache_type == mgs_cache_dbm
             || sc->cache_type == mgs_cache_gdbm) {