fixed SF# 1956300: HTTPServerConnection hanging

obiltschnig · obiltschnig · commit 4ec68cecafc0 · 2008-05-02T16:41:14.000Z
diff --git a/Net/include/Poco/Net/HTTPSession.h b/Net/include/Poco/Net/HTTPSession.h
@@ -1,7 +1,7 @@
 //
 // HTTPSession.h
 //
-// $Id: //poco/svn/Net/include/Poco/Net/HTTPSession.h#2 $
+// $Id: //poco/Main/Net/include/Poco/Net/HTTPSession.h#5 $
 //
 // Library: Net
 // Package: HTTP
@@ -140,6 +140,9 @@ class Net_API HTTPSession
 
 	int receive(char* buffer, int length);
 		/// Reads up to length bytes.
+		
+	int buffered() const;
+		/// Returns the number of bytes in the buffer.
 
 	StreamSocket& socket();
 		/// Returns a reference to the underlying socket.
@@ -208,6 +211,12 @@ inline const Poco::Exception* HTTPSession::networkException() const
 }
 
 
+inline int HTTPSession::buffered() const
+{
+	return static_cast<int>(_pEnd - _pCurrent);
+}
+
+
 } } // namespace Poco::Net
 
 
diff --git a/Net/src/HTTPServerSession.cpp b/Net/src/HTTPServerSession.cpp
@@ -1,7 +1,7 @@
 //
 // HTTPServerSession.cpp
 //
-// $Id: //poco/svn/Net/src/HTTPServerSession.cpp#2 $
+// $Id: //poco/Main/Net/src/HTTPServerSession.cpp#9 $
 //
 // Library: Net
 // Package: HTTPServer
@@ -70,7 +70,7 @@ bool HTTPServerSession::hasMoreRequests()
 	{
 		if (_maxKeepAliveRequests > 0) 
 			--_maxKeepAliveRequests;
-		return socket().poll(_keepAliveTimeout, Socket::SELECT_READ);
+		return buffered() > 0 || socket().poll(_keepAliveTimeout, Socket::SELECT_READ);
 	}
 	else return false;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`//`
`2`	`2`	`// HTTPServerSession.cpp`
`3`	`3`	`//`
`4`		`-// $Id: //poco/svn/Net/src/HTTPServerSession.cpp#2 $`
	`4`	`+// $Id: //poco/Main/Net/src/HTTPServerSession.cpp#9 $`
`5`	`5`	`//`
`6`	`6`	`// Library: Net`
`7`	`7`	`// Package: HTTPServer`
`@@ -70,7 +70,7 @@ bool HTTPServerSession::hasMoreRequests()`
`70`	`70`	`{`
`71`	`71`	`if (_maxKeepAliveRequests > 0)`
`72`	`72`	`--_maxKeepAliveRequests;`
`73`		`- return socket().poll(_keepAliveTimeout, Socket::SELECT_READ);`
	`73`	`+ return buffered() > 0 \|\| socket().poll(_keepAliveTimeout, Socket::SELECT_READ);`
`74`	`74`	`}`
`75`	`75`	`else return false;`
`76`	`76`	`}`