diff options
| author | David Reid <dreid@apache.org> | 2005-09-18 22:06:27 +0200 |
|---|---|---|
| committer | David Reid <dreid@apache.org> | 2005-09-18 22:06:27 +0200 |
| commit | 8a190d75f373b4a51ff170e5c4e364f92ddff27f (patch) | |
| tree | 6f2d35c8d0c074602332f71e858f6857c2e9a386 /modules/metadata/mod_setenvif.c | |
| parent | Backport r264759 and r264788 to the 2.2.x branch. Fixes the get_suexec_identi... (diff) | |
| download | apache2-8a190d75f373b4a51ff170e5c4e364f92ddff27f.tar.xz apache2-8a190d75f373b4a51ff170e5c4e364f92ddff27f.zip | |
Catch up with the changes to mod_ssl and rename the
function pointer to reflect the change. With this change
this module now builds again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@289968 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/metadata/mod_setenvif.c')
| -rw-r--r-- | modules/metadata/mod_setenvif.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c index 2d568cc0fc..b2549d8e3b 100644 --- a/modules/metadata/mod_setenvif.c +++ b/modules/metadata/mod_setenvif.c @@ -123,7 +123,7 @@ typedef struct { module AP_MODULE_DECLARE_DATA setenvif_module; -static APR_OPTIONAL_FN_TYPE(ssl_extlist_by_oid) *ssl_extlist_by_oid_func = NULL; +static APR_OPTIONAL_FN_TYPE(ssl_ext_list) *ssl_ext_list_func = NULL; /* * These routines, the create- and merge-config functions, are called @@ -531,7 +531,7 @@ static int match_headers(request_rec *r) break; case SPECIAL_OID_VALUE: /* If mod_ssl is not loaded, the accessor function is NULL */ - if (ssl_extlist_by_oid_func != NULL) + if (ssl_ext_list_func != NULL) { apr_array_header_t *oid_array; char **oid_value; @@ -539,7 +539,8 @@ static int match_headers(request_rec *r) char *retval = NULL; /* The given oid can occur multiple times. Concatenate the values */ - if ((oid_array = ssl_extlist_by_oid_func(r, b->name)) != NULL) { + if ((oid_array = ssl_ext_list_func(r->pool, r->connection, 1, + b->name)) != NULL) { oid_value = (char **) oid_array->elts; /* pass 1: determine the size of the string */ for (len=j=0; j < oid_array->nelts; j++) { @@ -630,7 +631,7 @@ static int match_headers(request_rec *r) static int setenvif_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s) { - ssl_extlist_by_oid_func = APR_RETRIEVE_OPTIONAL_FN(ssl_extlist_by_oid); + ssl_ext_list_func = APR_RETRIEVE_OPTIONAL_FN(ssl_ext_list); return OK; } |