www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Note the changed meaning of the NULL next_filter argument to the

Browse Source 
ap_sub_req_lookup() family, and fix a few oddball cases (those are,
  PATH_TRANSLATED reference issues.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95844 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2002-06-22 16:32:45 +00:00
parent e9db4e80ec
commit c959a9ace8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/http_request.h
View File

@@ -108,7 +108,7 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r);
* @param new_file 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
* NULL this subrequest cannot be served [lookup only]
* @return The new request record
* @deffunc request_rec * ap_sub_req_lookup_uri(const char *new_file, const request_rec *r)
*/
@@ -122,7 +122,7 @@ AP_DECLARE(request_rec *) ap_sub_req_lookup_uri(const char *new_file,
* @param new_file 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
* NULL this subrequest cannot be served [lookup only]
* @return The new request record
* @deffunc request_rec * ap_sub_req_lookup_file(const char *new_file, const request_rec *r)
*/
@@ -140,7 +140,7 @@ AP_DECLARE(request_rec *) ap_sub_req_lookup_file(const char *new_file,
* AP_SUBREQ_MERGE_ARGS merge r->args and r->path_info
* </PRE>
* @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
* NULL this subrequest cannot be served [lookup only]
* @return The new request record
* @deffunc request_rec * ap_sub_req_lookup_dirent(apr_finfo_t *finfo, int subtype, const request_rec *r)
* @tip The apr_dir_read flags value APR_FINFO_MIN|APR_FINFO_NAME flag is the

2
modules/generators/mod_cgi.c
View File

@@ -361,7 +361,7 @@ static void add_ssi_vars(request_rec *r, ap_filter_t *next)
r->path_info));
pa_req = ap_sub_req_lookup_uri(ap_escape_uri(r->pool, r->path_info),
r, next);
r, NULL);
if (pa_req->filename) {
apr_table_setn(e, "PATH_TRANSLATED",
apr_pstrcat(r->pool, pa_req->filename,

2
modules/generators/mod_cgid.c
View File

@@ -1371,7 +1371,7 @@ static void add_ssi_vars(request_rec *r, ap_filter_t *next)
apr_table_setn(e, "PATH_INFO", ap_escape_shell_cmd(r->pool, r->path_info));
pa_req = ap_sub_req_lookup_uri(ap_escape_uri(r->pool, r->path_info), r, next);
pa_req = ap_sub_req_lookup_uri(ap_escape_uri(r->pool, r->path_info), r, NULL);
if (pa_req->filename) {
apr_table_setn(e, "PATH_TRANSLATED",
apr_pstrcat(r->pool, pa_req->filename, pa_req->path_info, NULL));