-/* ====================================================================
- * The Apache Software License, Version 1.1
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
#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;
}
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);
provider_group_hash = apr_hash_make(pool);
apr_hash_set(global_providers, provider_group, APR_HASH_KEY_STRING,
provider_group_hash);
-
+
}
provider_version_hash = apr_hash_get(provider_group_hash, provider_name,
provider_version_hash = apr_hash_make(pool);
apr_hash_set(provider_group_hash, provider_name, APR_HASH_KEY_STRING,
provider_version_hash);
-
+
}
/* just set it. no biggy if it was there before. */
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;
}
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;
+}
projects / apache / blobdiff