* missing openssl ifdef here too...

[citadel.git] / webcit / webserver.c

diff --git a/webcit/webserver.c b/webcit/webserver.c
index c91fa0ea74a109c14ab54e74fe0641e4c8afb87e..72d090c16485b21ed5460f24aea75588c2e1eb6c 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -389,11 +389,12 @@ void graceful_shutdown_watcher(int signum) {
 }
 
 
-int ClientGetLine(int *sock, StrBuf *Target, StrBuf *CLineBuf)
+int ClientGetLine(int *sock, StrBuf *Target, StrBuf *CLineBuf, const char **Pos)
 {
        const char *Error, *pch, *pchs;
        int rlen, len, retval = 0;
 
+#ifdef HAVE_OPENSSL
        if (is_https) {
                int ntries = 0;
                if (StrLength(CLineBuf) > 0) {
@@ -441,12 +442,14 @@ int ClientGetLine(int *sock, StrBuf *Target, StrBuf *CLineBuf)
                        return -1;
        }
        else 
-               return StrBufTCP_read_buffered_line(Target, 
-                                                   CLineBuf,
-                                                   sock,
-                                                   5,
-                                                   1,
-                                                   &Error);
+#endif
+               return StrBufTCP_read_buffered_line_fast(Target, 
+                                                        CLineBuf,
+                                                        Pos,
+                                                        sock,
+                                                        5,
+                                                        1,
+                                                        &Error);
 }
 
 
@@ -642,7 +645,7 @@ int main(int argc, char **argv)
        char *mo = NULL;
 #endif /* ENABLE_NLS */
        char uds_listen_path[PATH_MAX]; /* listen on a unix domain socket? */
-       const char *I18nDumpFile;
+       const char *I18nDumpFile = NULL;
 
        WildFireInitBacktrace(argv[0], 2);
 
@@ -801,7 +804,6 @@ int main(int argc, char **argv)
        free(mo);
        lprintf(9, "Text domain: %s\n", textdomain("webcit"));
        lprintf(9, "Text domain Charset: %s\n", bind_textdomain_codeset("webcit","UTF8"));
-       preset_locale();
 #endif