fielding 97/02/18 06:41:32
Modified: src CHANGES http_protocol.c mod_dir.c mod_status.c
Log:
Cleaned-up the generated HTML to include <HTML></HTML> tags and
appropriate newlines.
Submitted by: Ken Coar
Reviewed by: Marc Slemko, Dean Gaudet, Roy Fielding
Revision Changes Path
1.168 +2 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.167
retrieving revision 1.168
diff -C3 -r1.167 -r1.168
*** CHANGES 1997/02/17 06:05:00 1.167
--- CHANGES 1997/02/18 14:41:28 1.168
***************
*** 105,110 ****
--- 105,112 ----
*) Fixed compiler warnings in the regex library. [Dean Gaudet]
+ *) Cleaned-up some of the generated HTML. [Ken Coar]
+
Changes with Apache 1.2b6
*) Allow whitespace in imagemap mapfile coordinates. [Marc Slemko]
1.102 +11 -3 apache/src/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_protocol.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -C3 -r1.101 -r1.102
*** http_protocol.c 1997/02/17 06:05:01 1.101
--- http_protocol.c 1997/02/18 14:41:29 1.102
***************
*** 1620,1627 ****
char *h1 = 4 + status_lines[idx];
BUFF *fd = c->client;
! bvputs(fd,"<HEAD><TITLE>", title, "</TITLE></HEAD>\n<BODY><H1>", h1,
! "</H1>\n", NULL);
switch (status) {
case REDIRECT:
--- 1620,1635 ----
char *h1 = 4 + status_lines[idx];
BUFF *fd = c->client;
! bvputs
! (
! fd,
! "<HTML><HEAD>\n<TITLE>",
! title,
! "</TITLE>\n</HEAD><BODY>\n<H1>",
! h1,
! "</H1>\n",
! NULL
! );
switch (status) {
case REDIRECT:
***************
*** 1754,1760 ****
bputs("while trying to use an ErrorDocument to\n", fd);
bputs("handle the request.\n", fd);
}
! bputs("</BODY>\n", fd);
}
}
--- 1762,1768 ----
bputs("while trying to use an ErrorDocument to\n", fd);
bputs("handle the request.\n", fd);
}
! bputs("</BODY></HTML>\n", fd);
}
}
1.22 +9 -3 apache/src/mod_dir.c
Index: mod_dir.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_dir.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C3 -r1.21 -r1.22
*** mod_dir.c 1997/02/08 00:39:22 1.21
--- mod_dir.c 1997/02/18 14:41:29 1.22
***************
*** 715,722 ****
while (title_endp > title_name && *title_endp == '/')
*title_endp-- = '\0';
! rvputs(r, "<HEAD><TITLE>Index of ", title_name,
"</TITLE></HEAD><BODY>\n",
! NULL);
if((!(tmp = find_header(dir_conf,r))) ||
(!(insert_readme(name,tmp,0,r))))
rvputs(r, "<H1>Index of ", title_name, "</H1>\n", NULL);
--- 715,728 ----
while (title_endp > title_name && *title_endp == '/')
*title_endp-- = '\0';
! rvputs
! (
! r,
! "<HTML><HEAD>\n<TITLE>Index of ",
! title_name,
! "</TITLE>\n</HEAD><BODY>\n",
! NULL
! );
if((!(tmp = find_header(dir_conf,r))) ||
(!(insert_readme(name,tmp,0,r))))
rvputs(r, "<H1>Index of ", title_name, "</H1>\n", NULL);
***************
*** 759,765 ****
rputs("</UL>", r);
}
! rputs("</BODY>", r);
return 0;
}
--- 765,771 ----
rputs("</UL>", r);
}
! rputs ("</BODY></HTML>\n", r);
return 0;
}
1.43 +4 -4 apache/src/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_status.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C3 -r1.42 -r1.43
*** mod_status.c 1997/02/10 12:07:21 1.42
--- mod_status.c 1997/02/18 14:41:30 1.43
***************
*** 306,314 ****
if (!short_report)
{
! rputs("<html><head><title>Apache Status</title></head><body>\n",r);
! rputs("<h1>Apache Server Status for ",r);
! rvputs(r,server->server_hostname,"</h1>\n\n",NULL);
rvputs(r,"Current Time: ",asctime(localtime(&nowtime)),"<br>\n",NULL);
rvputs(r,"Restart Time: ",asctime(localtime(&restart_time)),"<br>\n",
NULL);
--- 306,314 ----
if (!short_report)
{
! rputs("<HTML><HEAD>\n<TITLE>Apache
Status</TITLE>\n</HEAD><BODY>\n",r);
! rputs("<H1>Apache Server Status for ",r);
! rvputs(r,server->server_hostname,"</H1>\n\n",NULL);
rvputs(r,"Current Time: ",asctime(localtime(&nowtime)),"<br>\n",NULL);
rvputs(r,"Restart Time: ",asctime(localtime(&restart_time)),"<br>\n",
NULL);
***************
*** 585,591 ****
#endif /* STATUS */
if (!short_report)
! rputs("</body></html>",r);
return 0;
}
--- 585,591 ----
#endif /* STATUS */
if (!short_report)
! rputs("</BODY></HTML>\n",r);
return 0;
}
