Free old ssl session.

sorced-jim · Oct 22, 2012 · 9639ba6 · 9639ba6
1 parent 649d981
commit 9639ba6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/SPDY/SPDY/SPDY.m b/SPDY/SPDY/SPDY.m
@@ -136,8 +136,8 @@ - (SpdySession *)getSession:(NSURL *)url withError:(NSError **)error {
     if (session != nil && ([session isInvalid] || currentStatus != session.networkStatus)) {
         SPDY_LOG(@"Resetting %@ because invalid: %i or %d != %d", session, [session isInvalid], currentStatus, session.networkStatus);
         [session resetStreamsAndGoAway];
-        [self.sessions removeObjectForKey:key];
         oldSslSession = [session getSslSession];
+        [self.sessions removeObjectForKey:key];
         session = nil;
     }
     if (session == nil) {

diff --git a/SPDY/SPDY/SpdySession.m b/SPDY/SPDY/SpdySession.m
@@ -297,8 +297,11 @@ - (void)setUpSSL {
         return;
     }
     SSL_set_app_data(ssl, self);
-    if (oldSslSession)
+    if (oldSslSession) {
         SSL_set_session(ssl, oldSslSession);
+        SSL_SESSION_free(oldSslSession);  // Reference taken in getSslSession.
+        oldSslSession = NULL;
+    }
 }
 
 - (BOOL)sslConnect {

diff --git a/install/lib/libSPDY.a b/install/lib/libSPDY.a