Commit 20472f86 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Adapt to changed declaration of apr_pool_sub_make()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89871 13f79535-47bb-0310-9956-ffa450edef68
parent d4804992

modules/ssl/ssl_engine_ds.c

+4 −2
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ ssl_ds_array *ssl_ds_array_make(apr_pool_t *p, int size) 
    if ((a = (ssl_ds_array *)apr_palloc(p, sizeof(ssl_ds_array))) == NULL)

        return NULL;

    a->pPool = p;

    if ((a->pSubPool = apr_pool_sub_make(p, NULL)) == NULL)

    apr_pool_sub_make(&a->pSubPool, p, NULL);

    if (a->pSubPool == NULL)

        return NULL;

    a->aData = apr_array_make(a->pSubPool, 2, size);

    return a;
@@ -130,7 +131,8 @@ ssl_ds_table *ssl_ds_table_make(apr_pool_t *p, int size) 
    if ((t = (ssl_ds_table *)apr_palloc(p, sizeof(ssl_ds_table))) == NULL)

        return NULL;

    t->pPool = p;

    if ((t->pSubPool = apr_pool_sub_make(p, NULL)) == NULL)

    apr_pool_sub_make(&t->pSubPool, p, NULL);

    if (t->pSubPool == NULL)

        return NULL;

    t->aKey  = apr_array_make(t->pSubPool, 2, MAX_STRING_LEN);

    t->aData = apr_array_make(t->pSubPool, 2, size);

modules/ssl/ssl_engine_init.c

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ STACK_OF(X509_NAME) *ssl_init_FindCAList(server_rec *s, apr_pool_t *pp, char *cp 
     * is remains in memory for the complete operation time of

     * the server.

     */

    p = apr_pool_sub_make(pp, NULL);

    apr_pool_sub_make(&p, pp, NULL);



    /*

     * Start with a empty stack/list where new

modules/ssl/ssl_scache_dbm.c

+4 −2
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ void ssl_scache_dbm_kill(server_rec *s) 
    SSLModConfigRec *mc = myModConfig(s);

    apr_pool_t *p;



    if ((p = apr_pool_sub_make(mc->pPool, NULL)) != NULL) {

    apr_pool_sub_make(&p, mc->pPool, NULL)

    if (p != NULL) {

        /* the correct way */

        unlink(apr_pstrcat(p, mc->szSessionCacheDataFile, SSL_DBM_FILE_SUFFIX_DIR, NULL));

        unlink(apr_pstrcat(p, mc->szSessionCacheDataFile, SSL_DBM_FILE_SUFFIX_PAG, NULL));
@@ -328,7 +329,8 @@ void ssl_scache_dbm_expire(server_rec *s) 
    ssl_mutex_on(s);

    for (;;) {

        /* allocate the key array in a memory sub pool */

        if ((p = apr_pool_sub_make(mc->pPool, NULL)) == NULL)

        apr_pool_sub_make(&p, mc->pPool, NULL)

        if (p == NULL)

            break;

        if ((keylist = apr_palloc(p, sizeof(dbmkey)*KEYMAX)) == NULL) {

            apr_pool_destroy(p);

modules/ssl/ssl_util_ssl.c

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ BOOL SSL_load_CrtAndKeyInfo_path(apr_pool_t *p, STACK_OF(X509_INFO) *sk, char *p 
    char *fullname;

    BOOL ok;



    sp = apr_pool_sub_make(p, NULL);

    apr_pool_sub_make(&sp, p, NULL);

    if (apr_dir_open(&dir, pathname, sp)) != APR_SUCCESS) {

        apr_pool_destroy(sp);

        return FALSE;

modules/test/mod_test_util_uri.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static unsigned iterate_pieces(request_rec *r, const test_uri_t *pieces, int row 
	}

	*strp = 0;



	sub = apr_pool_sub_make(r->pool);

	apr_pool_sub_make(&sub, r->pool, NULL);

	status = apr_uri_parse_components(sub, input_uri, &result);

	if (status == APR_SUCCESS) {

#define CHECK(f)							\