Changeset 17eb1a1 in mod_gnutls

Timestamp:

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

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

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

Children:

180e49f, 619c6bf

Parents:

5508683

Message:

Imported Upstream version 0.5.9

Files:

• NEWS (modified) (1 diff)
• configure (modified) (10 diffs)
• configure.ac (modified) (1 diff)
• include/mod_gnutls.h.in (modified) (1 diff)
• src/gnutls_cache.c (modified) (11 diffs)
• src/gnutls_config.c (modified) (2 diffs)
• src/gnutls_io.c (modified) (3 diffs)

NEWS

@@ +1 @@
+** Version 0.5.9 (2010-09-24)
+- Corrected behavior in Keep-Alive connections (do not
+  terminate the connection prematurely)
+
+- The GnuTLSCache variable now can be given the specific
+  option "gdbm" instead of "dbm". "dbm" will use the berkeley
+  db type of libapr while gdbm will force gdbm to be used.
+  sdbm is no longer being used due to serious limitations.
+
 ** Version 0.5.8 (2010-08-18)
 - Session tickets are enabled by default.

configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for mod_gnutls 0.5.8.
+# Generated by GNU Autoconf 2.65 for mod_gnutls 0.5.9.
 #
 #
@@ -699 +699 @@
 PACKAGE_NAME='mod_gnutls'
 PACKAGE_TARNAME='mod_gnutls'
-PACKAGE_VERSION='0.5.8'
-PACKAGE_STRING='mod_gnutls 0.5.8'
+PACKAGE_VERSION='0.5.9'
+PACKAGE_STRING='mod_gnutls 0.5.9'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
@@ -1465 +1465 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mod_gnutls 0.5.8 to adapt to many kinds of systems.
+\`configure' configures mod_gnutls 0.5.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1536 +1536 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mod_gnutls 0.5.8:";;
+     short | recursive ) echo "Configuration of mod_gnutls 0.5.9:";;
    esac
   cat <<\_ACEOF
@@ -1649 +1649 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-mod_gnutls configure 0.5.8
+mod_gnutls configure 0.5.9
 generated by GNU Autoconf 2.65
 
@@ -1966 +1966 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mod_gnutls $as_me 0.5.8, which was
+It was created by mod_gnutls $as_me 0.5.9, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
@@ -2331 +2331 @@
   chmod +x config.nice
 
-MOD_GNUTLS_VERSION=0.5.8
+MOD_GNUTLS_VERSION=0.5.9
 
 
@@ -2941 +2941 @@
 # Define the identity of the package.
  PACKAGE=mod_gnutls
- VERSION=0.5.8
+ VERSION=0.5.9
 
 
@@ -11916 +11916 @@
 # values after options handling.
 ac_log="
-This file was extended by mod_gnutls $as_me 0.5.8, which was
+This file was extended by mod_gnutls $as_me 0.5.9, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
@@ -11982 +11982 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mod_gnutls config.status 0.5.8
+mod_gnutls config.status 0.5.9
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"

configure.ac

@@ -1 +1 @@
 dnl 
-AC_INIT(mod_gnutls, 0.5.8)
+AC_INIT(mod_gnutls, 0.5.9)
 OOO_CONFIG_NICE(config.nice)
 MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION

include/mod_gnutls.h.in

@@ -64 +64 @@
     mgs_cache_none,
     mgs_cache_dbm,
+    mgs_cache_gdbm,
 #if HAVE_APR_MEMCACHE
     mgs_cache_memcache

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);