From 19342bc814c8e1e877bef53b750c47bd02f626de Mon Sep 17 00:00:00 2001
From: xtne6f <xt4ubq@gmail.com>
Date: Sun, 17 Apr 2016 08:11:39 +0900
Subject: [PATCH] =?UTF-8?q?SSLv3=E3=81=BE=E3=81=A7=E3=82=92=E3=83=87?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E3=81=A7=E7=84=A1=E5=8A=B9?=
 =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EpgTimerSrv/EpgTimerSrv/EpgTimerSrvMain.cpp | 1 +
 EpgTimerSrv/EpgTimerSrv/HttpServer.cpp      | 5 ++++-
 EpgTimerSrv/EpgTimerSrv/HttpServer.h        | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/EpgTimerSrv/EpgTimerSrv/EpgTimerSrvMain.cpp b/EpgTimerSrv/EpgTimerSrv/EpgTimerSrvMain.cpp
index dd39f9604f..37d25dbff3 100644
--- a/EpgTimerSrv/EpgTimerSrv/EpgTimerSrvMain.cpp
+++ b/EpgTimerSrv/EpgTimerSrv/EpgTimerSrvMain.cpp
@@ -693,6 +693,7 @@ void CEpgTimerSrvMain::ReloadNetworkSetting()
 		this->httpOptions.authenticationDomain = GetPrivateProfileToString(L"SET", L"HttpAuthenticationDomain", L"", iniPath.c_str());
 		this->httpOptions.numThreads = GetPrivateProfileInt(L"SET", L"HttpNumThreads", 3, iniPath.c_str());
 		this->httpOptions.requestTimeout = GetPrivateProfileInt(L"SET", L"HttpRequestTimeoutSec", 120, iniPath.c_str()) * 1000;
+		this->httpOptions.sslProtocolVersion = GetPrivateProfileInt(L"SET", L"HttpSslProtocolVersion", 2, iniPath.c_str());
 		this->httpOptions.keepAlive = GetPrivateProfileInt(L"SET", L"HttpKeepAlive", 0, iniPath.c_str()) != 0;
 		this->httpOptions.ports = GetPrivateProfileToString(L"SET", L"HttpPort", L"5510", iniPath.c_str());
 		this->httpOptions.saveLog = enableHttpSrv == 2;
diff --git a/EpgTimerSrv/EpgTimerSrv/HttpServer.cpp b/EpgTimerSrv/EpgTimerSrv/HttpServer.cpp
index cdda64c0e4..a59432d68c 100644
--- a/EpgTimerSrv/EpgTimerSrv/HttpServer.cpp
+++ b/EpgTimerSrv/EpgTimerSrv/HttpServer.cpp
@@ -68,6 +68,8 @@ bool CHttpServer::StartServer(const SERVER_OPTIONS& op, int (*initProc)(lua_Stat
 	Format(numThreads, "%d", min(max(op.numThreads, 1), 50));
 	string requestTimeout;
 	Format(requestTimeout, "%d", max(op.requestTimeout, 1));
+	string sslProtocolVersion;
+	Format(sslProtocolVersion, "%d", op.sslProtocolVersion);
 
 	//追加のMIMEタイプ
 	CParseContentTypeText contentType;
@@ -87,9 +89,10 @@ bool CHttpServer::StartServer(const SERVER_OPTIONS& op, int (*initProc)(lua_Stat
 		"document_root", rootPathU.c_str(),
 		"num_threads", numThreads.c_str(),
 		"request_timeout_ms", requestTimeout.c_str(),
+		"ssl_protocol_version", sslProtocolVersion.c_str(),
 		"lua_script_pattern", "**.lua$|**.html$|*/api/*$",
 	};
-	int opCount = 2 * 8;
+	int opCount = 2 * 9;
 	if( op.saveLog ){
 		options[opCount++] = "access_log_file";
 		options[opCount++] = accessLogPath.c_str();
diff --git a/EpgTimerSrv/EpgTimerSrv/HttpServer.h b/EpgTimerSrv/EpgTimerSrv/HttpServer.h
index 09d649a26b..3c10097b7d 100644
--- a/EpgTimerSrv/EpgTimerSrv/HttpServer.h
+++ b/EpgTimerSrv/EpgTimerSrv/HttpServer.h
@@ -15,6 +15,7 @@ class CHttpServer
 		std::wstring authenticationDomain;
 		int numThreads;
 		int requestTimeout;
+		int sslProtocolVersion;
 		bool keepAlive;
 		bool saveLog;
 	};