When we 503, do it in HTML

[citadel.git] / webcit / webcit.c
diff --git a/webcit/webcit.c b/webcit/webcit.c

index 64b42ee0ab63a292be29c8b6a8a787516296c17f..8f51833deb32a180f9ebced1bc9ddc3177a9c016 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -482,23 +482,22 @@ void seconds_since_last_gexp(void)
  int ReadPostData(void)
  {
         int rc;
-       int body_start = 0;
+       int urlencoded_post = 0;
         wcsession *WCC = WC;
         StrBuf *content = NULL;
         
+       urlencoded_post = (strncasecmp(ChrPtr(WCC->Hdr->HR.ContentType), "application/x-www-form-urlencoded", 33) == 0) ;
+
         content = NewStrBufPlain(NULL, WCC->Hdr->HR.ContentLength + 256);
  
-       StrBufPrintf(content, 
+       if (!urlencoded_post)
+       {
+               StrBufPrintf(content, 
                      "Content-type: %s\n"
-                    "Content-length: %ld\n\n",
-                    ChrPtr(WCC->Hdr->HR.ContentType), 
+                            "Content-length: %ld\n\n",
+                            ChrPtr(WCC->Hdr->HR.ContentType), 
                              WCC->Hdr->HR.ContentLength);
-/*
-  hprintf("Content-type: %s\n"
-  "Content-length: %d\n\n",
-  ContentType, ContentLength);
-*/
-       body_start = StrLength(content);
+       }
  
         /** Read the entire input data at once. */
         rc = client_read_to(WCC->Hdr, content, 
@@ -508,8 +507,7 @@ int ReadPostData(void)
                 return rc;
                 
         
-       if (!strncasecmp(ChrPtr(WCC->Hdr->HR.ContentType), "application/x-www-form-urlencoded", 33)) {
-               StrBufCutLeft(content, body_start);
+       if (urlencoded_post) {
                 ParseURLParams(content);
         } else if (!strncasecmp(ChrPtr(WCC->Hdr->HR.ContentType), "multipart", 9)) {
                 char *Buf;
@@ -659,7 +657,17 @@ void session_loop(void)
          * connection now.
          */
         if (!WCC->connected) {
-               if (GetConnected ())
+               if (GetConnected()) {
+                       hprintf("HTTP/1.1 503 Service Unavailable\r\n");
+                       hprintf("Content-Type: text/html\r\n");
+                       begin_burst();
+                       wc_printf("<html><head><title>503 Service Unavailable</title></head><body>\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("</body></html>\n");
+                       end_burst();
                         goto SKIP_ALL_THIS_CRAP;
         }