Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / webcit / webcit.h

diff --git a/webcit/webcit.h b/webcit/webcit.h
index c5e1fe4222896afa277794108f58ecca58bc39cb..8913f4fed01a8fa73efe673522ce4bd6635283df 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1987-2014 by the citadel.org team
+ * Copyright (c) 1987-2015 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         829             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    829             /* Minimum required version of Citadel server */
-#define        LIBCITADEL_MIN          821             /* Minimum required version of libcitadel */
+#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 DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define TARGET                 "webcit01"      /* Window target for inline URL's */
@@ -214,7 +214,9 @@ void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which);
 typedef struct urlcontent urlcontent;
 struct urlcontent {
        char url_key[32];               /* key */
+       long klen;
        StrBuf *url_data;               /* value */
+       HashList *sub;
 };
 
 /*
@@ -420,6 +422,7 @@ struct wcsession {
        int ctdl_pid;                           /* Session ID on the Citadel server */
        int nonce;                              /* session nonce (to prevent session riding) */
        int inuse;                              /* set to nonzero if bound to a running thread */
+       int isFailure;                          /* Http 2xx or 5xx? */
 
 /* Session local Members */
        int serv_sock;                          /* Client socket to Citadel server */