From: Stefan Fritsch Date: Tue, 3 Jul 2012 19:29:11 +0000 (+0000) Subject: Merge r1225798, r1225799: X-Git-Tag: 2.4.3~350 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2442be35642497f9806cef70a0b2fc97c0b93642;p=apache Merge r1225798, r1225799: mod_info: Display registered providers. Reviewed by: sf, jorton, covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1356879 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 71a6236fad..e6d18af21d 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,8 @@ Changes with Apache 2.4.3 + *) mod_info: Display all registered providers. [Stefan Fritsch] + *) mod_ssl: Send the error message for speaking http to an https port using HTTP/1.0 instead of HTTP/0.9, and omit the link that may be wrong when using SNI. PR 50823. [Stefan Fritsch] diff --git a/STATUS b/STATUS index 85bf300c3c..a38c3a88a8 100644 --- a/STATUS +++ b/STATUS @@ -88,12 +88,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * mod_info: Display registered providers. - trunk patches: http://svn.apache.org/viewvc?rev=1225798&view=rev - http://svn.apache.org/viewvc?rev=1225799&view=rev - 2.4 patch: http://people.apache.org/~sf/mod_info-show-providers.diff - +1: sf, jorton, covener - * mod_proxy: Use the the same hostname for SNI as for the HTTP request when forwarding to SSL backends. PR 53134. Trunk version of patch: diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 3487067dc2..56955b07d1 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -393,6 +393,7 @@ * 20120211.1 (2.4.2-dev) Add AP_HAVE_C99 * 20120211.2 (2.4.2-dev) Add ap_runtime_dir_relative * 20120211.3 (2.4.2-dev) Add forcerecovery to proxy_balancer_shared struct + * 20120211.4 (2.4.2-dev) Add ap_list_provider_groups() */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */ @@ -400,7 +401,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20120211 #endif -#define MODULE_MAGIC_NUMBER_MINOR 3 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 4 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a diff --git a/include/ap_provider.h b/include/ap_provider.h index adfc69cad6..0a6c10cf56 100644 --- a/include/ap_provider.h +++ b/include/ap_provider.h @@ -36,6 +36,10 @@ typedef struct { const char *provider_name; } ap_list_provider_names_t; +typedef struct { + const char *provider_group; + const char *provider_version; +} ap_list_provider_groups_t; /** * This function is used to register a provider with the global @@ -78,6 +82,16 @@ AP_DECLARE(apr_array_header_t *) ap_list_provider_names(apr_pool_t *pool, const char *provider_group, const char *provider_version); +/** + * This function is used to retrieve a list (array) of provider groups and versions + * @param pool The pool to create any storage from + * @return pointer to array of ap_list_provider_groups_t of provider groups + * and versions (could be empty) + */ + +AP_DECLARE(apr_array_header_t *) ap_list_provider_groups(apr_pool_t *pool); + + #ifdef __cplusplus } #endif diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c index 360290c7bb..75c37782bc 100644 --- a/modules/generators/mod_info.c +++ b/modules/generators/mod_info.c @@ -62,6 +62,7 @@ #include "util_script.h" #include "ap_mpm.h" #include "mpm_common.h" +#include "ap_provider.h" #include #include @@ -688,6 +689,57 @@ static int show_active_hooks(request_rec * r) return 0; } +static int cmp_provider_groups(const void *a_, const void *b_) +{ + const ap_list_provider_groups_t *a = a_, *b = b_; + int ret = strcmp(a->provider_group, b->provider_group); + if (!ret) + ret = strcmp(a->provider_version, b->provider_version); + return ret; +} + +static int cmp_provider_names(const void *a_, const void *b_) +{ + const ap_list_provider_names_t *a = a_, *b = b_; + return strcmp(a->provider_name, b->provider_name); +} + +static void show_providers(request_rec *r) +{ + apr_array_header_t *groups = ap_list_provider_groups(r->pool); + ap_list_provider_groups_t *group; + apr_array_header_t *names; + ap_list_provider_names_t *name; + int i,j; + const char *cur_group = NULL; + + qsort(groups->elts, groups->nelts, sizeof(ap_list_provider_groups_t), + cmp_provider_groups); + ap_rputs("

Providers

\n
", r); + + for (i = 0; i < groups->nelts; i++) { + group = &APR_ARRAY_IDX(groups, i, ap_list_provider_groups_t); + if (!cur_group || strcmp(cur_group, group->provider_group) != 0) { + if (cur_group) + ap_rputs("\n\n", r); + cur_group = group->provider_group; + ap_rprintf(r, "
%s (version %s):" + "\n
\n", cur_group, group->provider_version); + } + names = ap_list_provider_names(r->pool, group->provider_group, + group->provider_version); + qsort(names->elts, names->nelts, sizeof(ap_list_provider_names_t), + cmp_provider_names); + for (j = 0; j < names->nelts; j++) { + name = &APR_ARRAY_IDX(names, j, ap_list_provider_names_t); + ap_rprintf(r, "  %s
", name->provider_name); + } + } + if (cur_group) + ap_rputs("\n
\n", r); + ap_rputs("
\n
\n", r); +} + static int cmp_module_name(const void *a_, const void *b_) { const module * const *a = a_; @@ -737,8 +789,9 @@ static int display_info(request_rec * r) ap_rputs("
Subpages:
", r); ap_rputs("Configuration Files, " "Server Settings, " - "Module List, " - "Active Hooks", r); + "Module List, " + "Active Hooks, " + "Available Providers", r); ap_rputs("
", r); ap_rputs("
Sections:
", r); @@ -746,7 +799,8 @@ static int display_info(request_rec * r) "Server Settings, " "Startup Hooks, " "Request Hooks, " - "Other Hooks", r); + "Other Hooks, " + "Providers", r); ap_rputs("
", r); ap_rputs("

Loaded Modules

" @@ -772,6 +826,10 @@ static int display_info(request_rec * r) show_active_hooks(r); } + if (!r->args || !strcasecmp(r->args, "providers")) { + show_providers(r); + } + if (r->args && 0 == strcasecmp(r->args, "config")) { ap_rputs("
Configuration:\n", r); mod_info_module_cmds(r, NULL, ap_conftree, 0, 0); diff --git a/server/provider.c b/server/provider.c index a5406ab1e8..ade0f4e9a2 100644 --- a/server/provider.c +++ b/server/provider.c @@ -163,3 +163,35 @@ AP_DECLARE(apr_array_header_t *) ap_list_provider_names(apr_pool_t *pool, } return ret; } + +AP_DECLARE(apr_array_header_t *) ap_list_provider_groups(apr_pool_t *pool) +{ + apr_array_header_t *ret = apr_array_make(pool, 10, sizeof(ap_list_provider_groups_t)); + ap_list_provider_groups_t *entry; + apr_hash_t *provider_group_hash; + apr_hash_index_t *groups_hi, *vers_hi; + char *group, *version; + + if (global_providers_names == NULL) + return ret; + + for (groups_hi = apr_hash_first(pool, global_providers_names); + groups_hi; + groups_hi = apr_hash_next(groups_hi)) + { + apr_hash_this(groups_hi, (void *)&group, NULL, (void *)&provider_group_hash); + if (provider_group_hash == NULL) + continue; + for (vers_hi = apr_hash_first(pool, provider_group_hash); + vers_hi; + vers_hi = apr_hash_next(vers_hi)) + { + apr_hash_this(vers_hi, (void *)&version, NULL, NULL); + + entry = apr_array_push(ret); + entry->provider_group = group; + entry->provider_version = version; + } + } + return ret; +}