diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-06-19 17:53:06 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-06-19 17:53:06 +0000 |
commit | aa8f99d22eb51f0a662d6fcba926fcf6b9e994b1 (patch) | |
tree | 146884ff03c4c44b4d924dbc00cacbb214b931f4 | |
parent | 77826187692f84b2fd9c85c42d2e8fe49935a681 (diff) | |
download | libmicrohttpd-aa8f99d22eb51f0a662d6fcba926fcf6b9e994b1.tar.gz libmicrohttpd-aa8f99d22eb51f0a662d6fcba926fcf6b9e994b1.zip |
-use lower port numbers with smaller conflict potential for ssl tests
-rw-r--r-- | src/testcurl/daemon_options_test.c | 8 | ||||
-rw-r--r-- | src/testcurl/https/mhds_get_test.c | 4 | ||||
-rw-r--r-- | src/testcurl/https/tls_test_common.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/testcurl/daemon_options_test.c b/src/testcurl/daemon_options_test.c index 7a387d94..79042a46 100644 --- a/src/testcurl/daemon_options_test.c +++ b/src/testcurl/daemon_options_test.c | |||
@@ -79,12 +79,12 @@ test_ip_addr_option () | |||
79 | 79 | ||
80 | memset (&daemon_ip_addr, 0, sizeof (struct sockaddr_in)); | 80 | memset (&daemon_ip_addr, 0, sizeof (struct sockaddr_in)); |
81 | daemon_ip_addr.sin_family = AF_INET; | 81 | daemon_ip_addr.sin_family = AF_INET; |
82 | daemon_ip_addr.sin_port = htons (42433); | 82 | daemon_ip_addr.sin_port = htons (4233); |
83 | 83 | ||
84 | #if HAVE_INET6 | 84 | #if HAVE_INET6 |
85 | memset (&daemon_ip_addr6, 0, sizeof (struct sockaddr_in6)); | 85 | memset (&daemon_ip_addr6, 0, sizeof (struct sockaddr_in6)); |
86 | daemon_ip_addr6.sin6_family = AF_INET6; | 86 | daemon_ip_addr6.sin6_family = AF_INET6; |
87 | daemon_ip_addr6.sin6_port = htons (42433); | 87 | daemon_ip_addr6.sin6_port = htons (4233); |
88 | #endif | 88 | #endif |
89 | 89 | ||
90 | inet_pton (AF_INET, "127.0.0.1", &daemon_ip_addr.sin_addr); | 90 | inet_pton (AF_INET, "127.0.0.1", &daemon_ip_addr.sin_addr); |
@@ -92,7 +92,7 @@ test_ip_addr_option () | |||
92 | inet_pton (AF_INET6, "::ffff:127.0.0.1", &daemon_ip_addr6.sin6_addr); | 92 | inet_pton (AF_INET6, "::ffff:127.0.0.1", &daemon_ip_addr6.sin6_addr); |
93 | #endif | 93 | #endif |
94 | 94 | ||
95 | d = MHD_start_daemon (MHD_USE_DEBUG, 42433, | 95 | d = MHD_start_daemon (MHD_USE_DEBUG, 4233, |
96 | NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR, | 96 | NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR, |
97 | &daemon_ip_addr, MHD_OPTION_END); | 97 | &daemon_ip_addr, MHD_OPTION_END); |
98 | 98 | ||
@@ -102,7 +102,7 @@ test_ip_addr_option () | |||
102 | MHD_stop_daemon (d); | 102 | MHD_stop_daemon (d); |
103 | 103 | ||
104 | #if HAVE_INET6 | 104 | #if HAVE_INET6 |
105 | d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_IPv6, 42433, | 105 | d = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_IPv6, 4233, |
106 | NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR, | 106 | NULL, NULL, &ahc_echo, NULL, MHD_OPTION_SOCK_ADDR, |
107 | &daemon_ip_addr6, MHD_OPTION_END); | 107 | &daemon_ip_addr6, MHD_OPTION_END); |
108 | 108 | ||
diff --git a/src/testcurl/https/mhds_get_test.c b/src/testcurl/https/mhds_get_test.c index 4eefb8ff..f279ac9f 100644 --- a/src/testcurl/https/mhds_get_test.c +++ b/src/testcurl/https/mhds_get_test.c | |||
@@ -44,7 +44,7 @@ test_cipher_option (FILE * test_fd, char *cipher_suite, int proto_version) | |||
44 | int ret; | 44 | int ret; |
45 | struct MHD_Daemon *d; | 45 | struct MHD_Daemon *d; |
46 | d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | | 46 | d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | |
47 | MHD_USE_DEBUG, 42433, | 47 | MHD_USE_DEBUG, 4233, |
48 | NULL, NULL, &http_ahc, NULL, | 48 | NULL, NULL, &http_ahc, NULL, |
49 | MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, | 49 | MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, |
50 | MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, | 50 | MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, |
@@ -70,7 +70,7 @@ test_secure_get (FILE * test_fd, char *cipher_suite, int proto_version) | |||
70 | struct MHD_Daemon *d; | 70 | struct MHD_Daemon *d; |
71 | 71 | ||
72 | d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | | 72 | d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | |
73 | MHD_USE_DEBUG, 42433, | 73 | MHD_USE_DEBUG, 4233, |
74 | NULL, NULL, &http_ahc, NULL, | 74 | NULL, NULL, &http_ahc, NULL, |
75 | MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem, | 75 | MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem, |
76 | MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem, | 76 | MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem, |
diff --git a/src/testcurl/https/tls_test_common.h b/src/testcurl/https/tls_test_common.h index 1556839b..7cc7e122 100644 --- a/src/testcurl/https/tls_test_common.h +++ b/src/testcurl/https/tls_test_common.h | |||
@@ -32,7 +32,7 @@ | |||
32 | #define DEBUG_HTTPS_TEST 0 | 32 | #define DEBUG_HTTPS_TEST 0 |
33 | #define CURL_VERBOS_LEVEL 0 | 33 | #define CURL_VERBOS_LEVEL 0 |
34 | 34 | ||
35 | #define DEAMON_TEST_PORT 42433 | 35 | #define DEAMON_TEST_PORT 4233 |
36 | 36 | ||
37 | #define test_data "Hello World\n" | 37 | #define test_data "Hello World\n" |
38 | #define ca_cert_file_name "tmp_ca_cert.pem" | 38 | #define ca_cert_file_name "tmp_ca_cert.pem" |