Changes in / [619c6bf:9c4a744] in mod_gnutls


Ignore:
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • NEWS

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

    r619c6bf r9c4a744  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.65 for mod_gnutls 0.5.9.
     3# Generated by GNU Autoconf 2.65 for mod_gnutls 0.5.8.
    44#
    55#
     
    699699PACKAGE_NAME='mod_gnutls'
    700700PACKAGE_TARNAME='mod_gnutls'
    701 PACKAGE_VERSION='0.5.9'
    702 PACKAGE_STRING='mod_gnutls 0.5.9'
     701PACKAGE_VERSION='0.5.8'
     702PACKAGE_STRING='mod_gnutls 0.5.8'
    703703PACKAGE_BUGREPORT=''
    704704PACKAGE_URL=''
     
    14651465  # This message is too long to be a string in the A/UX 3.1 sh.
    14661466  cat <<_ACEOF
    1467 \`configure' configures mod_gnutls 0.5.9 to adapt to many kinds of systems.
     1467\`configure' configures mod_gnutls 0.5.8 to adapt to many kinds of systems.
    14681468
    14691469Usage: $0 [OPTION]... [VAR=VALUE]...
     
    15361536if test -n "$ac_init_help"; then
    15371537  case $ac_init_help in
    1538      short | recursive ) echo "Configuration of mod_gnutls 0.5.9:";;
     1538     short | recursive ) echo "Configuration of mod_gnutls 0.5.8:";;
    15391539   esac
    15401540  cat <<\_ACEOF
     
    16491649if $ac_init_version; then
    16501650  cat <<\_ACEOF
    1651 mod_gnutls configure 0.5.9
     1651mod_gnutls configure 0.5.8
    16521652generated by GNU Autoconf 2.65
    16531653
     
    19661966running configure, to aid debugging if configure makes a mistake.
    19671967
    1968 It was created by mod_gnutls $as_me 0.5.9, which was
     1968It was created by mod_gnutls $as_me 0.5.8, which was
    19691969generated by GNU Autoconf 2.65.  Invocation command line was
    19701970
     
    23312331  chmod +x config.nice
    23322332
    2333 MOD_GNUTLS_VERSION=0.5.9
     2333MOD_GNUTLS_VERSION=0.5.8
    23342334
    23352335
     
    29412941# Define the identity of the package.
    29422942 PACKAGE=mod_gnutls
    2943  VERSION=0.5.9
     2943 VERSION=0.5.8
    29442944
    29452945
     
    1191611916# values after options handling.
    1191711917ac_log="
    11918 This file was extended by mod_gnutls $as_me 0.5.9, which was
     11918This file was extended by mod_gnutls $as_me 0.5.8, which was
    1191911919generated by GNU Autoconf 2.65.  Invocation command line was
    1192011920
     
    1198211982ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    1198311983ac_cs_version="\\
    11984 mod_gnutls config.status 0.5.9
     11984mod_gnutls config.status 0.5.8
    1198511985configured by $0, generated by GNU Autoconf 2.65,
    1198611986  with options \\"\$ac_cs_config\\"
  • configure.ac

    r619c6bf r9c4a744  
    11dnl
    2 AC_INIT(mod_gnutls, 0.5.9)
     2AC_INIT(mod_gnutls, 0.5.8)
    33OOO_CONFIG_NICE(config.nice)
    44MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
  • include/mod_gnutls.h.in

    r619c6bf r9c4a744  
    6464    mgs_cache_none,
    6565    mgs_cache_dbm,
    66     mgs_cache_gdbm,
    6766#if HAVE_APR_MEMCACHE
    6867    mgs_cache_memcache
  • src/gnutls_cache.c

    r619c6bf r9c4a744  
    3636/* it seems the default has some strange errors. Use SDBM
    3737 */
     38#define ODB "SDBM"
     39
    3840#define MC_TAG "mod_gnutls:"
    3941#define MC_TAG_LEN sizeof(MC_TAG)
     
    295297#endif /* have_apr_memcache */
    296298
    297 const char* db_type(mgs_srvconf_rec * sc)
    298 {
    299         if (sc->cache_type == mgs_cache_gdbm)
    300                 return "gdbm";
    301         else
    302                 return "db";
    303 }
    304 
    305299#define SSL_DBM_FILE_MODE ( APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD )
    306300
     
    328322    deleted = 0;
    329323
    330     rv = apr_dbm_open_ex(&dbm, db_type(ctxt->sc), ctxt->sc->cache_config, APR_DBM_RWCREATE,
     324    rv = apr_dbm_open_ex(&dbm, ODB, ctxt->sc->cache_config, APR_DBM_RWCREATE,
    331325                      SSL_DBM_FILE_MODE, spool);
    332326    if (rv != APR_SUCCESS) {
     
    381375        return data;
    382376
    383     rv = apr_dbm_open_ex(&dbm, db_type(ctxt->sc), ctxt->sc->cache_config,
     377    rv = apr_dbm_open_ex(&dbm, ODB, ctxt->sc->cache_config,
    384378                      APR_DBM_READONLY, SSL_DBM_FILE_MODE, ctxt->c->pool);
    385379    if (rv != APR_SUCCESS) {
     
    451445           data.data, data.size);
    452446
    453     rv = apr_dbm_open_ex(&dbm, db_type(ctxt->sc), ctxt->sc->cache_config,
     447    rv = apr_dbm_open_ex(&dbm, ODB, ctxt->sc->cache_config,
    454448                      APR_DBM_RWCREATE, SSL_DBM_FILE_MODE, ctxt->c->pool);
    455449    if (rv != APR_SUCCESS) {
     
    491485        return -1;
    492486
    493     rv = apr_dbm_open_ex(&dbm, db_type(ctxt->sc), ctxt->sc->cache_config,
     487    rv = apr_dbm_open_ex(&dbm, ODB, ctxt->sc->cache_config,
    494488                      APR_DBM_RWCREATE, SSL_DBM_FILE_MODE, ctxt->c->pool);
    495489    if (rv != APR_SUCCESS) {
     
    525519    const char* path2;
    526520
    527     rv = apr_dbm_open_ex(&dbm, db_type(sc), sc->cache_config, APR_DBM_RWCREATE,
     521    rv = apr_dbm_open_ex(&dbm, ODB, sc->cache_config, APR_DBM_RWCREATE,
    528522                      SSL_DBM_FILE_MODE, p);
    529523
     
    537531    apr_dbm_close(dbm);
    538532
    539     apr_dbm_get_usednames_ex(p, db_type(sc), sc->cache_config, &path1, &path2);
     533    apr_dbm_get_usednames_ex(p, ODB, sc->cache_config, &path1, &path2);
    540534
    541535    /* The Following Code takes logic directly from mod_ssl's DBM Cache */
     
    556550                                 mgs_srvconf_rec *sc)
    557551{
    558     if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm) {
     552    if (sc->cache_type == mgs_cache_dbm) {
    559553        return dbm_cache_post_config(p, s, sc);
    560554    }
     
    565559                                mgs_srvconf_rec *sc)
    566560{
    567     if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm) {
     561    if (sc->cache_type == mgs_cache_dbm) {
    568562        return 0;
    569563    }
     
    580574int mgs_cache_session_init(mgs_handle_t *ctxt)
    581575{
    582     if (ctxt->sc->cache_type == mgs_cache_dbm || ctxt->sc->cache_type == mgs_cache_gdbm) {
     576    if (ctxt->sc->cache_type == mgs_cache_dbm) {
    583577        gnutls_db_set_retrieve_function(ctxt->session, dbm_cache_fetch);
    584578        gnutls_db_set_remove_function(ctxt->session, dbm_cache_delete);
  • src/gnutls_config.c

    r619c6bf r9c4a744  
    344344    }
    345345
    346     if (strcasecmp("none", type) == 0) {
    347         sc->cache_type = mgs_cache_none;
    348     } else if (strcasecmp("dbm", type) == 0) {
     346    sc->cache_type = mgs_cache_none;
     347    if (strcasecmp("dbm", type) == 0) {
    349348        sc->cache_type = mgs_cache_dbm;
    350     }
    351     else if (strcasecmp("gdbm", type) == 0) {
    352         sc->cache_type = mgs_cache_gdbm;
    353349    }
    354350#if HAVE_APR_MEMCACHE
     
    361357    }
    362358
    363     if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm) {
     359    if (sc->cache_type == mgs_cache_dbm) {
    364360        sc->cache_config = ap_server_root_relative(parms->pool, arg);
    365361    } else {
  • src/gnutls_io.c

    r619c6bf r9c4a744  
    556556        apr_bucket *bucket = APR_BRIGADE_FIRST(bb);
    557557       
    558         if (AP_BUCKET_IS_EOC(bucket)) {
     558        if (AP_BUCKET_IS_EOC(bucket) || APR_BUCKET_IS_EOS(bucket)) {
     559            apr_bucket_brigade * tmpb;
     560           
     561            if (APR_BUCKET_IS_EOS(bucket)) {
     562                tmpb = bb;
     563            } else {
     564                tmpb = ctxt->output_bb;
     565            }
     566           
    559567            if (ctxt->session != NULL) {
    560568                do {
     
    566574            APR_BRIGADE_INSERT_TAIL(ctxt->output_bb, e);
    567575 
    568             if ((status = ap_pass_brigade(f->next, ctxt->output_bb)) != APR_SUCCESS) {
     576            if ((status = ap_pass_brigade(f->next, tmpb)) != APR_SUCCESS) {
    569577                apr_brigade_cleanup(ctxt->output_bb);
    570578                return status;
     
    577585            }
    578586            continue;
    579         } else if (APR_BUCKET_IS_FLUSH(bucket) || APR_BUCKET_IS_EOS(bucket)) {
     587        } else if (APR_BUCKET_IS_FLUSH(bucket)) {
    580588
    581589            apr_bucket_copy(bucket, &e);
Note: See TracChangeset for help on using the changeset viewer.