Merge pull request #547 from atnaguzin/openssl

fixed #546
9 years ago · 10f3690ede
2 changed files with 120 additions and 114 deletions
--- a/DaemonWin32.cpp
+++ b/DaemonWin32.cpp
@ -1,4 +1,5 @@
				@@ -1,4 +1,5 @@
 #include <thread>
+#include <clocale>
 #include "Config.h"
 #include "Daemon.h"
 #include "util.h"
@ -20,6 +21,7 @@ namespace i2p
				@@ -20,6 +21,7 @@ namespace i2p
 			setlocale(LC_CTYPE, "");
 			SetConsoleCP(1251);
 			SetConsoleOutputCP(1251);
+			setlocale(LC_ALL, "Russian");

 			if (!Daemon_Singleton::init(argc, argv))
 				return false;
--- a/HTTPServer.cpp
+++ b/HTTPServer.cpp
@ -126,8 +126,12 @@ namespace http {
				@@ -126,8 +126,12 @@ namespace http {
 		s <<
 			"<!DOCTYPE html>\r\n"
 			"<html lang=\"en\">\r\n" /* TODO: Add support for locale */
-			"  <head>\r\n"
-			"  <meta charset=\"UTF-8\">\r\n" /* TODO: Find something to parse html/template system. This is horrible. */
+			"  <head>\r\n" /* TODO: Find something to parse html/template system. This is horrible. */
+#if (!defined(WIN32))
+			"  <meta charset=\"UTF-8\">\r\n"
+#else
+			"  <meta charset=\"windows-1251\">\r\n"
+#endif
 			"  <link rel=\"shortcut icon\" href=\"" << itoopieFavicon << "\">\r\n"
 			"  <title>Purple I2P " VERSION " Webconsole</title>\r\n"
 			<< cssStyles <<