[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.0.6-23-g523d81c

[X2go dev team]

The branch, master has been updated
       via  523d81c193cb7b7b666f65237caa58f6260785b7 (commit)
      from  9787ec7a53668f6763afedd956df9ab757b92a9e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 523d81c193cb7b7b666f65237caa58f6260785b7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Feb 18 21:45:34 2012 +0100

    Mac OS patch: Raise the stack space to 2MB for secondary threads. It previously used the 512KB system default.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog        |    5 +++++
 sshmasterconnection.cpp |   11 +++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d92bc45..bb8a35c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,11 @@ x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low
     - Update all translation files (lupdate), translate unfinished translation
       tags in x2goclient_de.ts.
 
+  [ Mihai Moldovan ]
+  * New upstream version (3.99.1.0):
+    - Mac OS patch: Raise the stack space to 2MB for secondary threads. It
+      previously used the 512KB system default.
+
   [ Daniel Lindgren ]
   * New upstream version (3.99.1.0):
     -  Add swedish translation file.
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index c922af2..2626346 100644
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -46,6 +46,11 @@ static bool isLibSshInited=false;
 SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUnknownServers, QString user,
         QString pass, QString key,bool autologin, bool krblogin, QObject* parent ) : QThread ( parent )
 {
+#if defined ( Q_OS_DARWIN )
+    // Mac OS X provides only 512KB stack space for secondary threads.
+    // As we put a 512KB buffer on the stack later on, we need a bigger stack space.
+    setStackSize (sizeof (char) * 1024 * 1024 * 2);
+#endif
     this->host=host;
     this->port=port;
     this->user=user;
@@ -62,7 +67,7 @@ SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUn
     else
         x2goDebug<<"starting ssh connection without kerberos authentication"<<endl;
 #endif
-kerberos=false;
+    kerberos=false;
 }
 
 SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUnknownServers, QString user,
@@ -70,7 +75,9 @@ SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUn
         int remotePort, QString localHost, int localPort, SshProcess* creator,
         QObject* parent, ONMainWindow* mwd ) : QThread ( parent )
 {
-
+#if defined ( Q_OS_DARWIN )
+    setStackSize (sizeof (char) * 1024 * 1024 * 2);
+#endif
     this->host=host;
     this->port=port;
     this->user=user;


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).