Add SSL_pending() again to check if data is available

fhessel · fhessel · commit d68a92dc49a8 · 2018-09-05T21:01:44.000+02:00
diff --git a/src/HTTPConnection.cpp b/src/HTTPConnection.cpp
@@ -157,22 +157,7 @@ int HTTPConnection::updateBuffer() {
 		}
 
 		if (_bufferUnusedIdx < HTTPS_CONNECTION_DATA_CHUNK_SIZE) {
-			// Check only this socket for data
-			fd_set sockfds;
-			FD_ZERO( &sockfds );
-			FD_SET(_socket, &sockfds);
-
-			// We define an immediate timeout (return immediately, if there's no data)
-			timeval timeout;
-			timeout.tv_sec  = 0;
-			timeout.tv_usec = 0;
-
-			// Check for input
-			// As by 2017-12-14, it seems that FD_SETSIZE is defined as 0x40, but socket IDs now
-			// start at 0x1000, so we need to use _socket+1 here
-			select(_socket + 1, &sockfds, NULL, NULL, &timeout);
-
-			if (FD_ISSET(_socket, &sockfds)) { // FIXME: Is SSL_pending(_ssl) > 0 required here?
+			if (canReadData()) {
 
 				HTTPS_DLOGHEX("[   ] There is data on the connection socket. fid=", _socket)
 
@@ -215,6 +200,24 @@ int HTTPConnection::updateBuffer() {
 	return 0;
 }
 
+bool HTTPConnection::canReadData() {
+	fd_set sockfds;
+	FD_ZERO( &sockfds );
+	FD_SET(_socket, &sockfds);
+
+	// We define an immediate timeout (return immediately, if there's no data)
+	timeval timeout;
+	timeout.tv_sec  = 0;
+	timeout.tv_usec = 0;
+
+	// Check for input
+	// As by 2017-12-14, it seems that FD_SETSIZE is defined as 0x40, but socket IDs now
+	// start at 0x1000, so we need to use _socket+1 here
+	select(_socket + 1, &sockfds, NULL, NULL, &timeout);
+
+	return FD_ISSET(_socket, &sockfds);
+}
+
 size_t HTTPConnection::readBuffer(byte* buffer, size_t length) {
 	updateBuffer();
 	size_t bufferSize = _bufferUnusedIdx - _bufferProcessed;
diff --git a/src/HTTPConnection.hpp b/src/HTTPConnection.hpp
@@ -41,6 +41,7 @@ class HTTPConnection : private ConnectionContext {
 
 	virtual size_t writeBuffer(byte* buffer, size_t length);
 	virtual size_t readBytesToBuffer(byte* buffer, size_t length);
+	virtual bool canReadData();
 	virtual size_t pendingByteCount();
 
 	// Timestamp of the last transmission action
diff --git a/src/HTTPSConnection.cpp b/src/HTTPSConnection.cpp
@@ -116,4 +116,8 @@ size_t HTTPSConnection::pendingByteCount() {
 	return SSL_pending(_ssl);
 }
 
+bool HTTPSConnection::canReadData() {
+	return HTTPConnection::canReadData() || (SSL_pending(_ssl) > 0);
+}
+
 } /* namespace httpsserver */
diff --git a/src/HTTPSConnection.hpp b/src/HTTPSConnection.hpp
@@ -41,7 +41,7 @@ class HTTPSConnection : public HTTPConnection {
 
 	virtual size_t readBytesToBuffer(byte* buffer, size_t length);
 	virtual size_t pendingByteCount();
-
+	virtual bool canReadData();
 	virtual size_t writeBuffer(byte* buffer, size_t length);
 
 private:

Original file line number	Diff line number	Diff line change
`@@ -116,4 +116,8 @@ size_t HTTPSConnection::pendingByteCount() {`
`116`	`116`	`return SSL_pending(_ssl);`
`117`	`117`	`}`
`118`	`118`
	`119`	`+bool HTTPSConnection::canReadData() {`
	`120`	`+ return HTTPConnection::canReadData() \|\| (SSL_pending(_ssl) > 0);`
	`121`	`+}`
	`122`	`+`
`119`	`123`	`} /* namespace httpsserver */`