Merge remote-tracking branch 'upstream/master' into utp-supportHEADutp-support

6 files changed, 9 insertions, 9 deletions

diff --git a/test/AllTest.cc b/test/AllTest.cc
index f869e55c..357cebc5 100644
--- a/test/AllTest.cc
+++ b/test/AllTest.cc
@@ -26,7 +26,7 @@ int main(int argc, char* argv[])
 
   // By default, SocketCore uses AF_UNSPEC for getaddrinfo hints to
   // resolve address. Sometime SocketCore::bind() and
-  // SocketCore::establishConnection() use difference protocl family
+  // SocketCore::establishConnection() use difference protocol family
   // and latter cannot connect to former. To avoid this situation, we
   // limit protocol family to AF_INET for unit tests.
   aria2::SocketCore::setProtocolFamily(AF_INET);
diff --git a/test/FileTest.cc b/test/FileTest.cc
index ca78217e..e73daa56 100644
--- a/test/FileTest.cc
+++ b/test/FileTest.cc
@@ -129,7 +129,7 @@ void FileTest::testMkdir()
     CPPUNIT_ASSERT(d.mkdirs());
 
     CPPUNIT_ASSERT(d.exists());
-    // this test failes because d.mkdir returns false when the directory is
+    // this test fails because d.mkdir returns false when the directory is
     // already exists.
     CPPUNIT_ASSERT(!d.mkdirs());
   }
@@ -147,7 +147,7 @@ void FileTest::testMkdir()
     CPPUNIT_ASSERT(d.mkdirs());
 
     CPPUNIT_ASSERT(nd.exists());
-    // this test failes because d.mkdir returns false when the directory is
+    // this test fails because d.mkdir returns false when the directory is
     // already exists.
     CPPUNIT_ASSERT(!d.mkdirs());
   }
diff --git a/test/RequestTest.cc b/test/RequestTest.cc
index 24abf91f..1422847e 100644
--- a/test/RequestTest.cc
+++ b/test/RequestTest.cc
@@ -74,7 +74,7 @@ void RequestTest::testSetUri2()
 
   CPPUNIT_ASSERT(v);
 
-  // referer is unchaged
+  // referer is unchanged
   CPPUNIT_ASSERT_EQUAL(std::string("http://aria.rednoah.com:8080"),
                        req.getReferer());
   CPPUNIT_ASSERT_EQUAL(std::string("http"), req.getProtocol());
@@ -124,7 +124,7 @@ void RequestTest::testRedirectUri()
   // See redirect count is incremented.
   CPPUNIT_ASSERT_EQUAL(2, req.getRedirectCount());
 
-  // Give abosulute path
+  // Give absolute path
   CPPUNIT_ASSERT(req.redirectUri("/abspath/to/file"));
   CPPUNIT_ASSERT_EQUAL(std::string("http://aria.rednoah.co.jp/abspath/to/file"),
                        req.getCurrentUri());
diff --git a/test/RpcMethodTest.cc b/test/RpcMethodTest.cc
index 44bae5fe..3fbd726a 100644
--- a/test/RpcMethodTest.cc
+++ b/test/RpcMethodTest.cc
@@ -875,7 +875,7 @@ void RpcMethodTest::testTellWaiting()
   CPPUNIT_ASSERT_EQUAL(0, res.code);
   resParams = downcast<List>(res.param);
   CPPUNIT_ASSERT_EQUAL((size_t)4, resParams->size());
-  // nagative offset and normalized offset < 0
+  // negative offset and normalized offset < 0
   req = RpcRequest(TellWaitingRpcMethod::getMethodName(), List::g());
   req.params->append(Integer::g(-5));
   req.params->append(Integer::g(100));
@@ -883,7 +883,7 @@ void RpcMethodTest::testTellWaiting()
   CPPUNIT_ASSERT_EQUAL(0, res.code);
   resParams = downcast<List>(res.param);
   CPPUNIT_ASSERT_EQUAL((size_t)0, resParams->size());
-  // nagative offset and normalized offset == 0
+  // negative offset and normalized offset == 0
   req = RpcRequest(TellWaitingRpcMethod::getMethodName(), List::g());
   req.params->append(Integer::g(-4));
   req.params->append(Integer::g(100));
diff --git a/test/SocketCoreTest.cc b/test/SocketCoreTest.cc
index 443ca73c..666056e0 100644
--- a/test/SocketCoreTest.cc
+++ b/test/SocketCoreTest.cc
@@ -227,7 +227,7 @@ void SocketCoreTest::testVerifyHostname()
     CPPUNIT_ASSERT(net::verifyHostname("::1", dnsNames, ipAddrs, commonName));
   }
   {
-    // If iPAddress is privided, don't match with commonName
+    // If iPAddress is provided, don't match with commonName
     std::vector<std::string> dnsNames, ipAddrs;
     unsigned char binAddr[16];
     size_t len;
diff --git a/test/UriSplitTest.cc b/test/UriSplitTest.cc
index 091b8d0b..53d5804b 100644
--- a/test/UriSplitTest.cc
+++ b/test/UriSplitTest.cc
@@ -82,7 +82,7 @@ void UriSplitTest::testUriSplit()
 
   // According to RFC 3986, @ in userinfo is illegal. But many people
   // have e-mail account as username and don't understand
-  // percent-encoding and keep getting erros putting it in URI in
+  // percent-encoding and keep getting errors putting it in URI in
   // unecoded form. Because of this, we support @ in username.
   uri = "http://user@foo.com:pass@aria2.sf.net/path/";
   memset(&res, 0, sizeof(res));