Module writers for 2.0 shouldn't still be relying on a no-op for

compatibilities' sake. Let's kill ap_util_uri_init, since it serves no
purpose now.

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

diff --git a/include/util_uri.h b/include/util_uri.h
index dec4900ee5760260a8c3be76b90ef7e712a5a090..b2b91201ab3a15cb28085bb9df9512dc211fc78d 100644 (file)
--- a/include/util_uri.h
+++ b/include/util_uri.h
@@ -200,12 +200,6 @@ AP_DECLARE(int) ap_parse_uri_components(apr_pool_t *p, const char *uri, uri_comp
  */
 AP_DECLARE(int) ap_parse_hostinfo_components(apr_pool_t *p, const char *hostinfo, uri_components *uptr);
 
-/**
- * Setup everything necessary to parse uri's
- * @deffunc void ap_util_uri_init(void)
- */
-AP_DECLARE(void) ap_util_uri_init(void);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/server/main.c b/server/main.c
index 93e83fcbc665c5883106ac27eaa35fdf4907055a..ad71b60d2b0178ffd902816c7a35ec489d572efa 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -310,8 +310,6 @@ int main(int argc, const char * const argv[])
     }
 #endif
 
-    ap_util_uri_init();
-
     ap_setup_prelinked_modules(process);
 
     apr_pool_create(&pcommands, pglobal);

diff --git a/server/util_uri.c b/server/util_uri.c
index 2feb23c2b6068f7d4379aa480dad4f91ba9808b6..508c6f199c84d6c1f299b0424f521df7358a87c9 100644 (file)
--- a/server/util_uri.c
+++ b/server/util_uri.c
@@ -194,11 +194,6 @@ AP_DECLARE(char *) ap_unparse_uri_components(apr_pool_t *p, const uri_components
 #define NOTEND_HOSTINFO        (T_SLASH | T_QUESTION | T_HASH | T_NUL)
 #define NOTEND_PATH    (T_QUESTION | T_HASH | T_NUL)
 
-AP_DECLARE(void) ap_util_uri_init(void)
-{
-    /* nothing to do */
-}
-
 /* parse_uri_components():
  * Parse a given URI, fill in all supplied fields of a uri_components
  * structure. This eliminates the necessity of extracting host, port,

diff --git a/support/httpd.exp b/support/httpd.exp
index 723230af72304fb713528855d95911f2c43de2ad..4d75112bf4682fa7db52c4bbd681b9be0594a7e8 100644 (file)
--- a/support/httpd.exp
+++ b/support/httpd.exp
@@ -358,7 +358,6 @@ ap_update_child_status
 ap_update_mtime
 ap_update_vhost_from_headers
 ap_update_vhost_given_ip
-ap_util_uri_init
 ap_vrprintf
 ap_wait_or_timeout
 ap_walk_config