Commit b11792cb authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Clean up mod_dav error reporting to HTML/XHTML cross-compliance.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89835 13f79535-47bb-0310-9956-ffa450edef68
parent 4787279e

modules/dav/main/mod_dav.c

+5 −6
Original line number Diff line number Diff line
@@ -370,13 +370,12 @@ static int dav_error_response(request_rec *r, int status, const char *body) 
	      DAV_RESPONSE_BODY_2,

	      &r->status_line[4],

	      DAV_RESPONSE_BODY_3,

              body,

	      DAV_RESPONSE_BODY_4,

              ap_psignature("<hr />\n", r),

	      DAV_RESPONSE_BODY_5,

              NULL);



    ap_rputs(body, r);



    ap_rputs(ap_psignature("\n<P><HR>\n", r), r);

    ap_rputs(DAV_RESPONSE_BODY_4, r);



    /* the response has been sent. */

    /*

     * ### Use of DONE obviates logging..!

modules/dav/main/mod_dav.h

+5 −4
Original line number Diff line number Diff line
@@ -83,10 +83,11 @@ extern "C" { 


#define DAV_READ_BLOCKSIZE	2048	/* used for reading input blocks */



#define DAV_RESPONSE_BODY_1	"<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n<HTML><HEAD>\n<TITLE>"

#define DAV_RESPONSE_BODY_2	"</TITLE>\n</HEAD><BODY>\n<H1>"

#define DAV_RESPONSE_BODY_3	"</H1>\n"

#define DAV_RESPONSE_BODY_4	"</BODY></HTML>\n"

#define DAV_RESPONSE_BODY_1	"<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n<html><head>\n<title>"

#define DAV_RESPONSE_BODY_2	"</title>\n</head><body>\n<h1>"

#define DAV_RESPONSE_BODY_3	"</h1>\n<p>"

#define DAV_RESPONSE_BODY_4	"</p>\n"

#define DAV_RESPONSE_BODY_5	"</body></html>\n"



#define DAV_DO_COPY		0

#define DAV_DO_MOVE		1