Added mg_connect(), mg_fetch() API functions. More tests added

test/test.pl

@@ -85,7 +85,8 @@ sub o {
   if ($reply =~ /$expected_reply/s) {
     print "OK\n";
   } else {
-    fail("Requested: [$request]\nExpected: [$expected_reply], got: [$reply]");
+#fail("Requested: [$request]\nExpected: [$expected_reply], got: [$reply]");
+    fail("Expected: [$expected_reply], got: [$reply]");
   }
 }
 
@@ -177,6 +178,11 @@ my $cmd = "$exe ".
 $cmd .= ' -cgi_interpreter perl' if on_windows();
 spawn($cmd);
 
+  my $x = 'x=' . 'A' x (200 * 1024);
+  my $len = length($x);
+  o("POST /env.cgi HTTP/1.0\r\nContent-Length: $len\r\n\r\n$x",
+    '^HTTP/1.1 200 OK', 'Long POST');
+
 # Try to overflow: Send very long request
 req('POST ' . '/..' x 100 . 'ABCD' x 3000 . "\n\n", 0); # don't log this one
 
@@ -339,10 +345,6 @@ unless (scalar(@ARGV) > 0 and $ARGV[0] eq "basic_tests") {
   o("GET /hello.txt HTTP/1.0\nAuthorization: $auth_header\n\n", 'HTTP/1.1 200 OK', 'GET regular file with auth');
   unlink "$root/.htpasswd";
 
-  my $x = 'x=' . 'A' x (200 * 1024);
-  my $len = length($x);
-  o("POST /env.cgi HTTP/1.0\r\nContent-Length: $len\r\n\r\n$x",
-    '^HTTP/1.1 200 OK', 'Long POST');
 
   o("GET /env.cgi HTTP/1.0\n\r\n", 'HTTP/1.1 200 OK', 'GET CGI file');
   o("GET /bad2.cgi HTTP/1.0\n\n", "HTTP/1.1 123 Please pass me to the client\r",
@@ -443,7 +445,7 @@ sub do_PUT_test {
 }
 
 sub do_unit_test {
-  my $cmd = "cc -W -Wall -o $unit_test_exe $root/unit_test.c -I. ".
+  my $cmd = "cc -g -W -Wall -o $unit_test_exe $root/unit_test.c -I. ".
     "-pthread -DNO_SSL ";
   if (on_windows()) {
     $cmd = "cl $root/embed.c mongoose.c /I. /nologo /DNO_SSL ".

test/unit_test.c

@@ -13,25 +13,21 @@ static void test_parse_http_request() {
   char req3[] = "GET / HTTP/1.1\r\nBah\r\n";
   char req4[] = "GET / HTTP/1.1\r\nA: foo bar\r\nB: bar\r\nbaz\r\n\r\n";
 
-  ASSERT(parse_http_request(req1, &ri) == 1);
+  ASSERT(parse_http_request(req1, sizeof(req1), &ri) == sizeof(req1) - 1);
   ASSERT(strcmp(ri.http_version, "1.1") == 0);
   ASSERT(ri.num_headers == 0);
 
-  ASSERT(parse_http_request(req2, &ri) == 0);
-
-  // TODO(lsm): Fix this. Bah is not a valid header.
-  ASSERT(parse_http_request(req3, &ri) == 1);
-  ASSERT(ri.num_headers == 1);
-  ASSERT(strcmp(ri.http_headers[0].name, "Bah\r\n") == 0);
+  ASSERT(parse_http_request(req2, sizeof(req2), &ri) == -1);
+  ASSERT(parse_http_request(req3, sizeof(req3), &ri) == -1);
 
   // TODO(lsm): Fix this. Header value may span multiple lines.
-  ASSERT(parse_http_request(req4, &ri) == 1);
+  ASSERT(parse_http_request(req4, sizeof(req4), &ri) == sizeof(req4) - 1);
   ASSERT(ri.num_headers == 3);
   ASSERT(strcmp(ri.http_headers[0].name, "A") == 0);
   ASSERT(strcmp(ri.http_headers[0].value, "foo bar") == 0);
   ASSERT(strcmp(ri.http_headers[1].name, "B") == 0);
   ASSERT(strcmp(ri.http_headers[1].value, "bar") == 0);
-  ASSERT(strcmp(ri.http_headers[2].name, "baz\r\n\r\n") == 0);
+  ASSERT(strcmp(ri.http_headers[2].name, "baz\r\n\r") == 0);
   ASSERT(strcmp(ri.http_headers[2].value, "") == 0);
 
   // TODO(lsm): add more tests. 
@@ -47,7 +43,7 @@ static void test_should_keep_alive(void) {
 
   memset(&conn, 0, sizeof(conn));
   conn.ctx = &ctx;
-  parse_http_request(req1, &conn.request_info);
+  parse_http_request(req1, sizeof(req1), &conn.request_info);
 
   ctx.config[ENABLE_KEEP_ALIVE] = "no";
   ASSERT(should_keep_alive(&conn) == 0);
@@ -59,13 +55,13 @@ static void test_should_keep_alive(void) {
   ASSERT(should_keep_alive(&conn) == 0);
 
   conn.must_close = 0;
-  parse_http_request(req2, &conn.request_info);
+  parse_http_request(req2, sizeof(req2), &conn.request_info);
   ASSERT(should_keep_alive(&conn) == 0);
 
-  parse_http_request(req3, &conn.request_info);
+  parse_http_request(req3, sizeof(req3), &conn.request_info);
   ASSERT(should_keep_alive(&conn) == 0);
 
-  parse_http_request(req4, &conn.request_info);
+  parse_http_request(req4, sizeof(req4), &conn.request_info);
   ASSERT(should_keep_alive(&conn) == 1);
 
   conn.request_info.status_code = 401;
@@ -131,10 +127,63 @@ static void test_remove_double_dots() {
   }
 }
 
+static const char *fetch_data = "hello world!\n";
+static void *event_handler(enum mg_event event,
+                           struct mg_connection *conn,
+                           const struct mg_request_info *request_info) {
+  if (event == MG_NEW_REQUEST && !strcmp(request_info->uri, "/data")) {
+    mg_printf(conn, "HTTP/1.1 200 OK\r\n"
+              "Content-Length: %d\r\n\r\n"
+              "%s", (int) strlen(fetch_data), fetch_data);
+    return "";
+  } else if (event == MG_EVENT_LOG) {
+    printf("%s\n", request_info->log_message);
+  }
+  
+  return NULL;
+}
+
+static void test_mg_fetch(void) {
+  static const char *options[] = {
+    "document_root", ".",
+    "listening_ports", "33796",
+    NULL,
+  };
+  char buf[1000];
+  int length;
+  struct mg_context *ctx;
+  struct mg_request_info ri;
+  const char *tmp_file = "temporary_file_name_for_unit_test.txt";
+  FILE *fp;
+
+  ASSERT((ctx = mg_start(event_handler, NULL, options)) != NULL);
+
+  // Failed fetch, pass invalid URL
+  ASSERT(mg_fetch(ctx, "localhost", tmp_file, &ri) == NULL);
+  ASSERT(mg_fetch(ctx, "localhost:33796", tmp_file, &ri) == NULL);
+  ASSERT(mg_fetch(ctx, "http://$$$.$$$", tmp_file, &ri) == NULL);
+
+  // Failed fetch, pass invalid file name
+  ASSERT(mg_fetch(ctx, "http://localhost:33796/data",
+                  "/this/file/must/not/exist/ever", &ri) == NULL);
+
+  // Successful fetch
+  ASSERT((fp = mg_fetch(ctx, "http://localhost:33796/data",
+                        tmp_file, &ri)) != NULL);
+  ASSERT((length = ftell(fp)) == (int) strlen(fetch_data));
+  fseek(fp, 0, SEEK_SET);
+  ASSERT(fread(buf, 1, length, fp) == length);
+  ASSERT(memcmp(buf, fetch_data, length) == 0);
+
+  remove(tmp_file);
+  mg_stop(ctx);
+}
+
 int main(void) {
   test_match_prefix();
   test_remove_double_dots();
   test_should_keep_alive();
   test_parse_http_request();
+  test_mg_fetch();
   return 0;
 }