aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPSSHTunnel.m
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2011-09-01 00:00:49 +0000
committerrowanbeentje <rowan@beent.je>2011-09-01 00:00:49 +0000
commit2073ff3be93579d7b7be3ff1bb45d49700301c75 (patch)
tree714b3ee5626062d56d49e41b8e644b5b2de1014c /Source/SPSSHTunnel.m
parentc94117a1f14c07b2882ea10c2979ec928ce24ab4 (diff)
downloadsequelpro-2073ff3be93579d7b7be3ff1bb45d49700301c75.tar.gz
sequelpro-2073ff3be93579d7b7be3ff1bb45d49700301c75.tar.bz2
sequelpro-2073ff3be93579d7b7be3ff1bb45d49700301c75.zip
- Attempt to detect SSH master use correctly, to improve Issue #1095
Diffstat (limited to 'Source/SPSSHTunnel.m')
-rw-r--r--Source/SPSSHTunnel.m4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/SPSSHTunnel.m b/Source/SPSSHTunnel.m
index 04e21e5f..0c25c181 100644
--- a/Source/SPSSHTunnel.m
+++ b/Source/SPSSHTunnel.m
@@ -431,7 +431,9 @@
[debugMessages addObject:[NSString stringWithString:message]];
[debugMessagesLock unlock];
- if ([message rangeOfString:@"Entering interactive session."].location != NSNotFound) {
+ if ([message rangeOfString:@"Entering interactive session."].location != NSNotFound
+ || [message rangeOfString:@"mux_client_request_session: master session id: "].location != NSNotFound)
+ {
connectionState = PROXY_STATE_CONNECTED;
if (delegate) [delegate performSelectorOnMainThread:stateChangeSelector withObject:self waitUntilDone:NO];
}