textclient: don't try to stat citadel.config; it doesn't exist anymore.

[citadel.git] / webcit / webcit.h

diff --git a/webcit/webcit.h b/webcit/webcit.h
index ced9d3414bff0ef1ea348f10010eed70c9aa0d7d..d1ec72686044489c0d492380762c02c9ed44fae2 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2016 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 3.
@@ -127,9 +127,9 @@ extern char *ssl_cipher_list;
 #define PORT_NUM               2000            /* port number to listen on */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         901             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    901             /* Minimum required version of Citadel server */
-#define        LIBCITADEL_MIN          901             /* Minimum required version of libcitadel */
+#define CLIENT_VERSION         902             /* This version of WebCit */
+#define MINIMUM_CIT_VERSION    902             /* Minimum required version of Citadel server */
+#define        LIBCITADEL_MIN          902             /* Minimum required version of libcitadel */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define TARGET                 "webcit01"      /* Window target for inline URL's */
@@ -321,6 +321,7 @@ enum {
        eNone
 };
 
+<<<<<<< HEAD
 enum {
        eGET,
        ePOST,
@@ -545,7 +546,6 @@ extern char file_crpt_file_cer[PATH_MAX];
 
 void init_ssl(void);
 void endtls(void);
-void ssl_lock(int mode, int n, const char *file, int line);
 int starttls(int sock);
 extern SSL_CTX *ssl_ctx;  
 int client_read_sslbuffer(StrBuf *buf, int timeout);
@@ -636,7 +636,6 @@ void output_headers(    int do_httpheaders,
                        int unset_cookies,
                        int suppress_check,
                        int cache);
-void output_custom_content_header(const char *ctype);
 void cdataout(char *rawdata);
 
 
@@ -685,7 +684,7 @@ void end_tab(int tabnum, int num_tabs);
 
 int get_time_format_cached (void);
 void display_wiki_pagelist(void);
-void str_wiki_index(char *);
+void str_wiki_index(StrBuf *);
 
 HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP);
 
@@ -694,7 +693,6 @@ void TmplGettext(StrBuf *Target, WCTemplputParams *TP);
 
 void set_selected_language(const char *);
 void go_selected_language(void);
-void stop_selected_language(void);
 const char *get_selected_language(void);
 
 void utf8ify_rfc822_string(char **buf);
@@ -729,3 +727,16 @@ extern int DisableGzip;
 void display_summary_page(void);
 
 HashList *GetValidDomainNames(StrBuf *Target, WCTemplputParams *TP);
+void output_error_pic(const char *ErrMsg1, const char *ErrMsg2);
+=======
+#define TRACE syslog(LOG_DEBUG, "\033[3%dmCHECKPOINT: %s:%d\033[0m", ((__LINE__%6)+1), __FILE__, __LINE__)
+#define SLEEPING               180             // TCP connection timeout
+#define MAX_WORKER_THREADS     32              // Maximum number of worker threads permitted to exist
+
+int webserver(char *webserver_interface, int webserver_port, int webserver_protocol);
+int webcit_tcp_server(const char *ip_addr, int port_number, int queue_len);
+int webcit_uds_server(char *sockpath, int queue_len);
+int lingering_close(int fd);
+void perform_one_http_transaction(int ssock);
+void worker_entry(int *pointer_to_master_socket);
+>>>>>>> af64ffb... textclient: don't try to stat citadel.config; it doesn't exist anymore.