commit 760d95681c6cf28dbd865225b316133c3cea4d94
author Greg Stein <gstein@apache.org> Mon Jun 03 18:23:31 2013 +0000
committer Greg Stein <gstein@apache.org> Mon Jun 03 18:23:31 2013 +0000
tree 59f610a441f72fdd53d3a039b0ce46a157432eda
parent 3146e0c9bad4549341198054fa66b3e5b4a116c9

On the 1.2.x branch:

Merge r1791 to fix the Windows build (ref: test_sslserver)


git-svn-id: https://svn.apache.org/repos/asf/serf/branches/1.2.x@1699442 13f79535-47bb-0310-9956-ffa450edef68

serf.mak

diff --git a/serf.mak b/serf.mak
index 550140d..cd083a0 100644
--- a/serf.mak
+++ b/serf.mak
@@ -147,6 +147,7 @@
     "$(INTDIR)\test_buckets.obj" \

     "$(INTDIR)\test_ssl.obj" \

     "$(INTDIR)\test_server.obj" \

+    "$(INTDIR)\test_sslserver.obj" \

 

 TEST_LIBS = user32.lib advapi32.lib gdi32.lib ws2_32.lib

 

test/test_context.c

diff --git a/test/test_context.c b/test/test_context.c
index 3340b0c..14d4fa9 100644
--- a/test/test_context.c
+++ b/test/test_context.c
@@ -246,8 +246,8 @@
 static void test_serf_connection_request_create(CuTest *tc)
 {
     test_baton_t *tb;
-    const int num_requests = 2;
-    handler_baton_t handler_ctx[num_requests];
+    handler_baton_t handler_ctx[2];
+    const int num_requests = sizeof(handler_ctx)/sizeof(handler_ctx[0]);
     apr_status_t status;
     int i;
     test_server_message_t message_list[] = {
@@ -296,8 +296,8 @@
 static void test_serf_connection_priority_request_create(CuTest *tc)
 {
     test_baton_t *tb;
-    const int num_requests = 3;
-    handler_baton_t handler_ctx[num_requests];
+    handler_baton_t handler_ctx[3];
+    const int num_requests = sizeof(handler_ctx)/sizeof(handler_ctx[0]);
     apr_status_t status;
     int i;
 
@@ -351,8 +351,8 @@
 {
     test_baton_t *tb;
     apr_status_t status;
-    const int num_requests = 10;
-    handler_baton_t handler_ctx[num_requests];
+    handler_baton_t handler_ctx[10];
+    const int num_requests = sizeof(handler_ctx)/sizeof(handler_ctx[0]);
     int done = FALSE, i;
 
     test_server_message_t message_list[] = {
@@ -452,8 +452,9 @@
 static void test_serf_setup_proxy(CuTest *tc)
 {
     test_baton_t *tb;
-    int i, num_requests = 1;
-    handler_baton_t handler_ctx[num_requests];
+    int i;
+    handler_baton_t handler_ctx[1];
+    const int num_requests = sizeof(handler_ctx)/sizeof(handler_ctx[0]);
     apr_pool_t *iter_pool;
     apr_status_t status;
 
@@ -826,8 +827,8 @@
 {
     test_baton_t *tb;
     apr_status_t status;
-    const int num_requests = 5;
-    handler_baton_t handler_ctx[num_requests];
+    handler_baton_t handler_ctx[5];
+    const int num_requests = sizeof(handler_ctx)/sizeof(handler_ctx[0]);
     int i;
     progress_baton_t *pb;
 
@@ -1018,8 +1019,8 @@
 {
     test_baton_t *tb;
         apr_status_t status;
-    const int num_requests = 1;
-    handler_baton_t handler_ctx[num_requests];
+    handler_baton_t handler_ctx[1];
+    const int num_requests = sizeof(handler_ctx)/sizeof(handler_ctx[0]);
 
     test_server_message_t message_list[] = {
         {REQUEST_PART1},
@@ -1091,8 +1092,8 @@
 static void test_serf_ssl_handshake(CuTest *tc)
 {
     test_baton_t *tb;
-    const int num_requests = 1;
-    handler_baton_t handler_ctx[num_requests];
+    handler_baton_t handler_ctx[1];
+    const int num_requests = sizeof(handler_ctx)/sizeof(handler_ctx[0]);
     apr_status_t status;
     test_server_message_t message_list[] = {
         {CHUNKED_REQUEST(1, "1")},
@@ -1165,8 +1166,8 @@
 static void test_serf_ssl_trust_rootca(CuTest *tc)
 {
     test_baton_t *tb;
-    const int num_requests = 1;
-    handler_baton_t handler_ctx[num_requests];
+    handler_baton_t handler_ctx[1];
+    const int num_requests = sizeof(handler_ctx)/sizeof(handler_ctx[0]);
     apr_status_t status;
     test_server_message_t message_list[] = {
         {CHUNKED_REQUEST(1, "1")},