New provider function, ap_list_provider_names(), which lists all

available registered providers for a specified group and version
number. Visible change so add CHANGES entry.

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

diff --git a/CHANGES b/CHANGES
index d12a117ba266daa1ab82b822580a7af4ed53e5df..a648e10c8183fc8dcd331184e9eb6d95e9b58f31 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) New provider function to list all available provider names in a
+     specific group and version (ap_list_provider_names). [Jim Jagielski]
+
   *) httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting, as
      in 1.3.  [Jeff Trawick]
 

diff --git a/include/ap_provider.h b/include/ap_provider.h
index d4ee78eb2c3c97924f8a1ada9ab40559dde1da1a..2e93ce42a36d3aee1476bfe387279aff73789463 100644 (file)
--- a/include/ap_provider.h
+++ b/include/ap_provider.h
@@ -28,6 +28,11 @@
 
 #include "ap_config.h"
 
+typedef struct {
+    const char *provider_name;
+} ap_list_provider_names_t;
+
+
 /**
  * This function is used to register a provider with the global
  * provider pool.
@@ -56,5 +61,18 @@ AP_DECLARE(void *) ap_lookup_provider(const char *provider_group,
                                       const char *provider_name,
                                       const char *provider_version);
 
+/**
+ * This function is used to retrieve a list (array) of provider
+ * names from the specified group with the specified version.
+ * @param pool The pool to create any storage from
+ * @param provider_group The group to look for this provider in
+ * @param provider_version The version for the provider
+ * @return pointer to array of ap_list_provider_names_t of provider names (could be empty)
+ */
+
+AP_DECLARE(apr_array_header_t *) ap_list_provider_names(apr_pool_t *pool,
+                                              const char *provider_group,
+                                              const char *provider_version);
+
 #endif
 /** @} */

diff --git a/server/provider.c b/server/provider.c
index 97d2a0f9f45ab1169d16fc10864614075d5f04a2..00d6954e896aa696e3e62c921673c40eaf4f26ae 100644 (file)
--- a/server/provider.c
+++ b/server/provider.c
@@ -16,14 +16,19 @@
 
 #include "apr_pools.h"
 #include "apr_hash.h"
+#include "apr_tables.h"
+#include "apr_strings.h"
 
 #include "ap_provider.h"
 
 static apr_hash_t *global_providers = NULL;
+static apr_hash_t *global_providers_names = NULL;
+
 
 static apr_status_t cleanup_global_providers(void *ctx)
 {
     global_providers = NULL;
+    global_providers_names = NULL;
     return APR_SUCCESS;
 }
 
@@ -33,15 +38,16 @@ AP_DECLARE(apr_status_t) ap_register_provider(apr_pool_t *pool,
                                               const char *provider_version,
                                               const void *provider)
 {
-    apr_hash_t *provider_group_hash;
-    apr_hash_t *provider_version_hash;
+    apr_hash_t *provider_group_hash, *provider_version_hash;
 
     if (global_providers == NULL) {
         global_providers = apr_hash_make(pool);
+        global_providers_names = apr_hash_make(pool);;
         apr_pool_cleanup_register(pool, NULL, cleanup_global_providers,
                                   apr_pool_cleanup_null);
     }
 
+    /* First, deal with storing the provider away */
     provider_group_hash = apr_hash_get(global_providers, provider_group,
                                        APR_HASH_KEY_STRING);
 
@@ -66,6 +72,31 @@ AP_DECLARE(apr_status_t) ap_register_provider(apr_pool_t *pool,
     apr_hash_set(provider_version_hash, provider_version, APR_HASH_KEY_STRING,
                  provider);
 
+    /* Now, tuck away the provider names in an easy-to-get format */
+    provider_group_hash = apr_hash_get(global_providers_names, provider_group,
+                                       APR_HASH_KEY_STRING);
+
+    if (!provider_group_hash) {
+        provider_group_hash = apr_hash_make(pool);
+        apr_hash_set(global_providers_names, provider_group, APR_HASH_KEY_STRING,
+                     provider_group_hash);
+        
+    }
+
+    provider_version_hash = apr_hash_get(provider_group_hash, provider_version,
+                                         APR_HASH_KEY_STRING);
+
+    if (!provider_version_hash) {
+        provider_version_hash = apr_hash_make(pool);
+        apr_hash_set(provider_group_hash, provider_version, APR_HASH_KEY_STRING,
+                     provider_version_hash);
+        
+    }
+
+    /* just set it. no biggy if it was there before. */
+    apr_hash_set(provider_version_hash, provider_name, APR_HASH_KEY_STRING,
+                 provider_name);
+
     return APR_SUCCESS;
 }
 
@@ -96,3 +127,39 @@ AP_DECLARE(void *) ap_lookup_provider(const char *provider_group,
     return apr_hash_get(provider_name_hash, provider_version,
                         APR_HASH_KEY_STRING);
 }
+
+AP_DECLARE(apr_array_header_t *) ap_list_provider_names(apr_pool_t *pool,
+                                              const char *provider_group,
+                                              const char *provider_version)
+{
+    apr_array_header_t *ret = apr_array_make(pool, 10, sizeof(ap_list_provider_names_t));
+    ap_list_provider_names_t *entry;
+    apr_hash_t *provider_group_hash, *h;
+    apr_hash_index_t *hi;
+    char *val, *key;
+
+    if (global_providers_names == NULL) {
+        return ret;
+    }
+
+    provider_group_hash = apr_hash_get(global_providers_names, provider_group,
+                                       APR_HASH_KEY_STRING);
+
+    if (provider_group_hash == NULL) {
+        return ret;
+    }
+
+    h = apr_hash_get(provider_group_hash, provider_version,
+                                      APR_HASH_KEY_STRING);
+
+    if (h == NULL) {
+        return ret;
+    }
+
+    for (hi = apr_hash_first(pool, h); hi; hi = apr_hash_next(hi)) {
+        apr_hash_this(hi, (void *)&key, NULL, (void *)&val);
+        entry = apr_array_push(ret);
+        entry->provider_name = apr_pstrdup(pool, val);
+    }
+    return ret;
+}