v4.11-9506-beta

src/Cedar/Cedar.h

@@ -135,10 +135,10 @@
 
 
 // Version number
-#define	CEDAR_VER					410
+#define	CEDAR_VER					411
 
 // Build Number
-#define	CEDAR_BUILD					9505
+#define	CEDAR_BUILD					9506
 
 // Beta number
 //#define	BETA_NUMBER					3
@@ -159,10 +159,10 @@
 // Specifies the build date
 #define	BUILD_DATE_Y		2014
 #define	BUILD_DATE_M		10
-#define	BUILD_DATE_D		3
-#define	BUILD_DATE_HO		17
-#define	BUILD_DATE_MI		55
-#define	BUILD_DATE_SE		4
+#define	BUILD_DATE_D		22
+#define	BUILD_DATE_HO		19
+#define	BUILD_DATE_MI		51
+#define	BUILD_DATE_SE		55
 
 // Tolerable time difference
 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)
@@ -1051,6 +1051,7 @@ typedef struct CEDAR
 	UINT QueueBudget;				// Queue budget
 	LOCK *FifoBudgetLock;			// Fifo budget lock
 	UINT FifoBudget;				// Fifo budget
+	bool AcceptOnlyTls;				// Accept only TLS (Disable SSL)
 } CEDAR;
 
 // Type of CEDAR

src/Cedar/Connection.c

@@ -3137,6 +3137,10 @@ void ConnectionAccept(CONNECTION *c)
 
 	// Start the SSL communication
 	Debug("StartSSL()\n");
+	if (c->Cedar->AcceptOnlyTls)
+	{
+		s->AcceptOnlyTls = true;
+	}
 	if (StartSSL(s, x, k) == false)
 	{
 		// Failed

src/Cedar/Server.c

@@ -6094,6 +6094,9 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f)
 
 		// Disable session reconnect
 		SetGlobalServerFlag(GSF_DISABLE_SESSION_RECONNECT, CfgGetBool(f, "DisableSessionReconnect"));
+
+		// AcceptOnlyTls
+		c->AcceptOnlyTls = CfgGetBool(f, "AcceptOnlyTls");
 	}
 	Unlock(c->lock);
 
@@ -6398,6 +6401,8 @@ void SiWriteServerCfg(FOLDER *f, SERVER *s)
 		CfgAddBool(f, "DisableGetHostNameWhenAcceptTcp", s->DisableGetHostNameWhenAcceptTcp);
 		CfgAddBool(f, "DisableCoreDumpOnUnix", s->DisableCoreDumpOnUnix);
 
+		CfgAddBool(f, "AcceptOnlyTls", c->AcceptOnlyTls);
+
 		// Disable session reconnect
 		CfgAddBool(f, "DisableSessionReconnect", GetGlobalServerFlag(GSF_DISABLE_SESSION_RECONNECT));
 	}