Commit 870dc00d authored by Victor J. Orlikowski's avatar Victor J. Orlikowski
Browse files

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
parent 018342ce

include/util_uri.h

+0 −6
Changes for include/util_uri.h: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -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

server/main.c

+0 −2
Changes for server/main.c: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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);

server/util_uri.c

+0 −5
Changes for server/util_uri.c: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -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,

support/httpd.exp

+0 −1
Changes for support/httpd.exp: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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