Browse Source

Fixed build errors and adjusted a test case.

yhirose 8 years ago
parent
commit
7cdf62dd31
4 changed files with 21 additions and 4 deletions
  1. 1 1
      example/Makefile
  2. 1 1
      example/server.cc
  3. 11 1
      test/test.cc
  4. 8 1
      test/www/dir/index.html

+ 1 - 1
example/Makefile

@@ -1,7 +1,7 @@
 
 CC = clang++
 CFLAGS = -std=c++14 -I..
-#OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib -lssl -lcrypto
+OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib -lssl -lcrypto
 
 all: server client hello simplesvr
 

+ 1 - 1
example/server.cc

@@ -34,7 +34,7 @@ std::string log(const Request& req, const Response& res)
 
     s += "================================\n";
 
-    snprintf(buf, sizeof(buf), "%s %s", req.method.c_str(), req.url.c_str());
+    snprintf(buf, sizeof(buf), "%s %s", req.method.c_str(), req.path.c_str());
     s += buf;
 
     std::string query;

+ 11 - 1
test/test.cc

@@ -267,7 +267,17 @@ TEST_F(ServerTest, GetMethodDir)
 	ASSERT_TRUE(res != nullptr);
 	EXPECT_EQ(200, res->status);
 	EXPECT_EQ("text/html", res->get_header_value("Content-Type"));
-	EXPECT_EQ("index.html", res->body);
+
+    auto body = R"(<html>
+<head>
+</head>
+<body>
+  <a href="/dir/test.html">Test</a>
+  <a href="/hi">hi</a>
+</body>
+</html>
+)";
+	EXPECT_EQ(body, res->body);
 }
 
 TEST_F(ServerTest, GetMethodDirTest)

+ 8 - 1
test/www/dir/index.html

@@ -1 +1,8 @@
-index.html
+<html>
+<head>
+</head>
+<body>
+  <a href="/dir/test.html">Test</a>
+  <a href="/hi">hi</a>
+</body>
+</html>