diff options
| author | rowanbeentje <rowan@beent.je> | 2012-10-14 19:22:45 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2012-10-14 19:22:45 +0000 |
| commit | d8896ae0a22b0014d0b43706280c8a390f14b058 (patch) | |
| tree | 7ffd10862c22a37507bd7d10edae26d015fd5620 /Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m | |
| parent | dc45c654aab99cbccecda192396dc8baefd5690e (diff) | |
| download | sequelpro-d8896ae0a22b0014d0b43706280c8a390f14b058.tar.gz sequelpro-d8896ae0a22b0014d0b43706280c8a390f14b058.tar.bz2 sequelpro-d8896ae0a22b0014d0b43706280c8a390f14b058.zip | |
- Clean up some connection cancellation/close-during-connect edges as a result of r3894, attempting to improve some exceptions during aborted connections
- Name threads created in SPMySQL.framework
Diffstat (limited to 'Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m')
| -rw-r--r-- | Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m index e12063a2..bdef884c 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m @@ -211,7 +211,7 @@ const char *SPMySQLSSLPermissibleCiphers = "DHE-RSA-AES256-SHA:AES256-SHA:DHE-RS [self _cancelKeepAlives]; // Disconnect if appropriate (which should also disconnect any proxy) - [self disconnect]; + [self _disconnect]; // Clean up the connection proxy, if any if (proxy) { @@ -638,7 +638,7 @@ const char *SPMySQLSSLPermissibleCiphers = "DHE-RSA-AES256-SHA:AES256-SHA:DHE-RS if (proxy) proxyStateChangeNotificationsIgnored = YES; // Close the connection if it's active - [self disconnect]; + [self _disconnect]; // Lock the connection while waiting for network and proxy [self _lockConnection]; |