* THIS IS 7.44 (BETA RELEASE ONLY)

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 5751624e7c54154b4ae0eed7e18efddfae64a527..56939158efab54b3269ec6f263ad5d6ced49109c 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -38,10 +38,10 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      743             /* This version */
+#define REV_LEVEL      744             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
 #define EXPORT_REV_MIN 737             /* Oldest compatible export files */
-#define LIBCITADEL_MIN 743             /* Minimum required version of libcitadel */
+#define LIBCITADEL_MIN 744             /* Minimum required version of libcitadel */
 
 #define SERVER_TYPE 0                  /* zero for stock Citadel; other developers please
                                           obtain SERVER_TYPE codes for your implementations */

diff --git a/citadel/citadel.nsi b/citadel/citadel.nsi
index 81d5fdfd85ab9975ab24fb6dd5243f4e1e936d41..39837751a8e5cc688244f261fec00e1b1c35ad60 100644 (file)
--- a/citadel/citadel.nsi
+++ b/citadel/citadel.nsi
@@ -4,7 +4,7 @@
 
 !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
 !define MUI_PRODUCT "Citadel"
-!define MUI_VERSION "7.43"
+!define MUI_VERSION "7.44"
 !define MUI_WELCOMEPAGE
 !define MUI_LICENSEPAGE
 !define MUI_COMPONENTSPAGE
@@ -18,7 +18,7 @@
 ;!define MUI_ICON "${NSISDIR}\Contrib\Icons\modern-install.ico"
 ;!define MUI_UNICON "${NSISDIR}\Contrib\Icons\modern-uninstall.ico"
 
-OutFile "citadel-7.43.exe"
+OutFile "citadel-7.44.exe"
 BGGradient off
 
 LangString DESC_Citadel ${LANG_ENGLISH} "Citadel client and core libraries (required)"

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 134ef7e6a64349ca887b54ffc9477e1f5bb7ea3c..84c97ba9d15b4e283955253351412f4e89fc8568 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
 AC_PREREQ(2.52)
-AC_INIT([Citadel], [7.43], [http://www.citadel.org/])
+AC_INIT([Citadel], [7.44], [http://www.citadel.org/])
 AC_REVISION([$Revision: 5108 $])
 AC_CONFIG_SRCDIR([citserver.c])
 AC_PREFIX_DEFAULT(/usr/local/citadel)

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 359b4c33b7fa87c6ee91792525bfff922deef193..46bdf021a405abb4d2568a674a868714cd9e8f36 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -566,13 +566,17 @@ static unsigned on = 1, off = 0;
 
 void buffer_output(void) {
 #ifdef HAVE_TCP_BUFFERING
-       setsockopt(CC->client_socket, IPPROTO_TCP, TCP_CORK, &on, 4);
+       if (!CC->redirect_ssl) {
+               setsockopt(CC->client_socket, IPPROTO_TCP, TCP_CORK, &on, 4);
+       }
 #endif
 }
 
 void unbuffer_output(void) {
 #ifdef HAVE_TCP_BUFFERING
-       setsockopt(CC->client_socket, IPPROTO_TCP, TCP_CORK, &off, 4);
+       if (!CC->redirect_ssl) {
+               setsockopt(CC->client_socket, IPPROTO_TCP, TCP_CORK, &off, 4);
+       }
 #endif
 }
 

diff --git a/libcitadel/configure.in b/libcitadel/configure.in
index a6c469bb187dafaa16128cf1ad6d8ff3b28d5128..e519d39eb6557808b4b13afa7ba70a0f982b85c3 100755 (executable)
--- a/libcitadel/configure.in
+++ b/libcitadel/configure.in
@@ -5,7 +5,7 @@ dnl
 dnl Ensure that libcitadel is configured with autoconf 2.52 or newer
 AC_PREREQ(2.52)
 
-AC_INIT(libcitadel, 7.43, https://uncensored.citadel.org)
+AC_INIT(libcitadel, 7.44, https://uncensored.citadel.org)
 
 AC_CONFIG_SRCDIR(Makefile.in)
 AC_CONFIG_AUX_DIR(conftools)

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index 85d4d330c0a8c64ecee2a41df1bdbd48b94f9a40..4dc77c959d39ef2c05c9d84e0808a516b25009d6 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -15,7 +15,7 @@
 #include <time.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#define LIBCITADEL_VERSION_NUMBER      743
+#define LIBCITADEL_VERSION_NUMBER      744
 
 /*
  * Here's a bunch of stupid magic to make the MIME parser portable.

diff --git a/webcit/README.txt b/webcit/README.txt
index bf66b8632f95bd35ead8138ec55e94143d155bc8..3d299d54b7377829abfff7baf872f788f2caa26b 100644 (file)
--- a/webcit/README.txt
+++ b/webcit/README.txt
@@ -1,5 +1,5 @@
                         WEBCIT for the Citadel System
-                               version 7.43
+                               version 7.44
  
    Copyright (C) 1996-2009 by the authors.  Portions written by:
  

diff --git a/webcit/configure.ac b/webcit/configure.ac
index 88fd8199b267e0041e4453b13bab2c12778c96a2..96af2d2bc340601d756f66b9bc60639deab36eb6 100644 (file)
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
-AC_INIT([WebCit], [7.43], [http://www.citadel.org/])
+AC_INIT([WebCit], [7.44], [http://www.citadel.org/])
 
 
 AC_SUBST(PROG_SUBDIRS)

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 3812042992204ffb2485e4ffd16219e5086ca33a..7d28b374992d3ef68a4c118a75ffdabb3845bd45 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -113,9 +113,9 @@
 #define PORT_NUM               2000            /* port number to listen on */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         743             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    743             /* min required Citadel ver */
-#define        LIBCITADEL_MIN          743             /* min required libcitadel ver */
+#define CLIENT_VERSION         744             /* This version of WebCit */
+#define MINIMUM_CIT_VERSION    744             /* min required Citadel ver */
+#define        LIBCITADEL_MIN          744             /* min required libcitadel ver */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define TARGET                 "webcit01"      /* Target for inline URL's */