[GNUnet-SVN] r7972 - libmicrohttpd/src/testcurl/https

[gnunet]

Author: lv-426
Date: 2008-11-24 03:01:47 -0700 (Mon, 24 Nov 2008)
New Revision: 7972

Modified:
   libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c
Log:
test fix

Modified: libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c
===================================================================
--- libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c  2008-11-23 
16:21:16 UTC (rev 7971)
+++ libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c  2008-11-24 
10:01:47 UTC (rev 7972)
@@ -164,7 +164,7 @@
       fprintf (stderr, MHD_E_MEM);
       return -1;
     }
-  if (getcwd (doc_path, doc_path_len) == NULL) 
+  if (getcwd (doc_path, doc_path_len) == NULL)
     {
       fclose (test_fd);
       free (doc_path);
@@ -354,6 +354,7 @@
 
 /**
  * test server refuses to negotiate connections with unsupported protocol 
versions
+ *
  */
 int
 test_protocol_version (FILE * test_fd, char *cipher_suite,
@@ -368,8 +369,8 @@
 #endif
   curl_easy_setopt (c, CURLOPT_URL, "https://localhost:42433/";);
   curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
-  curl_easy_setopt (c, CURLOPT_TIMEOUT, 60L);
-  curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 60L);
+  curl_easy_setopt (c, CURLOPT_TIMEOUT, 3L);
+  curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 3L);
 
   /* TLS options */
   curl_easy_setopt (c, CURLOPT_SSLVERSION, curl_proto_version);
@@ -407,7 +408,7 @@
 test_single_threaded_daemon (FILE * test_fd, char *cipher_suite,
                              int curl_proto_version)
 {
-  int i, client_count = 16;
+  int i, client_count = 3;
   void *client_thread_ret;
   pthread_t client_arr[client_count];
 
@@ -523,7 +524,7 @@
                daemon_flags, "AES256-SHA", CURL_SSLVERSION_TLSv1,
                MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
                MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
-               MHD_OPTION_PROTOCOL_VERSION, p_tls, MHD_OPTION_END);
+               MHD_OPTION_PROTOCOL_VERSION, p_ssl3, MHD_OPTION_END);
 
   errorCount +=
     test_wrap ("single threaded daemon", &test_single_threaded_daemon, test_fd,