Changeset eee1432 in mod_gnutls for src/gnutls_config.c
- Timestamp:
- Jun 15, 2016, 6:12:50 PM (3 years ago)
- Branches:
- debian/master, debian/stretch-backports, master, upstream
- Children:
- 44e8944
- Parents:
- 45b7b83
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gnutls_config.c
r45b7b83 reee1432 176 176 } 177 177 178 int mgs_load_files(apr_pool_t * p, server_rec *s)178 int mgs_load_files(apr_pool_t *pconf, apr_pool_t *ptemp, server_rec *s) 179 179 { 180 180 apr_pool_t *spool; … … 186 186 &gnutls_module); 187 187 188 apr_pool_create(&spool, p );189 190 sc->cert_pgp = apr_pcalloc(p , sizeof(sc->cert_pgp[0]));191 sc->cert_crt_pgp = apr_pcalloc(p , sizeof(sc->cert_crt_pgp[0]));188 apr_pool_create(&spool, ptemp); 189 190 sc->cert_pgp = apr_pcalloc(pconf, sizeof(sc->cert_pgp[0])); 191 sc->cert_crt_pgp = apr_pcalloc(pconf, sizeof(sc->cert_crt_pgp[0])); 192 192 sc->certs_x509_chain = 193 apr_pcalloc(p , MAX_CHAIN_SIZE * sizeof(sc->certs_x509_chain[0]));193 apr_pcalloc(pconf, MAX_CHAIN_SIZE * sizeof(sc->certs_x509_chain[0])); 194 194 sc->certs_x509_crt_chain = 195 apr_pcalloc(p , MAX_CHAIN_SIZE * sizeof(sc->certs_x509_crt_chain[0]));195 apr_pcalloc(pconf, MAX_CHAIN_SIZE * sizeof(sc->certs_x509_crt_chain[0])); 196 196 197 197 /* Cleanup function for the GnuTLS structures allocated below */ 198 apr_pool_cleanup_register(p , sc, mgs_pool_free_credentials,198 apr_pool_cleanup_register(pconf, sc, mgs_pool_free_credentials, 199 199 apr_pool_cleanup_null); 200 200
Note: See TracChangeset
for help on using the changeset viewer.