X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=4cb99869fb554d6d63fe936c5ef9c2ceedd4ff62;hb=8e06cc28654bde788aa7e62d93f0ce970b838d49;hp=0beda739a51146b6c05eedd3703cdd75fae8a891;hpb=231621fff42006e7e782d1fc3c41b0c4cdb24a14;p=citadel.git

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 0beda739a..4cb99869f 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,10 +1,8 @@
 /*
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2012 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 as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * modify it under the terms of the GNU General Public License version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -70,20 +68,11 @@
 #endif
 
 #define IsEmptyStr(a) ((a)[0] == '\0')
-/*
- * Uncomment to dump an HTTP trace to stderr
-#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
-#endif
-
 #ifdef HAVE_ZLIB_H
 #include <zlib.h>
 #endif
@@ -144,9 +133,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		802		/* This version of WebCit */
-#define MINIMUM_CIT_VERSION	802		/* min required Citadel ver */
-#define	LIBCITADEL_MIN		802		/* min required libcitadel ver */
+#define CLIENT_VERSION		804		/* This version of WebCit */
+#define MINIMUM_CIT_VERSION	804		/* min required Citadel ver */
+#define	LIBCITADEL_MIN		804		/* min required libcitadel ver */
 #define DEFAULT_HOST		"localhost"	/* Default Citadel server */
 #define DEFAULT_PORT		"504"
 #define TARGET			"webcit01"	/* Target for inline URL's */
@@ -490,7 +479,6 @@ struct wcsession {
 	int killthis;				/* Nonzero == purge this session */
 	int ctdl_pid;				/* Session ID on the Citadel server */
 	int nonce;				/* session nonce (to prevent session riding) */
-	int SessionKey;
 	int inuse;				/* set to nonzero if bound to a running thread */
 
 /* Session local Members */
@@ -511,9 +499,7 @@ struct wcsession {
 	StrBuf *WBuf;                           /* Our output buffer */
 	StrBuf *HBuf;                           /* Our HeaderBuffer */
 	StrBuf *WFBuf;                          /* Wildfire error logging buffer */
-
 	StrBuf *trailing_javascript;		/* extra javascript to be appended to page */
-/*	char ImportantMessage[SIZ];*/
 	StrBuf *ImportantMsg;
 	HashList *Directory;			/* Parts of the directory URL in snippets */
 	const Floor *CurrentFloor;              /* when Parsing REST, which floor are we on? */