From c959a9ace830ba9ad1103cc43e25b0207d06a646 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Sat, 22 Jun 2002 16:32:45 +0000 Subject: [PATCH] Note the changed meaning of the NULL next_filter argument to the 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 --- include/http_request.h | 6 +++--- modules/generators/mod_cgi.c | 2 +- modules/generators/mod_cgid.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/http_request.h b/include/http_request.h index 571362a1f1..01b16ca2f2 100644 --- a/include/http_request.h +++ b/include/http_request.h @@ -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 * * @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 diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c index 7914df7024..303da0919c 100644 --- a/modules/generators/mod_cgi.c +++ b/modules/generators/mod_cgi.c @@ -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, diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c index 506e0710dc..c6b26d7509 100644 --- a/modules/generators/mod_cgid.c +++ b/modules/generators/mod_cgid.c @@ -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)); -- 2.50.1