ap_add_named_module is not used and maintained anymore. Drop it.

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

diff --git a/CHANGES b/CHANGES
index e6b094780dea2b46e591b5ba06a1b1875e6f09cd..c855e7324786b4a443ea967413939937f0aead8e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Removed old and unmaintained ap_add_named_module API. [André Malo]
+
   *) htpasswd no longer refuses to process files that contain empty
      lines.  [André Malo]
 

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 396f5c0fb53ca482f7bd383bcc9e07adcebe818b..de36df357148b3c6c44c0c21c3ef395b2c94d313 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -80,14 +80,15 @@
  * 20030821.1 (2.1.0-dev) added XHTML doctypes
  * 20030821.2 (2.1.0-dev) added ap_escape_errorlog_item
  * 20030821.3 (2.1.0-dev) added ap_get_server_revision / ap_version_t
+ * 20040425 (2.1.0-dev) removed ap_add_named_module API
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */
 
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20030821
+#define MODULE_MAGIC_NUMBER_MAJOR 20040425
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 3                     /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

diff --git a/include/http_config.h b/include/http_config.h
index 2b247fdaec59087ef5183da37cc1321569a00ce1..1dcadc831e7b440c8b3569822c79836cdbc5dc49 100644 (file)
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -565,14 +565,6 @@ AP_DECLARE(void) ap_add_loaded_module(module *mod, apr_pool_t *p);
  * @param m the module structure of the module to remove
  */
 AP_DECLARE(void) ap_remove_loaded_module(module *mod);
-/**
- * Add a module to the list of loaded module based on the name of the
- * module
- * @param name The name of the module
- * @param p The pool valid for the lifetime of the module
- * @return 1 on success, 0 on failure
- */
-AP_DECLARE(int) ap_add_named_module(const char *name, apr_pool_t *p);
 /**
  * Find the name of the specified module
  * @param m The module to get the name for

diff --git a/server/config.c b/server/config.c
index 394b644f980e2d38dd81dd6fa4ae95835d96d833..7bd60d077aaf6ed527497cbc282d46c0d67ee5d5 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -626,26 +626,6 @@ AP_DECLARE(module *) ap_find_linked_module(const char *name)
     return NULL;
 }
 
-/* Add a named module.  Returns 1 if module found, 0 otherwise.  */
-AP_DECLARE(int) ap_add_named_module(const char *name, apr_pool_t *p)
-{
-    module *modp;
-    int i = 0;
-
-    for (modp = ap_loaded_modules[i]; modp; modp = ap_loaded_modules[++i]) {
-        if (strcmp(modp->name, name) == 0) {
-            /* Only add modules that are not already enabled.  */
-            if (modp->next == NULL) {
-                ap_add_module(modp, p);
-            }
-
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
 /*****************************************************************
  *
  * Resource, access, and .htaccess config files now parsed by a common