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 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,"", title, "\n

", h1, ! "

\n", NULL); switch (status) { case REDIRECT: --- 1620,1635 ---- char *h1 = 4 + status_lines[idx]; BUFF *fd = c->client; ! bvputs ! ( ! fd, ! "\n", ! title, ! "\n\n

", ! 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("\n", fd); } } --- 1762,1768 ---- bputs("while trying to use an ErrorDocument to\n", fd); bputs("handle the request.\n", fd); } ! bputs("\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, "Index of ", title_name, "\n", ! NULL); if((!(tmp = find_header(dir_conf,r))) || (!(insert_readme(name,tmp,0,r)))) rvputs(r, "

Index of ", title_name, "

\n", NULL); --- 715,728 ---- while (title_endp > title_name && *title_endp == '/') *title_endp-- = '\0'; ! rvputs ! ( ! r, ! "\nIndex of ", ! title_name, ! "\n\n", ! NULL ! ); if((!(tmp = find_header(dir_conf,r))) || (!(insert_readme(name,tmp,0,r)))) rvputs(r, "

Index of ", title_name, "

\n", NULL); *************** *** 759,765 **** rputs("", r); } ! rputs("", r); return 0; } --- 765,771 ---- rputs("", r); } ! rputs ("\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("Apache Status\n",r); ! rputs("

Apache Server Status for ",r); ! rvputs(r,server->server_hostname,"

\n\n",NULL); rvputs(r,"Current Time: ",asctime(localtime(&nowtime)),"
\n",NULL); rvputs(r,"Restart Time: ",asctime(localtime(&restart_time)),"
\n", NULL); --- 306,314 ---- if (!short_report) { ! rputs("\nApache Status\n\n",r); ! rputs("

Apache Server Status for ",r); ! rvputs(r,server->server_hostname,"

\n\n",NULL); rvputs(r,"Current Time: ",asctime(localtime(&nowtime)),"
\n",NULL); rvputs(r,"Restart Time: ",asctime(localtime(&restart_time)),"
\n", NULL); *************** *** 585,591 **** #endif /* STATUS */ if (!short_report) ! rputs("",r); return 0; } --- 585,591 ---- #endif /* STATUS */ if (!short_report) ! rputs("\n",r); return 0; }