Changeset 771ca63 in mod_gnutls for src

Timestamp:

Sep 23, 2010, 3:35:27 AM (9 years ago)

Author:

Nikos Mavrogiannopoulos <nmav@…>

Branches:

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

Children:

d8c7cf4

Parents:

0fce7c2

git-author:

Nikos Mavrogiannopoulos <nmav@…> (09/23/10 03:27:03)

git-committer:

Nikos Mavrogiannopoulos <nmav@…> (09/23/10 03:35:27)

Message:

The GnuTLSCache variable now can be given the specific
option "sdbm" instead of "dbm". "dbm" will use the default
dbm type of libapr while sdbm will force sdbm to be used.

Location:

src

Files:

• gnutls_cache.c (modified) (11 diffs)
• gnutls_config.c (modified) (2 diffs)

src/gnutls_cache.c

@@ -36 +36 @@
 /* it seems the default has some strange errors. Use SDBM 
  */
-#define ODB "SDBM"
-
 #define MC_TAG "mod_gnutls:"
 #define MC_TAG_LEN sizeof(MC_TAG)
@@ -297 +295 @@
 #endif /* have_apr_memcache */
 
+const char* db_type(mgs_srvconf_rec * sc)
+{
+        if (sc->cache_type == mgs_cache_sdbm)
+                return "sdbm";
+        else
+                return "default";
+}
+
 #define SSL_DBM_FILE_MODE ( APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD )
 
@@ -322 +328 @@
     deleted = 0;
 
-    rv = apr_dbm_open_ex(&dbm, ODB, ctxt->sc->cache_config, APR_DBM_RWCREATE,
+    rv = apr_dbm_open_ex(&dbm, db_type(ctxt->sc), ctxt->sc->cache_config, APR_DBM_RWCREATE,
                       SSL_DBM_FILE_MODE, spool);
     if (rv != APR_SUCCESS) {
@@ -375 +381 @@
         return data;
 
-    rv = apr_dbm_open_ex(&dbm, ODB, ctxt->sc->cache_config,
+    rv = apr_dbm_open_ex(&dbm, db_type(ctxt->sc), ctxt->sc->cache_config,
                       APR_DBM_READONLY, SSL_DBM_FILE_MODE, ctxt->c->pool);
     if (rv != APR_SUCCESS) {
@@ -445 +451 @@
            data.data, data.size);
 
-    rv = apr_dbm_open_ex(&dbm, ODB, ctxt->sc->cache_config,
+    rv = apr_dbm_open_ex(&dbm, db_type(ctxt->sc), ctxt->sc->cache_config,
                       APR_DBM_RWCREATE, SSL_DBM_FILE_MODE, ctxt->c->pool);
     if (rv != APR_SUCCESS) {
@@ -485 +491 @@
         return -1;
 
-    rv = apr_dbm_open_ex(&dbm, ODB, ctxt->sc->cache_config,
+    rv = apr_dbm_open_ex(&dbm, db_type(ctxt->sc), ctxt->sc->cache_config,
                       APR_DBM_RWCREATE, SSL_DBM_FILE_MODE, ctxt->c->pool);
     if (rv != APR_SUCCESS) {
@@ -519 +525 @@
     const char* path2;
 
-    rv = apr_dbm_open_ex(&dbm, ODB, sc->cache_config, APR_DBM_RWCREATE, 
+    rv = apr_dbm_open_ex(&dbm, db_type(sc), sc->cache_config, APR_DBM_RWCREATE, 
                       SSL_DBM_FILE_MODE, p);
 
@@ -531 +537 @@
     apr_dbm_close(dbm);
 
-    apr_dbm_get_usednames_ex(p, ODB, sc->cache_config, &path1, &path2);
+    apr_dbm_get_usednames_ex(p, db_type(sc), sc->cache_config, &path1, &path2);
 
     /* The Following Code takes logic directly from mod_ssl's DBM Cache */ 
@@ -550 +556 @@
                                  mgs_srvconf_rec *sc)
 {
-    if (sc->cache_type == mgs_cache_dbm) {
+    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_sdbm) {
         return dbm_cache_post_config(p, s, sc);
     }
@@ -559 +565 @@
                                 mgs_srvconf_rec *sc)
 {
-    if (sc->cache_type == mgs_cache_dbm) {
+    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_sdbm) {
         return 0;
     }
@@ -574 +580 @@
 int mgs_cache_session_init(mgs_handle_t *ctxt)
 {
-    if (ctxt->sc->cache_type == mgs_cache_dbm) {
+    if (ctxt->sc->cache_type == mgs_cache_dbm || ctxt->sc->cache_type == mgs_cache_sdbm) {
         gnutls_db_set_retrieve_function(ctxt->session, dbm_cache_fetch);
         gnutls_db_set_remove_function(ctxt->session, dbm_cache_delete);

src/gnutls_config.c

@@ -344 +344 @@
     }
 
-    sc->cache_type = mgs_cache_none;
-    if (strcasecmp("dbm", type) == 0) {
+    if (strcasecmp("none", type) == 0) {
+        sc->cache_type = mgs_cache_none;
+    } else if (strcasecmp("dbm", type) == 0) {
         sc->cache_type = mgs_cache_dbm;
+    }
+    else if (strcasecmp("sdbm", type) == 0) {
+        sc->cache_type = mgs_cache_sdbm;
     }
 #if HAVE_APR_MEMCACHE
@@ -357 +361 @@
     }
 
-    if (sc->cache_type == mgs_cache_dbm) {
+    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_sdbm) {
         sc->cache_config = ap_server_root_relative(parms->pool, arg);
     } else {