Changeset 17eb1a1 in mod_gnutls
- Timestamp:
- Jan 11, 2013, 12:58:18 AM (10 years ago)
- Branches:
- debian/master, debian/stretch-backports, jessie-backports, upstream
- Children:
- 180e49f, 619c6bf
- Parents:
- 5508683
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
NEWS
r5508683 r17eb1a1 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 1 10 ** Version 0.5.8 (2010-08-18) 2 11 - Session tickets are enabled by default. -
configure
r5508683 r17eb1a1 1 1 #! /bin/sh 2 2 # 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. 4 4 # 5 5 # … … 699 699 PACKAGE_NAME='mod_gnutls' 700 700 PACKAGE_TARNAME='mod_gnutls' 701 PACKAGE_VERSION='0.5. 8'702 PACKAGE_STRING='mod_gnutls 0.5. 8'701 PACKAGE_VERSION='0.5.9' 702 PACKAGE_STRING='mod_gnutls 0.5.9' 703 703 PACKAGE_BUGREPORT='' 704 704 PACKAGE_URL='' … … 1465 1465 # This message is too long to be a string in the A/UX 3.1 sh. 1466 1466 cat <<_ACEOF 1467 \`configure' configures mod_gnutls 0.5. 8to adapt to many kinds of systems.1467 \`configure' configures mod_gnutls 0.5.9 to adapt to many kinds of systems. 1468 1468 1469 1469 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1536 1536 if test -n "$ac_init_help"; then 1537 1537 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:";; 1539 1539 esac 1540 1540 cat <<\_ACEOF … … 1649 1649 if $ac_init_version; then 1650 1650 cat <<\_ACEOF 1651 mod_gnutls configure 0.5. 81651 mod_gnutls configure 0.5.9 1652 1652 generated by GNU Autoconf 2.65 1653 1653 … … 1966 1966 running configure, to aid debugging if configure makes a mistake. 1967 1967 1968 It was created by mod_gnutls $as_me 0.5. 8, which was1968 It was created by mod_gnutls $as_me 0.5.9, which was 1969 1969 generated by GNU Autoconf 2.65. Invocation command line was 1970 1970 … … 2331 2331 chmod +x config.nice 2332 2332 2333 MOD_GNUTLS_VERSION=0.5. 82333 MOD_GNUTLS_VERSION=0.5.9 2334 2334 2335 2335 … … 2941 2941 # Define the identity of the package. 2942 2942 PACKAGE=mod_gnutls 2943 VERSION=0.5. 82943 VERSION=0.5.9 2944 2944 2945 2945 … … 11916 11916 # values after options handling. 11917 11917 ac_log=" 11918 This file was extended by mod_gnutls $as_me 0.5. 8, which was11918 This file was extended by mod_gnutls $as_me 0.5.9, which was 11919 11919 generated by GNU Autoconf 2.65. Invocation command line was 11920 11920 … … 11982 11982 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 11983 11983 ac_cs_version="\\ 11984 mod_gnutls config.status 0.5. 811984 mod_gnutls config.status 0.5.9 11985 11985 configured by $0, generated by GNU Autoconf 2.65, 11986 11986 with options \\"\$ac_cs_config\\" -
configure.ac
r5508683 r17eb1a1 1 1 dnl 2 AC_INIT(mod_gnutls, 0.5. 8)2 AC_INIT(mod_gnutls, 0.5.9) 3 3 OOO_CONFIG_NICE(config.nice) 4 4 MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION -
include/mod_gnutls.h.in
r5508683 r17eb1a1 64 64 mgs_cache_none, 65 65 mgs_cache_dbm, 66 mgs_cache_gdbm, 66 67 #if HAVE_APR_MEMCACHE 67 68 mgs_cache_memcache -
src/gnutls_cache.c
r5508683 r17eb1a1 36 36 /* it seems the default has some strange errors. Use SDBM 37 37 */ 38 #define ODB "SDBM"39 40 38 #define MC_TAG "mod_gnutls:" 41 39 #define MC_TAG_LEN sizeof(MC_TAG) … … 297 295 #endif /* have_apr_memcache */ 298 296 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 299 305 #define SSL_DBM_FILE_MODE ( APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD ) 300 306 … … 322 328 deleted = 0; 323 329 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, 325 331 SSL_DBM_FILE_MODE, spool); 326 332 if (rv != APR_SUCCESS) { … … 375 381 return data; 376 382 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, 378 384 APR_DBM_READONLY, SSL_DBM_FILE_MODE, ctxt->c->pool); 379 385 if (rv != APR_SUCCESS) { … … 445 451 data.data, data.size); 446 452 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, 448 454 APR_DBM_RWCREATE, SSL_DBM_FILE_MODE, ctxt->c->pool); 449 455 if (rv != APR_SUCCESS) { … … 485 491 return -1; 486 492 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, 488 494 APR_DBM_RWCREATE, SSL_DBM_FILE_MODE, ctxt->c->pool); 489 495 if (rv != APR_SUCCESS) { … … 519 525 const char* path2; 520 526 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, 522 528 SSL_DBM_FILE_MODE, p); 523 529 … … 531 537 apr_dbm_close(dbm); 532 538 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); 534 540 535 541 /* The Following Code takes logic directly from mod_ssl's DBM Cache */ … … 550 556 mgs_srvconf_rec *sc) 551 557 { 552 if (sc->cache_type == mgs_cache_dbm ) {558 if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm) { 553 559 return dbm_cache_post_config(p, s, sc); 554 560 } … … 559 565 mgs_srvconf_rec *sc) 560 566 { 561 if (sc->cache_type == mgs_cache_dbm ) {567 if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm) { 562 568 return 0; 563 569 } … … 574 580 int mgs_cache_session_init(mgs_handle_t *ctxt) 575 581 { 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) { 577 583 gnutls_db_set_retrieve_function(ctxt->session, dbm_cache_fetch); 578 584 gnutls_db_set_remove_function(ctxt->session, dbm_cache_delete); -
src/gnutls_config.c
r5508683 r17eb1a1 344 344 } 345 345 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) { 348 349 sc->cache_type = mgs_cache_dbm; 350 } 351 else if (strcasecmp("gdbm", type) == 0) { 352 sc->cache_type = mgs_cache_gdbm; 349 353 } 350 354 #if HAVE_APR_MEMCACHE … … 357 361 } 358 362 359 if (sc->cache_type == mgs_cache_dbm ) {363 if (sc->cache_type == mgs_cache_dbm || sc->cache_type == mgs_cache_gdbm) { 360 364 sc->cache_config = ap_server_root_relative(parms->pool, arg); 361 365 } else { -
src/gnutls_io.c
r5508683 r17eb1a1 556 556 apr_bucket *bucket = APR_BRIGADE_FIRST(bb); 557 557 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)) { 567 559 if (ctxt->session != NULL) { 568 560 do { … … 574 566 APR_BRIGADE_INSERT_TAIL(ctxt->output_bb, e); 575 567 576 if ((status = ap_pass_brigade(f->next, tmpb)) != APR_SUCCESS) {568 if ((status = ap_pass_brigade(f->next, ctxt->output_bb)) != APR_SUCCESS) { 577 569 apr_brigade_cleanup(ctxt->output_bb); 578 570 return status; … … 585 577 } 586 578 continue; 587 } else if (APR_BUCKET_IS_FLUSH(bucket) ) {579 } else if (APR_BUCKET_IS_FLUSH(bucket) || APR_BUCKET_IS_EOS(bucket)) { 588 580 589 581 apr_bucket_copy(bucket, &e);
Note: See TracChangeset
for help on using the changeset viewer.