port "liveness" checks and a couple of other things from the 4.3 branch.

Liveness checks are used to validate persistent socket connects when they
are re-used.

3 files changed, 33 insertions, 10 deletions

diff --git a/main/php_streams.h b/main/php_streams.h
index 793878a488..6496018931 100755
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -358,6 +358,10 @@ PHPAPI int _php_stream_truncate_set_size(php_stream *stream, size_t newsize TSRM
 #define PHP_STREAM_OPTION_META_DATA_API		11 /* ptrparam is a zval* to which to add meta data information */
 #define php_stream_populate_meta_data(stream, zv)	(_php_stream_set_option((stream), PHP_STREAM_OPTION_META_DATA_API, 0, zv TSRMLS_CC) == PHP_STREAM_OPTION_RETURN_OK ? 1 : 0)
 
+/* Check if the stream is still "live"; for sockets/pipes this means the socket
+ * is still connected; for files, this does not really have meaning */
+#define PHP_STREAM_OPTION_CHECK_LIVENESS	12 /* no parameters */
+
 #define PHP_STREAM_OPTION_RETURN_OK			 0 /* option set OK */
 #define PHP_STREAM_OPTION_RETURN_ERR 		-1 /* problem setting option */
 #define PHP_STREAM_OPTION_RETURN_NOTIMPL	-2 /* underlying stream does not implement; streams can handle it instead */
diff --git a/main/streams/transports.c b/main/streams/transports.c
index f07268602d..dd593baed6 100644
--- a/main/streams/transports.c
+++ b/main/streams/transports.c
@@ -74,8 +74,10 @@ PHPAPI php_stream *_php_stream_xport_create(const char *name, long namelen, int
 	if (persistent_id) {
 		switch(php_stream_from_persistent_id(persistent_id, &stream TSRMLS_CC)) {
 			case PHP_STREAM_PERSISTENT_SUCCESS:
-				/* TODO: check if the socket is still live */
-				return stream;
+				if (PHP_STREAM_OPTION_RETURN_OK == php_stream_set_option(stream, PHP_STREAM_OPTION_CHECK_LIVENESS, 0, NULL)) {
+					return stream;
+				}
+				/* fall through */
 
 			case PHP_STREAM_PERSISTENT_FAILURE:
 			default:
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index 193958fa6e..55c6990957 100644
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c
@@ -148,15 +148,9 @@ static int php_sockop_close(php_stream *stream, int close_handle TSRMLS_DC)
 	if (close_handle) {
 
 		if (sock->socket != -1) {
+#ifdef PHP_WIN32
 			/* prevent more data from coming in */
-
-#ifdef AF_UNIX
-			if (stream->ops != &php_stream_unix_socket_ops && stream->ops != &php_stream_unixdg_socket_ops) {
-#endif
-				shutdown(sock->socket, SHUT_RD);
-#ifdef AF_UNIX
-			}
-#endif
+			shutdown(sock->socket, SHUT_RD);
 
 			/* try to make sure that the OS sends all data before we close the connection.
 			 * Essentially, we are waiting for the socket to become writeable, which means
@@ -174,6 +168,7 @@ static int php_sockop_close(php_stream *stream, int close_handle TSRMLS_DC)
 
 				n = select(sock->socket + 1, NULL, &wrfds, &efds, &timeout);
 			} while (n == -1 && php_socket_errno() == EINTR);
+#endif
 
 			closesocket(sock->socket);
 			sock->socket = -1;
@@ -205,6 +200,28 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void
 	php_stream_xport_param *xparam;
 	
 	switch(option) {
+		case PHP_STREAM_OPTION_CHECK_LIVENESS:
+			{
+				fd_set rfds;
+				struct timeval tv = {0,0};
+				char buf;
+				int alive = 1;
+
+				if (sock->socket == -1) {
+					alive = 0;
+				} else {
+					FD_ZERO(&rfds);
+					FD_SET(sock->socket, &rfds);
+
+					if (select(sock->socket + 1, &rfds, NULL, NULL, &tv) > 0 && FD_ISSET(sock->socket, &rfds)) {
+						if (0 == recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EAGAIN) {
+							alive = 0;
+						}
+					}
+				}
+				return alive ? PHP_STREAM_OPTION_RETURN_OK : PHP_STREAM_OPTION_RETURN_ERR;
+			}
+			
 		case PHP_STREAM_OPTION_BLOCKING:
 	
 			oldmode = sock->is_blocked;