ObjOpenSSL  Diff

Differences From Artifact [4d5d5d3a67]:

• File src/SSLSocket.m — part of check-in [704eff4870] at 2011-10-22 15:46:02 on branch trunk — Use -[pendingBytes] of the superclass if we have no SSL context.
  This happens if we are a listening socket. (user: js, size: 7638) [annotate] [blame] [check-ins using]

To Artifact [caea951286]:

• File src/SSLSocket.m — part of check-in [5695c6cedc] at 2011-10-22 16:33:04 on branch trunk — Only call SSL_shutdown if we have an SSL context.
  This would otherwise cause trouble for listening sockets. (user: js, size: 7657) [annotate] [blame] [check-ins using]

178
179
180
181
182
183
184

185
186
187
188
189
190
191
192

	}

	return newSocket;
}

- (void)close
{

	SSL_shutdown(ssl);

	[super close];
}

- (size_t)_readNBytes: (size_t)length
	   intoBuffer: (void*)buffer
{

>
|

178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193

	}

	return newSocket;
}

- (void)close
{
	if (ssl != NULL)
		SSL_shutdown(ssl);

	[super close];
}

- (size_t)_readNBytes: (size_t)length
	   intoBuffer: (void*)buffer
{