acl_vstream_probe_status maybe be blocked in fiber mode

lib_acl/samples/connect/main.cpp

@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
 	acl_msg_stdout_enable(1);
 	get_name();
 	test(argc >= 2 ? argv[1] : "localhost:8809");
-	return 0;
+	//return 0;
 
 	ACL_VSTREAM *client;
 	const char *addr;
@@ -70,18 +70,21 @@ int main(int argc, char *argv[])
 
 	addr = argv[1];
 
+	acl_msg_stdout_enable(1);
 	acl_msg_open("connect.log", argv[0]);
 	printf("connecting %s ...\n", argv[1]);
 
 	//acl_poll_prefered(1);
-	for (int i = 0; i < 10000; i++)
+	for (int i = 0; i < 1; i++)
 	{
 		client = acl_vstream_connect(addr, ACL_BLOCKING, 10, 10, 4096);
 		if (client == NULL) {
 			printf("connect %s error(%s)\n", addr, acl_last_serror());
 			return (1);
 		}
-		printf("connect %s ok, %s\n", addr, acl_last_serror());
+		sleep(1);
+		ret = acl_vstream_probe_status(client);
+		printf("connect %s ok, %s, ret=%d\n", addr, acl_last_serror(), ret);
 	}
 
 	printf(">>>>>>connect all ok\r\n");

lib_acl/samples/server/main.c

@@ -50,6 +50,7 @@ static void run(const char *addr)
 			break;
 		}
 		printf("accept one client\r\n");
+		acl_vstream_close(client); continue;
 		acl_pthread_pool_add(pool, thread_run, client);
 	}
 

lib_acl/src/stdlib/acl_vstream.c

@@ -527,6 +527,9 @@ int acl_vstream_probe_status(ACL_VSTREAM *fp)
 		return -1;
 	}
 
+	if (acl_read_wait(ACL_VSTREAM_SOCK(fp), 0) < 0)
+		return errno == ACL_ETIMEDOUT ? 0 : -1;
+
 #ifdef	ACL_UNIX
 	flags = fcntl(ACL_VSTREAM_SOCK(fp), F_GETFL, 0);
 	if (flags < 0) {

lib_acl/src/stdlib/iostuff/acl_read_wait.c

@@ -202,10 +202,12 @@ int acl_read_wait(ACL_SOCKET fd, int timeout)
 			ret = -1;
 			break;
 		} else if (ret == 0) {
+			/*
 			acl_msg_warn("%s(%d), %s: poll timeout: %s, fd: %d, "
 				"delay: %d, spent: %ld", __FILE__, __LINE__,
 				myname, acl_last_serror(), fd, delay,
 				(long) (time(NULL) - begin));
+			*/
 			acl_set_error(ACL_ETIMEDOUT);
 			ret = -1;
 			break;
@@ -433,11 +435,12 @@ int acl_read_wait(ACL_SOCKET fd, int timeout)
 				acl_last_serror(), (int) fd);
 			return -1;
 		case 0:
+			/*
 			acl_msg_warn("%s(%d), %s: poll timeout: %s, fd: %d, "
 				"timeout: %d, spent: %ld", __FILE__, __LINE__,
 				myname, acl_last_serror(), fd, timeout,
 				(long) (time(NULL) - begin));
-
+			*/
 			acl_set_error(ACL_ETIMEDOUT);
 			return -1;
 		default:

lib_acl_cpp/src/db/query.cpp

@@ -358,10 +358,12 @@ const string& query::escape(const char* in, size_t len, string& out)
 			out += '\\';
 			out += '\'';
 			break;
+#if 0
 		case '"':		/* Better safe than sorry */
 			out += '\\';
 			out += '"';
 			break;
+#endif
 		case '\032':		/* This gives problems on Win32 */
 			out += '\\';
 			out += 'Z';