Changeset f265001 in mod_gnutls


Ignore:
Timestamp:
Jun 16, 2016, 4:36:12 AM (18 months ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
master, debian, upstream
Children:
02eabe7
Parents:
7e7d328
Message:

Bind temporary pool in load_proxy_x509_credentials() to ptemp scope

The currently unused pconf parameter will be used to attach a cleanup
hook like in mgs_load_files().

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_hooks.c

    r44e8944 rf265001  
    5454static const char* mgs_x509_construct_uid(request_rec * pool, gnutls_x509_crt_t cert);
    5555#endif
    56 static int load_proxy_x509_credentials(server_rec *s);
     56static int load_proxy_x509_credentials(apr_pool_t *pconf, apr_pool_t *ptemp, server_rec *s)
     57    __attribute__((nonnull));
    5758
    5859/* Pool Cleanup Function */
     
    491492        if (sc->enabled == GNUTLS_ENABLED_TRUE
    492493            && sc->proxy_enabled == GNUTLS_ENABLED_TRUE
    493             && load_proxy_x509_credentials(s) != APR_SUCCESS)
     494            && load_proxy_x509_credentials(pconf, ptemp, s) != APR_SUCCESS)
    494495        {
    495496            ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s,
     
    18191820
    18201821
    1821 static apr_status_t load_proxy_x509_credentials(server_rec *s)
     1822static apr_status_t load_proxy_x509_credentials(apr_pool_t *pconf __attribute__((unused)),
     1823                                                apr_pool_t *ptemp,
     1824                                                server_rec *s)
    18221825{
    18231826    mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
     
    18321835    /* Function pool, gets destroyed before exit. */
    18331836    apr_pool_t *pool;
    1834     ret = apr_pool_create(&pool, s->process->pool);
     1837    ret = apr_pool_create(&pool, ptemp);
    18351838    if (ret != APR_SUCCESS)
    18361839    {
Note: See TracChangeset for help on using the changeset viewer.