DBG_QR[2] now a configurable loggable

[citadel.git] / webcit / webcit.h

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 24eca9ad3454d56c7d334fe281e8876301554d30..eacb045aa3fd273d90c80e829210dcb116e437d0 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -74,6 +74,10 @@
 #define HTTP_TRACING 1
  */
 
+#define DO_DBG_QR 0
+#define DBG_QR(x) if(DO_DBG_QR) _DBG_QR(x)
+#define DBG_QR2(x) if(DO_DBG_QR) _DBG_QR2(x)
+
 #ifdef HTTP_TRACING
 #undef HAVE_ZLIB_H
 #undef HAVE_ZLIB
@@ -127,16 +131,16 @@ extern char *ssl_cipher_list;
 
 #define SIZ                    4096            /* generic buffer size */
 
-#define TRACE fprintf(stderr, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
+#define TRACE fprintf(stderr, "\033[7mCheckpoint: %s, %d\033[0m\n", __FILE__, __LINE__)
 
 #define SLEEPING               180             /* TCP connection timeout */
 #define WEBCIT_TIMEOUT         900             /* WebCit session timeout */
 #define PORT_NUM               2000            /* port number to listen on */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         783             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    781             /* min required Citadel ver */
-#define        LIBCITADEL_MIN          781             /* min required libcitadel ver */
+#define CLIENT_VERSION         789             /* This version of WebCit */
+#define MINIMUM_CIT_VERSION    789             /* min required Citadel ver */
+#define        LIBCITADEL_MIN          789             /* min required libcitadel ver */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define TARGET                 "webcit01"      /* Target for inline URL's */
@@ -221,7 +225,7 @@ extern char *ssl_cipher_list;
 
 
 
-
+#define SRV_STATUS_MSG(ServerLineBuf) (ChrPtr(ServerLineBuf) + 4), (StrLength(ServerLineBuf) - 4)
 #define MAJORCODE(a) (((int)(a / 100) ) * 100)
 
 #define LISTING_FOLLOWS        100
@@ -429,7 +433,6 @@ typedef struct _HdrRefs {
        StrBuf *ContentType;
        StrBuf *RawCookie;
        StrBuf *ReqLine;
-       StrBuf *http_host;                      /* HTTP Host: header */
        StrBuf *browser_host;
        StrBuf *browser_language;
        StrBuf *user_agent;
@@ -556,12 +559,17 @@ struct wcsession {
        long *IBSettingsVec;                    /* which icons should be shown / not shown? */
        const StrBuf *floordiv_expanded;        /* which floordiv currently expanded */
 
-
+/* Transcoding cache buffers; used to avoid to frequent realloc */
+       StrBuf *ConvertBuf1;
+       StrBuf *ConvertBuf2;
 
 /* cache stuff for templates. TODO: find a smartrer way */
        HashList *ServCfg;                      /* cache our server config for editing */
        HashList *InetCfg;                      /* Our inet server config for editing */
        ExpirePolicy Policy[maxpolicy];
+
+/* used by the blog viewer */
+       int bptlid;                             /* hash of thread currently being rendered */
 };
 
 
@@ -582,7 +590,6 @@ enum {
        MAX_SEMAPHORES
 };
 
-
 #ifndef num_parms
 #define num_parms(source)              num_tokens(source, '|') 
 #endif
@@ -658,6 +665,7 @@ void pullquote_fmout(void);
 void wDumpContent(int);
 
 
+void PutRequestLocalMem(void *Data, DeleteHashDataFunc DeleteIt);
 
 void UrlescPutStrBuf(const StrBuf *strbuf);
 void StrEscPuts(const StrBuf *strbuf);
@@ -810,6 +818,7 @@ long guess_calhourformat(void);
 int get_time_format_cached (void);
 const char *get_selected_language(void);
 void display_wiki_pagelist(void);
+HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP);
 
 #define DATEFMT_FULL 0
 #define DATEFMT_BRIEF 1