X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=64034c777eb9f2afe842a23952d93d55714b1d82;hb=5249c9ab6b14efd4d0f92cb64afd78bff3f7e163;hp=7f8ba7c14c6d1cff68e9c6414cdae36d6bd23f49;hpb=cd49d168981fb16f0655c506244f1d39e12d1bf4;p=citadel.git diff --git a/webcit/webcit.h b/webcit/webcit.h index 7f8ba7c14..64034c777 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1987-2013 by the citadel.org team + * Copyright (c) 1987-2014 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. @@ -25,9 +25,6 @@ #include #include #include -#ifdef HAVE_SYS_TIME_H -#include -#endif #include #ifdef HAVE_LIMITS_H #include @@ -132,9 +129,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 820 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 820 /* Minimum required version of Citadel server */ -#define LIBCITADEL_MIN 820 /* Minimum required version of libcitadel */ +#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 DEFAULT_HOST "localhost" /* Default Citadel server */ #define DEFAULT_PORT "504" #define TARGET "webcit01" /* Window target for inline URL's */ @@ -389,6 +386,10 @@ typedef struct _HdrRefs { typedef struct _ParsedHttpHdrs { int http_sock; /* HTTP server socket */ + long HaveRange; + long RangeStart; + long RangeTil; + long TotalBytes; const char *Pos; StrBuf *ReadBuf; @@ -564,7 +565,7 @@ 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); -void client_write_ssl(const StrBuf *Buf); +int client_write_ssl(const StrBuf *Buf); #endif extern int is_https; @@ -581,6 +582,7 @@ void InitialiseSemaphores(void); void begin_critical_section(int which_one); void end_critical_section(int which_one); +void CheckGZipCompressionAllowed(const char *MimeType, long MLen); extern void do_404(void); void http_redirect(const char *); @@ -690,6 +692,7 @@ extern char *days[]; long locate_user_vcard_in_this_room(message_summary **VCMsg, wc_mime_attachment **VCAtt); void http_transmit_thing(const char *content_type, int is_static); +void http_transmit_headers(const char *content_type, int is_static, long is_chunked, int is_gzip); long unescape_input(char *buf); void check_thread_pool_size(void); void StrEndTab(StrBuf *Target, int tabnum, int num_tabs); @@ -750,6 +753,7 @@ struct blogpost { long *msgs; /* Array of msgnums for messages we are displaying */ int num_msgs; /* Number of msgnums stored in 'msgs' */ int alloc_msgs; /* Currently allocated size of array */ + int unread_oments; };