use more intuitive variable names

ap_sub_req_*_uri  to use new_uri
ap_sub_req_*_file to use new_file
PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/include/http_request.h b/include/http_request.h
index 4ae74e398b64e70641582d84d18fa73676d76deb..241262acf7a14ecadb1ced82ed4aaba52d179172 100644 (file)
--- a/include/http_request.h
+++ b/include/http_request.h
@@ -62,21 +62,21 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r);
 /**
  * Create a sub request from the given URI.  This sub request can be
  * inspected to find information about the requested URI
- * @param new_file The URI to lookup
+ * @param new_uri The URI to lookup
  * @param r The current request
  * @param next_filter The first filter the sub_request should use.  If this is
  *                    NULL, it defaults to the first filter for the main request
  * @return The new request record
- * @deffunc request_rec * ap_sub_req_lookup_uri(const char *new_file, const request_rec *r)
+ * @deffunc request_rec * ap_sub_req_lookup_uri(const char *new_uri, const request_rec *r)
  */
-AP_DECLARE(request_rec *) ap_sub_req_lookup_uri(const char *new_file,
+AP_DECLARE(request_rec *) ap_sub_req_lookup_uri(const char *new_uri,
                                                 const request_rec *r,
                                                 ap_filter_t *next_filter);
 
 /**
  * Create a sub request for the given file.  This sub request can be
  * inspected to find information about the requested file
- * @param new_file The URI to lookup
+ * @param new_file The file to lookup
  * @param r The current request
  * @param next_filter The first filter the sub_request should use.  If this is
  *                    NULL, it defaults to the first filter for the main request
@@ -113,15 +113,15 @@ AP_DECLARE(request_rec *) ap_sub_req_lookup_dirent(const apr_finfo_t *finfo,
  * Create a sub request for the given URI using a specific method.  This
  * sub request can be inspected to find information about the requested URI
  * @param method The method to use in the new sub request
- * @param new_file The URI to lookup
+ * @param new_uri The URI to lookup
  * @param r The current request
  * @param next_filter The first filter the sub_request should use.  If this is
  *                    NULL, it defaults to the first filter for the main request
  * @return The new request record
- * @deffunc request_rec * ap_sub_req_method_uri(const char *method, const char *new_file, const request_rec *r)
+ * @deffunc request_rec * ap_sub_req_method_uri(const char *method, const char *new_uri, const request_rec *r)
  */
 AP_DECLARE(request_rec *) ap_sub_req_method_uri(const char *method,
-                                                const char *new_file,
+                                                const char *new_uri,
                                                 const request_rec *r,
                                                 ap_filter_t *next_filter);
 /**
@@ -289,8 +289,8 @@ AP_DECLARE_HOOK(int,translate_name,(request_rec *r))
  * @param r The current request
  * @return DONE (or HTTP_) if this contextless request was just fulfilled 
  * (such as TRACE), OK if this is not a file, and DECLINED if this is a file.
- * The core map_to_storage (HOOK_RUN_LAST) will directory_walk and file_walk
- * the r->filename.
+ * The core map_to_storage (HOOK_RUN_REALLY_LAST) will directory_walk
+ * and file_walk the r->filename.
  * 
  * @ingroup hooks
  */

diff --git a/server/request.c b/server/request.c
index e3afba839a68f37e8ec824d8d96c9b7f35fdfdde..6524fdca331c5ef26f72f514a04b7737acf228ad 100644 (file)
--- a/server/request.c
+++ b/server/request.c
@@ -1567,7 +1567,7 @@ AP_DECLARE(int) ap_some_auth_required(request_rec *r)
 
 
 AP_DECLARE(request_rec *) ap_sub_req_method_uri(const char *method,
-                                                const char *new_file,
+                                                const char *new_uri,
                                                 const request_rec *r,
                                                 ap_filter_t *next_filter)
 {
@@ -1581,13 +1581,13 @@ AP_DECLARE(request_rec *) ap_sub_req_method_uri(const char *method,
     rnew->method = method;
     rnew->method_number = ap_method_number_of(method);
 
-    if (new_file[0] == '/') {
-        ap_parse_uri(rnew, new_file);
+    if (new_uri[0] == '/') {
+        ap_parse_uri(rnew, new_uri);
     }
     else {
         udir = ap_make_dirstr_parent(rnew->pool, r->uri);
         udir = ap_escape_uri(rnew->pool, udir);    /* re-escape it */
-        ap_parse_uri(rnew, ap_make_full_path(rnew->pool, udir, new_file));
+        ap_parse_uri(rnew, ap_make_full_path(rnew->pool, udir, new_uri));
     }
 
     /* We cannot return NULL without violating the API. So just turn this
@@ -1612,11 +1612,11 @@ AP_DECLARE(request_rec *) ap_sub_req_method_uri(const char *method,
     return rnew;
 }
 
-AP_DECLARE(request_rec *) ap_sub_req_lookup_uri(const char *new_file,
+AP_DECLARE(request_rec *) ap_sub_req_lookup_uri(const char *new_uri,
                                                 const request_rec *r,
                                                 ap_filter_t *next_filter)
 {
-    return ap_sub_req_method_uri("GET", new_file, r, next_filter);
+    return ap_sub_req_method_uri("GET", new_uri, r, next_filter);
 }
 
 AP_DECLARE(request_rec *) ap_sub_req_lookup_dirent(const apr_finfo_t *dirent,