Test wss using 70000 bytes payload

test/public_server.c

@@ -813,25 +813,24 @@ static const size_t websocket_goodbye_msg_len =
     14 /* strlen(websocket_goodbye_msg) */;
 
 
-#define WS_TEST_TRACE(...)
-/* #define WS_TEST_TRACE ws_trace_func */
-
-
+#if defined(DEBUG)
 static void
-ws_trace_func(const char *f, ...)
+WS_TEST_TRACE(const char *f, ...)
 {
 	va_list l;
 	va_start(l, f);
 	vprintf(f, l);
 	va_end(l);
 }
+#else
+#define WS_TEST_TRACE(...)
+#endif
 
 
 static int
 websock_server_connect(const struct mg_connection *conn, void *udata)
 {
 	(void)conn;
-	(void)ws_trace_func; /* Avoid "unused" warning */
 
 	ck_assert_ptr_eq((void *)udata, (void *)7531);
 	WS_TEST_TRACE("Server: Websocket connected\n");
@@ -859,7 +858,7 @@ websock_server_ready(struct mg_connection *conn, void *udata)
 
 
 #define long_ws_buf_len_16 (500)
-#define long_ws_buf_len_64 (700 /* 00 */) /* TODO: use len > 64k */
+#define long_ws_buf_len_64 (70000)
 static char long_ws_buf[long_ws_buf_len_64];
 
 
@@ -938,6 +937,7 @@ websock_server_data(struct mg_connection *conn,
 	return 1; /* return 1 to keep the connetion open */
 }
 
+
 static void
 websock_server_close(const struct mg_connection *conn, void *udata)
 {
@@ -1115,8 +1115,6 @@ START_TEST(test_request_handlers)
 
 	ctx = test_mg_start(NULL, &g_ctx, OPTIONS);
 
-	free(cgi_env_opt);
-
 	ck_assert(ctx != NULL);
 	g_ctx = ctx;
 
@@ -1125,7 +1123,20 @@ START_TEST(test_request_handlers)
 
 	opt = mg_get_option(ctx, "cgi_environment");
 	ck_assert_ptr_ne(opt, cgi_env_opt);
-    ck_assert(strcmp(opt, cgi_env_opt) == 0);
+	ck_assert_int_eq((int)opt[0], (int)cgi_env_opt[0]);
+	ck_assert_int_eq((int)opt[1], (int)cgi_env_opt[1]);
+	ck_assert_int_eq((int)opt[2], (int)cgi_env_opt[2]);
+	ck_assert_int_eq((int)opt[3], (int)cgi_env_opt[3]);
+	/* full length string compare will reach limit in the implementation
+	 * of the check unit test framework */
+	{
+		size_t len_check_1 = strlen(opt);
+		size_t len_check_2 = strlen(cgi_env_opt);
+		ck_assert_uint_eq(len_check_1, len_check_2);
+	}
+
+	/* We don't need the original anymore, the server has a private copy */
+	free(cgi_env_opt);
 
 	opt = mg_get_option(ctx, "throttle");
 	ck_assert_str_eq(opt, "");
@@ -3060,7 +3071,7 @@ START_TEST(test_keep_alive)
 	struct mg_context *ctx;
 	const char *OPTIONS[] =
 	{ "listening_ports",
-	  "8080",
+	  "8081",
 	  "request_timeout_ms",
 	  "10000",
 	  "enable_keep_alive",
@@ -3086,12 +3097,12 @@ START_TEST(test_keep_alive)
 	/* HTTP 1.1 GET request */
 	memset(client_err, 0, sizeof(client_err));
 	client_conn =
-	    mg_connect_client("127.0.0.1", 8080, 0, client_err, sizeof(client_err));
+	    mg_connect_client("127.0.0.1", 8081, 0, client_err, sizeof(client_err));
 	ck_assert(client_conn != NULL);
 	ck_assert_str_eq(client_err, "");
 	mg_printf(client_conn,
 	          "GET / HTTP/1.1\r\nHost: "
-	          "localhost:8080\r\nConnection: keep-alive\r\n\r\n");
+	          "localhost:8081\r\nConnection: keep-alive\r\n\r\n");
 	client_res =
 	    mg_get_response(client_conn, client_err, sizeof(client_err), 10000);
 	ck_assert_int_ge(client_res, 0);
@@ -3761,11 +3772,12 @@ START_TEST(test_large_file)
 	OPTIONS[opt_cnt++] = "ssl_certificate";
 	OPTIONS[opt_cnt++] = ssl_cert;
 #ifdef __MACH__
-    /* The Apple builds on Travis CI seem to have problems with TLS1.2 */
+	/* The Apple builds on Travis CI seem to have problems with TLS1.x
+	 * Allow SSLv3 and TLS */
 	OPTIONS[opt_cnt++] = "ssl_protocol_version";
-	OPTIONS[opt_cnt++] = "3";
+	OPTIONS[opt_cnt++] = "2";
 #else
-    /* The Linux builds on Travis CI work fine with TLS1.2 */
+	                 /* The Linux builds on Travis CI work fine with TLS1.2 */
 	OPTIONS[opt_cnt++] = "ssl_protocol_version";
 	OPTIONS[opt_cnt++] = "4";
 #endif