From ba4cf7bfe17b7ed1b972b5b90e07a50a9e8b1b83 Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Sat, 21 Oct 2000 15:02:45 +0000 Subject: [PATCH] Remove original_uri. This is the same as r->unparsed_uri Reviewed by: Roy Fielding and Tony Finch git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86688 13f79535-47bb-0310-9956-ffa450edef68 --- server/util_script.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/server/util_script.c b/server/util_script.c index e4d26e9065..ee076a12ef 100644 --- a/server/util_script.c +++ b/server/util_script.c @@ -306,34 +306,6 @@ AP_DECLARE(int) ap_find_path_info(const char *uri, const char *path_info) return lu; } -/* Obtain the Request-URI from the original request-line, returning - * a new string from the request pool containing the URI or "". - */ -static char *original_uri(request_rec *r) -{ - char *first, *last; - - if (r->the_request == NULL) { - return (char *) apr_pcalloc(r->pool, 1); - } - - first = r->the_request; /* use the request-line */ - - while (*first && !apr_isspace(*first)) { - ++first; /* skip over the method */ - } - while (apr_isspace(*first)) { - ++first; /* and the space(s) */ - } - - last = first; - while (*last && !apr_isspace(*last)) { - ++last; /* end at next whitespace */ - } - - return apr_pstrndup(r->pool, first, last - first); -} - AP_DECLARE(void) ap_add_cgi_vars(request_rec *r) { apr_table_t *e = r->subprocess_env; @@ -342,7 +314,7 @@ AP_DECLARE(void) ap_add_cgi_vars(request_rec *r) apr_table_setn(e, "SERVER_PROTOCOL", r->protocol); apr_table_setn(e, "REQUEST_METHOD", r->method); apr_table_setn(e, "QUERY_STRING", r->args ? r->args : ""); - apr_table_setn(e, "REQUEST_URI", original_uri(r)); + apr_table_setn(e, "REQUEST_URI", r->unparsed_uri); /* Note that the code below special-cases scripts run from includes, * because it "knows" that the sub_request has been hacked to have the -- 2.50.1