Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp

1 files changed, 5 insertions, 10 deletions

diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index a5781171f92..f5cc3bf2508 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -123,6 +123,9 @@ int main(int argc, char** argv)
 
     // Set signal handlers
     boost::asio::signal_set signals(_ioService, SIGINT, SIGTERM);
+#if PLATFORM == PLATFORM_WINDOWS
+    signals.add(SIGBREAK);
+#endif
     signals.async_wait(SignalHandler);
 
     // Set process priority according to configuration settings
@@ -191,18 +194,10 @@ void StopDB()
     MySQL::Library_End();
 }
 
-void SignalHandler(const boost::system::error_code& error, int signalNumber)
+void SignalHandler(const boost::system::error_code& error, int /*signalNumber*/)
 {
     if (!error)
-    {
-        switch (signalNumber)
-        {
-        case SIGINT:
-        case SIGTERM:
-            _ioService.stop();
-            break;
-        }
-    }
+        _ioService.stop();
 }
 
 void KeepDatabaseAliveHandler(const boost::system::error_code& error)