From a01c36088ef5a6585a1a76f8f9068b5e989b1993 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 10 Jan 2011 22:53:12 -0500 Subject: [PATCH] When we 503, do it in HTML --- citadel/modules/wiki/serv_wiki.c | 3 ++- webcit/webcit.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c index e005e8609..12b9b9fa0 100644 --- a/citadel/modules/wiki/serv_wiki.c +++ b/citadel/modules/wiki/serv_wiki.c @@ -422,7 +422,8 @@ void wiki_rev_callback(char *name, char *filename, char *partnum, char *disp, CtdlLogPrintf(CTDL_DEBUG, "callback found rev: %s\n", this_rev); /* Perform the patch */ - fp = popen("patch -f -s -p0 --global-reject-file=/dev/null >/dev/null 2>/dev/null", "w"); + //fp = popen("patch -f -s -p0 --global-reject-file=/dev/null >/dev/null 2>/dev/null", "w"); + fp = popen("patch -f -s -p0 --global-reject-file=/dev/null >/dev/null 2>>/tmp/patcherr.txt", "w"); if (fp) { /* Replace the filenames in the patch with the tempfilename we're actually tweaking */ fprintf(fp, "--- %s\n", hecbd->tempfilename); diff --git a/webcit/webcit.c b/webcit/webcit.c index de5380a13..3c094cd1e 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -701,12 +701,14 @@ void session_loop(void) if (!WCC->connected) { if (GetConnected()) { hprintf("HTTP/1.1 503 Service Unavailable\r\n"); - hprintf("Content-Type: text/plain\r\n"); + hprintf("Content-Type: text/html\r\n"); begin_burst(); + wc_printf("503 Service Unavailable\n"); wc_printf(_("This program was unable to connect or stay " "connected to the Citadel server. Please report " "this problem to your system administrator.") ); + wc_printf("\n"); end_burst(); goto SKIP_ALL_THIS_CRAP; } -- 2.39.2