Commit 9815e532 authored by Stas Bekman's avatar Stas Bekman
Browse files

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
parent 3b6de606

include/http_request.h

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

 */

server/request.c

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