Changeset 619c6bf in mod_gnutls for src

Timestamp:

Jan 11, 2013, 12:58:18 AM (8 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

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

Children:

2b1118c

Parents:

9c4a744 (diff), 17eb1a1 (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.5.9'

Upstream version 0.5.9

Location:

src

Files:

• gnutls_cache.c (modified) (11 diffs)
• gnutls_config.c (modified) (2 diffs)
• gnutls_io.c (modified) (3 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_gdbm)
+                return "gdbm";
+        else
+                return "db";
+}
+
 #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_gdbm) {
         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_gdbm) {
         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_gdbm) {
         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("gdbm", type) == 0) {
+        sc->cache_type = mgs_cache_gdbm;
     }
 #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_gdbm) {
         sc->cache_config = ap_server_root_relative(parms->pool, arg);
     } else {

src/gnutls_io.c

@@ -556 +556 @@
         apr_bucket *bucket = APR_BRIGADE_FIRST(bb);
         
-        if (AP_BUCKET_IS_EOC(bucket) || APR_BUCKET_IS_EOS(bucket)) {
-            apr_bucket_brigade * tmpb;
-            
-            if (APR_BUCKET_IS_EOS(bucket)) {
-                tmpb = bb;
-            } else {
-                tmpb = ctxt->output_bb;
-            }
-            
+        if (AP_BUCKET_IS_EOC(bucket)) {
             if (ctxt->session != NULL) {
                 do {
@@ -574 +566 @@
             APR_BRIGADE_INSERT_TAIL(ctxt->output_bb, e);
  
-            if ((status = ap_pass_brigade(f->next, tmpb)) != APR_SUCCESS) {
+            if ((status = ap_pass_brigade(f->next, ctxt->output_bb)) != APR_SUCCESS) {
                 apr_brigade_cleanup(ctxt->output_bb);
                 return status;
@@ -585 +577 @@
             }
             continue;
-        } else if (APR_BUCKET_IS_FLUSH(bucket)) {
+        } else if (APR_BUCKET_IS_FLUSH(bucket) || APR_BUCKET_IS_EOS(bucket)) {
 
             apr_bucket_copy(bucket, &e);