summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf S. Engelschall <rse@apache.org>1997-07-30 15:16:50 +0000
committerRalf S. Engelschall <rse@apache.org>1997-07-30 15:16:50 +0000
commit403cbf31b5c9916376e34586149a68b724aa69d6 (patch)
tree4eee22a95bfb509fb1d0bc0e96ab335e22993d06
parent4c5286961e5dfc79c311c0909f131b9b975a541b (diff)
downloadhttpd-403cbf31b5c9916376e34586149a68b724aa69d6.tar.gz
Treat <files> container like others in mod_info.
PR: 848 Submitted by: Marc Slemko Reviewed by: Dean Gaudet, Ralf S. Engelschall, Ken Coar, Jim Jagielski git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78816 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--APACHE_1_2_X/src/CHANGES5
-rw-r--r--APACHE_1_2_X/src/modules/standard/mod_info.c13
2 files changed, 13 insertions, 5 deletions
diff --git a/APACHE_1_2_X/src/CHANGES b/APACHE_1_2_X/src/CHANGES
index f9bf448e37..2118a568ec 100644
--- a/APACHE_1_2_X/src/CHANGES
+++ b/APACHE_1_2_X/src/CHANGES
@@ -1,5 +1,8 @@
Changes with Apache 1.2.2
-
+
+ *) Properly treat <files> container like other containers in mod_info.
+ [Marc Slemko] PR#848
+
*) The proxy didn't treat the "Host:" keyword of the host header as case-
insensitive. The proxy would corrupt the first line of a response from
an HTTP/0.9 server. [Kenichi Hori <ken@d2.bs1.fc.nec.co.jp>] PR#813,814
diff --git a/APACHE_1_2_X/src/modules/standard/mod_info.c b/APACHE_1_2_X/src/modules/standard/mod_info.c
index 1525dc7c88..fe6395c565 100644
--- a/APACHE_1_2_X/src/modules/standard/mod_info.c
+++ b/APACHE_1_2_X/src/modules/standard/mod_info.c
@@ -164,15 +164,19 @@ void mod_info_module_cmds(request_rec *r, mod_info_config_lines *cfg, command_re
int lab=0, nest=0;
while(li) {
- if(!strncasecmp(li->cmd,"<directory",10) || !strncasecmp(li->cmd,"<location",9) ||
- !strncasecmp(li->cmd,"<limit",6)) {
+ if(!strncasecmp(li->cmd,"<directory",10) ||
+ !strncasecmp(li->cmd,"<location",9) ||
+ !strncasecmp(li->cmd,"<limit",6) ||
+ !strncasecmp(li->cmd,"<files",6)) {
if(nest) li_se=li;
else li_st=li;
li=li->next;
nest++;
continue;
} else if(nest && (!strncasecmp(li->cmd,"</limit",7) ||
- !strncasecmp(li->cmd,"</location",10) || !strncasecmp(li->cmd,"</directory",11))) {
+ !strncasecmp(li->cmd,"</location",10) ||
+ !strncasecmp(li->cmd,"</directory",11) ||
+ !strncasecmp(li->cmd,"</files",7))) {
if(block_start) {
if((nest==1 && block_start==li_st) || (nest==2 && block_start==li_se)) {
rputs("<dd><tt>",r);
@@ -220,7 +224,8 @@ void mod_info_module_cmds(request_rec *r, mod_info_config_lines *cfg, command_re
&& (strncasecmp(li->cmd,"<directory",10) &&
strncasecmp(li->cmd,"<location",9) && strncasecmp(li->cmd,"<limit",6) &&
strncasecmp(li->cmd,"</limit",7) && strncasecmp(li->cmd,"</location",10) &&
- strncasecmp(li->cmd,"</directory",11))) {
+ strncasecmp(li->cmd,"</directory",11) &&
+ strncasecmp(li->cmd,"</files",7))) {
rputs("<dd><tt>",r);
rputs(mod_info_html_cmd_string(li_st->cmd),r);
rputs(" ",r);