Changeset 619c6bf in mod_gnutls


Ignore:
Timestamp:
Jan 11, 2013, 12:58:18 AM (6 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

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • NEWS

    r9c4a744 r619c6bf  
     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
    110** Version 0.5.8 (2010-08-18)
    211- Session tickets are enabled by default.
  • configure

    r9c4a744 r619c6bf  
    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.8.
     3# Generated by GNU Autoconf 2.65 for mod_gnutls 0.5.9.
    44#
    55#
     
    699699PACKAGE_NAME='mod_gnutls'
    700700PACKAGE_TARNAME='mod_gnutls'
    701 PACKAGE_VERSION='0.5.8'
    702 PACKAGE_STRING='mod_gnutls 0.5.8'
     701PACKAGE_VERSION='0.5.9'
     702PACKAGE_STRING='mod_gnutls 0.5.9'
    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.8 to adapt to many kinds of systems.
     1467\`configure' configures mod_gnutls 0.5.9 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.8:";;
     1538     short | recursive ) echo "Configuration of mod_gnutls 0.5.9:";;
    15391539   esac
    15401540  cat <<\_ACEOF
     
    16491649if $ac_init_version; then
    16501650  cat <<\_ACEOF
    1651 mod_gnutls configure 0.5.8
     1651mod_gnutls configure 0.5.9
    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.8, which was
     1968It was created by mod_gnutls $as_me 0.5.9, 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.8
     2333MOD_GNUTLS_VERSION=0.5.9
    23342334
    23352335
     
    29412941# Define the identity of the package.
    29422942 PACKAGE=mod_gnutls
    2943  VERSION=0.5.8
     2943 VERSION=0.5.9
    29442944
    29452945
     
    1191611916# values after options handling.
    1191711917ac_log="
    11918 This file was extended by mod_gnutls $as_me 0.5.8, which was
     11918This file was extended by mod_gnutls $as_me 0.5.9, 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.8
     11984mod_gnutls config.status 0.5.9
    1198511985configured by $0, generated by GNU Autoconf 2.65,
    1198611986  with options \\"\$ac_cs_config\\"
  • configure.ac

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

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

    r9c4a744 r619c6bf  
    3636/* it seems the default has some strange errors. Use SDBM
    3737 */
    38 #define ODB "SDBM"
    39 
    4038#define MC_TAG "mod_gnutls:"
    4139#define MC_TAG_LEN sizeof(MC_TAG)
     
    297295#endif /* have_apr_memcache */
    298296
     297const 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
    299305#define SSL_DBM_FILE_MODE ( APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD )
    300306
     
    322328    deleted = 0;
    323329
    324     rv = apr_dbm_open_ex(&dbm, ODB, ctxt->sc->cache_config, APR_DBM_RWCREATE,
     330    rv = apr_dbm_open_ex(&dbm, db_type(ctxt->sc), ctxt->sc->cache_config, APR_DBM_RWCREATE,
    325331                      SSL_DBM_FILE_MODE, spool);
    326332    if (rv != APR_SUCCESS) {
     
    375381        return data;
    376382
    377     rv = apr_dbm_open_ex(&dbm, ODB, ctxt->sc->cache_config,
     383    rv = apr_dbm_open_ex(&dbm, db_type(ctxt->sc), ctxt->sc->cache_config,
    378384                      APR_DBM_READONLY, SSL_DBM_FILE_MODE, ctxt->c->pool);
    379385    if (rv != APR_SUCCESS) {
     
    445451           data.data, data.size);
    446452
    447     rv = apr_dbm_open_ex(&dbm, ODB, ctxt->sc->cache_config,
     453    rv = apr_dbm_open_ex(&dbm, db_type(ctxt->sc), ctxt->sc->cache_config,
    448454                      APR_DBM_RWCREATE, SSL_DBM_FILE_MODE, ctxt->c->pool);
    449455    if (rv != APR_SUCCESS) {
     
    485491        return -1;
    486492
    487     rv = apr_dbm_open_ex(&dbm, ODB, ctxt->sc->cache_config,
     493    rv = apr_dbm_open_ex(&dbm, db_type(ctxt->sc), ctxt->sc->cache_config,
    488494                      APR_DBM_RWCREATE, SSL_DBM_FILE_MODE, ctxt->c->pool);
    489495    if (rv != APR_SUCCESS) {
     
    519525    const char* path2;
    520526
    521     rv = apr_dbm_open_ex(&dbm, ODB, sc->cache_config, APR_DBM_RWCREATE,
     527    rv = apr_dbm_open_ex(&dbm, db_type(sc), sc->cache_config, APR_DBM_RWCREATE,
    522528                      SSL_DBM_FILE_MODE, p);
    523529
     
    531537    apr_dbm_close(dbm);
    532538
    533     apr_dbm_get_usednames_ex(p, ODB, sc->cache_config, &path1, &path2);
     539    apr_dbm_get_usednames_ex(p, db_type(sc), sc->cache_config, &path1, &path2);
    534540
    535541    /* The Following Code takes logic directly from mod_ssl's DBM Cache */
     
    550556                                 mgs_srvconf_rec *sc)
    551557{
    552     if (sc->cache_type == mgs_cache_dbm) {
     558    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm) {
    553559        return dbm_cache_post_config(p, s, sc);
    554560    }
     
    559565                                mgs_srvconf_rec *sc)
    560566{
    561     if (sc->cache_type == mgs_cache_dbm) {
     567    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm) {
    562568        return 0;
    563569    }
     
    574580int mgs_cache_session_init(mgs_handle_t *ctxt)
    575581{
    576     if (ctxt->sc->cache_type == mgs_cache_dbm) {
     582    if (ctxt->sc->cache_type == mgs_cache_dbm || ctxt->sc->cache_type == mgs_cache_gdbm) {
    577583        gnutls_db_set_retrieve_function(ctxt->session, dbm_cache_fetch);
    578584        gnutls_db_set_remove_function(ctxt->session, dbm_cache_delete);
  • src/gnutls_config.c

    r9c4a744 r619c6bf  
    344344    }
    345345
    346     sc->cache_type = mgs_cache_none;
    347     if (strcasecmp("dbm", type) == 0) {
     346    if (strcasecmp("none", type) == 0) {
     347        sc->cache_type = mgs_cache_none;
     348    } else if (strcasecmp("dbm", type) == 0) {
    348349        sc->cache_type = mgs_cache_dbm;
     350    }
     351    else if (strcasecmp("gdbm", type) == 0) {
     352        sc->cache_type = mgs_cache_gdbm;
    349353    }
    350354#if HAVE_APR_MEMCACHE
     
    357361    }
    358362
    359     if (sc->cache_type == mgs_cache_dbm) {
     363    if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm) {
    360364        sc->cache_config = ap_server_root_relative(parms->pool, arg);
    361365    } else {
  • src/gnutls_io.c

    r9c4a744 r619c6bf  
    556556        apr_bucket *bucket = APR_BRIGADE_FIRST(bb);
    557557       
    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            
     558        if (AP_BUCKET_IS_EOC(bucket)) {
    567559            if (ctxt->session != NULL) {
    568560                do {
     
    574566            APR_BRIGADE_INSERT_TAIL(ctxt->output_bb, e);
    575567 
    576             if ((status = ap_pass_brigade(f->next, tmpb)) != APR_SUCCESS) {
     568            if ((status = ap_pass_brigade(f->next, ctxt->output_bb)) != APR_SUCCESS) {
    577569                apr_brigade_cleanup(ctxt->output_bb);
    578570                return status;
     
    585577            }
    586578            continue;
    587         } else if (APR_BUCKET_IS_FLUSH(bucket)) {
     579        } else if (APR_BUCKET_IS_FLUSH(bucket) || APR_BUCKET_IS_EOS(bucket)) {
    588580
    589581            apr_bucket_copy(bucket, &e);
Note: See TracChangeset for help on using the changeset viewer.