@@ -236,14 +236,13 @@
 - (int)fileDescriptorForReading
 {
 	return [_socket fileDescriptorForReading];
 }
 
-- (size_t)numberOfBytesInReadBuffer
+- (bool)hasDataInReadBuffer
 {
-	return [super numberOfBytesInReadBuffer] +
-	    [_socket numberOfBytesInReadBuffer];
+	return ([super hasDataInReadBuffer] || [_socket hasDataInReadBuffer]);
 }
 
 - (void)close
 {
 	[_socket release];