[GNUnet-SVN] r22118 - in libmicrohttpd/src/testcurl: . https

[gnunet]

Author: grothoff
Date: 2012-06-19 19:53:06 +0200 (Tue, 19 Jun 2012)
New Revision: 22118

Modified:
   libmicrohttpd/src/testcurl/daemon_options_test.c
   libmicrohttpd/src/testcurl/https/mhds_get_test.c
   libmicrohttpd/src/testcurl/https/tls_test_common.h
Log:
-use lower port numbers with smaller conflict potential for ssl tests

Modified: libmicrohttpd/src/testcurl/daemon_options_test.c
===================================================================
--- libmicrohttpd/src/testcurl/daemon_options_test.c    2012-06-19 17:47:11 UTC 
(rev 22117)
+++ libmicrohttpd/src/testcurl/daemon_options_test.c    2012-06-19 17:53:06 UTC 
(rev 22118)
@@ -79,12 +79,12 @@
 
   memset (&daemon_ip_addr, 0, sizeof (struct sockaddr_in));
   daemon_ip_addr.sin_family = AF_INET;
-  daemon_ip_addr.sin_port = htons (42433);
+  daemon_ip_addr.sin_port = htons (4233);
 
 #if HAVE_INET6
   memset (&daemon_ip_addr6, 0, sizeof (struct sockaddr_in6));
   daemon_ip_addr6.sin6_family = AF_INET6;
-  daemon_ip_addr6.sin6_port = htons (42433);
+  daemon_ip_addr6.sin6_port = htons (4233);
 #endif
 
   inet_pton (AF_INET, "127.0.0.1", &daemon_ip_addr.sin_addr);
@@ -92,7 +92,7 @@
   inet_pton (AF_INET6, "::ffff:127.0.0.1", &daemon_ip_addr6.sin6_addr);
 #endif
 
-  d = MHD_start_daemon (MHD_USE_DEBUG, 42433,
+  d = MHD_start_daemon (MHD_USE_DEBUG, 4233,
                         NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR,
                         &daemon_ip_addr, MHD_OPTION_END);
 
@@ -102,7 +102,7 @@
   MHD_stop_daemon (d);
 
 #if HAVE_INET6
-  d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_IPv6, 42433,
+  d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_IPv6, 4233,
                         NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR,
                         &daemon_ip_addr6, MHD_OPTION_END);
 

Modified: libmicrohttpd/src/testcurl/https/mhds_get_test.c
===================================================================
--- libmicrohttpd/src/testcurl/https/mhds_get_test.c    2012-06-19 17:47:11 UTC 
(rev 22117)
+++ libmicrohttpd/src/testcurl/https/mhds_get_test.c    2012-06-19 17:53:06 UTC 
(rev 22118)
@@ -44,7 +44,7 @@
   int ret;
   struct MHD_Daemon *d;
   d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
-                        MHD_USE_DEBUG, 42433,
+                        MHD_USE_DEBUG, 4233,
                         NULL, NULL, &http_ahc, NULL,
                         MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
                         MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
@@ -70,7 +70,7 @@
   struct MHD_Daemon *d;
 
   d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
-                        MHD_USE_DEBUG, 42433,
+                        MHD_USE_DEBUG, 4233,
                         NULL, NULL, &http_ahc, NULL,
                         MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
                         MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem,

Modified: libmicrohttpd/src/testcurl/https/tls_test_common.h
===================================================================
--- libmicrohttpd/src/testcurl/https/tls_test_common.h  2012-06-19 17:47:11 UTC 
(rev 22117)
+++ libmicrohttpd/src/testcurl/https/tls_test_common.h  2012-06-19 17:53:06 UTC 
(rev 22118)
@@ -32,7 +32,7 @@
 #define DEBUG_HTTPS_TEST 0
 #define CURL_VERBOS_LEVEL 0
 
-#define DEAMON_TEST_PORT 42433
+#define DEAMON_TEST_PORT 4233
 
 #define test_data "Hello World\n"
 #define ca_cert_file_name "tmp_ca_cert.pem"