You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2005/09/19 14:34:36 UTC
svn commit: r290137 - in /httpd/httpd/branches/2.2.x: CHANGES
include/ap_provider.h server/provider.c
Author: jim
Date: Mon Sep 19 05:34:32 2005
New Revision: 290137
URL: http://svn.apache.org/viewcvs?rev=290137&view=rev
Log:
Backport 279750 from TRUNK.
New provider function to list all available provider names in a
specific group and version (ap_list_provider_names).
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/include/ap_provider.h
httpd/httpd/branches/2.2.x/server/provider.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=290137&r1=290136&r2=290137&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Sep 19 05:34:32 2005
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.1.8
+ *) New provider function to list all available provider names in a
+ specific group and version (ap_list_provider_names). [Jim Jagielski]
+
*) mod_cache: Enhance CacheEnable/CacheDisable to control caching on a
per-protocol, per-host and per-path basis. Intended for proxy
configurations. [Colm MacCarthaigh]
Modified: httpd/httpd/branches/2.2.x/include/ap_provider.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/include/ap_provider.h?rev=290137&r1=290136&r2=290137&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/include/ap_provider.h (original)
+++ httpd/httpd/branches/2.2.x/include/ap_provider.h Mon Sep 19 05:34:32 2005
@@ -19,6 +19,11 @@
#include "ap_config.h"
+typedef struct {
+ const char *provider_name;
+} ap_list_provider_names_t;
+
+
/**
* @package Provider API
*/
@@ -50,5 +55,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
Modified: httpd/httpd/branches/2.2.x/server/provider.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/provider.c?rev=290137&r1=290136&r2=290137&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/provider.c (original)
+++ httpd/httpd/branches/2.2.x/server/provider.c Mon Sep 19 05:34:32 2005
@@ -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 @@
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 @@
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;
}
@@ -95,4 +126,40 @@
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;
}