Commit 4afa28f6 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

switch to APR 1.0 API (which is still in flux) 

because of the changes to the argument lists of apr_mmap_dup and apr_socket_create,
2.1-dev won't build with apr and apr-util's 0.9 branch anymore


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@101154 13f79535-47bb-0310-9956-ffa450edef68
parent 2525ad15

ssl_engine_init.c

+2 −2
Original line number Diff line number Diff line
@@ -852,11 +852,11 @@ static void ssl_check_public_cert(server_rec *s, 
    }



    if (SSL_X509_getCN(ptemp, cert, &cn)) {

        int fnm_flags = FNM_PERIOD|FNM_CASE_BLIND;

        int fnm_flags = APR_FNM_PERIOD|APR_FNM_CASE_BLIND;



        if (apr_fnmatch_test(cn) &&

            (apr_fnmatch(cn, s->server_hostname,

                         fnm_flags) == FNM_NOMATCH))

                         fnm_flags) == APR_FNM_NOMATCH))

        {

            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,

                         "%s server certificate wildcard CommonName (CN) `%s' "

ssl_scache_dbm.c

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

    apr_pool_t *p;



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

    apr_pool_create_ex(&p, mc->pPool, NULL, NULL);

    if (p != NULL) {

        /* the correct way */

        unlink(apr_pstrcat(p, mc->szSessionCacheDataFile, SSL_DBM_FILE_SUFFIX_DIR, NULL));
@@ -350,7 +350,7 @@ void ssl_scache_dbm_expire(server_rec *s) 
    ssl_mutex_on(s);

    for (;;) {

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

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

        apr_pool_create_ex(&p, mc->pPool, NULL, NULL);

        if (p == NULL)

            break;

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