Issue HTTP 502 and 503 errors instead of 200 followed by an error message, when appro...

[citadel.git] / webcit / serv_func.c

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 50bf1f771d993d5f306d67fd9ece24090d53562e..e812de3817b25f70feaa70afe0eadebef03d8364 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 
 #include "webcit.h"
 #include "webserver.h"
@@ -36,7 +33,6 @@ void DeleteServInfo(ServInfo **FreeMe)
        FreeStrBuf(&(*FreeMe)->serv_software);
        FreeStrBuf(&(*FreeMe)->serv_bbs_city);
        FreeStrBuf(&(*FreeMe)->serv_sysadm);
-       FreeStrBuf(&(*FreeMe)->serv_moreprompt);
        FreeStrBuf(&(*FreeMe)->serv_default_cal_zone);
        FreeStrBuf(&(*FreeMe)->serv_svn_revision);
        free(*FreeMe);
@@ -127,9 +123,6 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
                case 7:
                        info->serv_sysadm = NewStrBufDup(Buf);
                        break;
-               case 9:
-                       info->serv_moreprompt = NewStrBufDup(Buf);
-                       break;
                case 14:
                        info->serv_supports_ldap = StrToi(Buf);
                        break;
@@ -151,6 +144,9 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
                case 23:
                        info->serv_supports_openid = StrToi(Buf);
                        break;
+               case 24:
+                       info->serv_supports_guest = StrToi(Buf);
+                       break;
                }
                ++a;
        }
@@ -168,7 +164,7 @@ int GetConnected (void)
        if (is_uds) /* unix domain socket */
                WCC->serv_sock = uds_connectsock(serv_sock_name);
        else        /* tcp socket */
-               WCC->serv_sock = tcp_connectsock(ctdlhost, atoi(ctdlport));
+               WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
        
        if (WCC->serv_sock < 0) {
                do_logout();
@@ -187,6 +183,8 @@ int GetConnected (void)
                /* Server isn't ready for us? */
                if (short_status != 2) {
                        if (Status == 571) {
+                               hprintf("HTTP/1.1 503 Service Unavailable\r\n");
+                               hprintf("Content-type: text/plain; charset=utf-8\r\n");
                                wc_printf(_("This server is already serving its maximum number of users and cannot accept any additional logins at this time.  Please try again later or contact your system administrator."));
                        }
                        else {
@@ -194,6 +192,8 @@ int GetConnected (void)
                                        Status,
                                        _("Received unexpected answer from Citadel server; bailing out.")
                                );
+                               hprintf("HTTP/1.1 502 Bad Gateway\r\n");
+                               hprintf("Content-type: text/plain; charset=utf-8\r\n");
                        }
                        end_burst();
                        end_webcit_session();
@@ -222,7 +222,7 @@ int GetConnected (void)
                if (WCC->serv_info == NULL){
                        begin_burst();
                        wc_printf(_("Received unexpected answer from Citadel server; bailing out."));
-                       hprintf("HTTP/1.1 200 OK\r\n");
+                       hprintf("HTTP/1.1 502 Bad Gateway\r\n");
                        hprintf("Content-type: text/plain; charset=utf-8\r\n");
                        end_burst();
                        end_webcit_session();
@@ -662,6 +662,14 @@ int conditional_serv_fulltext_enabled(StrBuf *Target, WCTemplputParams *TP)
        return WCC->serv_info->serv_fulltext_enabled != 0;
 }
 
+int conditional_serv_ldap_enabled(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       if (WCC->serv_info == NULL)
+               return 0;
+       return WCC->serv_info->serv_supports_ldap != 0;
+}
+
 void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
@@ -758,7 +766,8 @@ InitModule_SERVFUNC
 
        RegisterConditional(HKEY("COND:SERV:OPENID"), 2, conditional_serv_supports_openid, CTX_NONE);
        RegisterConditional(HKEY("COND:SERV:NEWU"), 2, conditional_serv_newuser_disabled, CTX_NONE);
-       RegisterConditional(HKEY("COND:SERV:HAVEFULLTEXT"), 2, conditional_serv_fulltext_enabled, CTX_NONE);
+       RegisterConditional(HKEY("COND:SERV:FULLTEXT_ENABLED"), 2, conditional_serv_fulltext_enabled, CTX_NONE);
+       RegisterConditional(HKEY("COND:SERV:LDAP_ENABLED"), 2, conditional_serv_ldap_enabled, CTX_NONE);
        RegisterNamespace("SERV:PID", 0, 0, tmplput_serv_ip, NULL, CTX_NONE);
        RegisterNamespace("SERV:NODENAME", 0, 1, tmplput_serv_nodename, NULL, CTX_NONE);
        RegisterNamespace("SERV:HUMANNODE", 0, 1, tmplput_serv_humannode, NULL, CTX_NONE);