Changeset babdb29 in mod_gnutls for src/gnutls_hooks.c
- Timestamp:
- May 16, 2018, 2:12:08 AM (3 years ago)
- Branches:
- asyncio, debian/master, master, proxy-ticket
- Children:
- 92b5f4d
- Parents:
- d036f96
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gnutls_hooks.c
rd036f96 rbabdb29 130 130 ap_mutex_register(pconf, MGS_CACHE_MUTEX_NAME, NULL, APR_LOCK_DEFAULT, 0); 131 131 ap_mutex_register(pconf, MGS_OCSP_MUTEX_NAME, NULL, APR_LOCK_DEFAULT, 0); 132 ap_mutex_register(pconf, MGS_OCSP_CACHE_MUTEX_NAME, NULL, 133 APR_LOCK_DEFAULT, 0); 132 134 133 135 /* Register a pool clean-up function */ … … 633 635 if (sc->cache_timeout == MGS_TIMEOUT_UNSET) 634 636 sc->cache_timeout = sc_base->cache_timeout; 637 sc->ocsp_cache_enable = sc_base->ocsp_cache_enable; 638 sc->ocsp_cache = sc_base->ocsp_cache; 635 639 636 640 sc->singleton_wd = sc_base->singleton_wd; … … 775 779 } 776 780 777 if (sc->cache_enable) { 778 rv = mgs_cache_child_init(p, s, sc); 779 if (rv != APR_SUCCESS) { 781 if (sc->cache_enable == GNUTLS_ENABLED_TRUE) 782 { 783 rv = mgs_cache_child_init(p, s, sc->cache, MGS_CACHE_MUTEX_NAME); 784 if (rv != APR_SUCCESS) 780 785 ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, 781 "GnuTLS: Failed to run Cache Init"); 782 } 783 } 784 785 /* reinit OCSP mutex */ 786 "Child init for session cache failed!"); 787 } 788 789 if (sc->ocsp_cache_enable == GNUTLS_ENABLED_TRUE) 790 { 791 rv = mgs_cache_child_init(p, s, sc->ocsp_cache, 792 MGS_OCSP_CACHE_MUTEX_NAME); 793 if (rv != APR_SUCCESS) 794 ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, 795 "Child init for OCSP cache failed!"); 796 } 797 798 /* reinit OCSP request mutex */ 786 799 const char *lockfile = apr_global_mutex_lockfile(sc->ocsp_mutex); 787 800 rv = apr_global_mutex_child_init(&sc->ocsp_mutex, lockfile, p);
Note: See TracChangeset
for help on using the changeset viewer.