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

9 files changed, 10 insertions, 10 deletions

diff --git a/src/AbstractHttpServerResponseCommand.cc b/src/AbstractHttpServerResponseCommand.cc
index 80923ae9..928d5058 100644
--- a/src/AbstractHttpServerResponseCommand.cc
+++ b/src/AbstractHttpServerResponseCommand.cc
@@ -122,7 +122,7 @@ bool AbstractHttpServerResponseCommand::execute()
   else {
     if (timeoutTimer_.difference(global::wallclock()) >= 30_s) {
       A2_LOG_INFO(fmt("CUID#%" PRId64
-                      " - HttpServer: Timeout while trasmitting response.",
+                      " - HttpServer: Timeout while transmitting response.",
                       getCuid()));
       return true;
     }
diff --git a/src/HttpResponse.h b/src/HttpResponse.h
index 2caffaf1..c15dbaa3 100644
--- a/src/HttpResponse.h
+++ b/src/HttpResponse.h
@@ -66,7 +66,7 @@ public:
 
   /**
    * Returns filename.
-   * If content-disposition header is privided in response header,
+   * If content-disposition header is provided in response header,
    * this function returns the filename from it.
    * If it is not there, returns the part of filename from the request URL.
    */
diff --git a/src/LogFactory.h b/src/LogFactory.h
index fc2f8f60..29131ba2 100644
--- a/src/LogFactory.h
+++ b/src/LogFactory.h
@@ -84,7 +84,7 @@ public:
   static void setLogLevel(Logger::LEVEL level);
 
   /**
-   * Set log level to output to file by string represention of log
+   * Set log level to output to file by string representation of log
    * level.  Possible values are: debug, info, notice, warn, error
    */
   static void setLogLevel(const std::string& level);
@@ -95,7 +95,7 @@ public:
   static void setConsoleLogLevel(Logger::LEVEL level);
 
   /**
-   * Set log level to output to console by string represention of log
+   * Set log level to output to console by string representation of log
    * level.  Possible values are: debug, info, notice, warn, error
    */
   static void setConsoleLogLevel(const std::string& level);
diff --git a/src/NameResolver.h b/src/NameResolver.h
index a389cc3f..e5c201ab 100644
--- a/src/NameResolver.h
+++ b/src/NameResolver.h
@@ -50,7 +50,7 @@ public:
   NameResolver();
 
   /**
-   * Reolved addresses are pushed into addresses.
+   * Resolved addresses are pushed into addresses.
    */
   void resolve(std::vector<std::string>& resolvedAddresses,
                const std::string& hostname);
diff --git a/src/PortEventPoll.cc b/src/PortEventPoll.cc
index ecd7fbfa..0d3fbae1 100644
--- a/src/PortEventPoll.cc
+++ b/src/PortEventPoll.cc
@@ -103,7 +103,7 @@ void PortEventPoll::poll(const struct timeval& tv)
   int res;
   uint_t nget = 1;
   // If port_getn was interrupted by signal, it can consume events but
-  // not updat nget!. For this very annoying bug, we have to check
+  // not update nget!. For this very annoying bug, we have to check
   // actually event is filled or not.
   portEvents_[0].portev_user = (void*)-1;
   res = port_getn(port_, portEvents_, portEventsSize_, &nget, &timeout);
diff --git a/src/ServerStat.h b/src/ServerStat.h
index 3c73a04d..dede65f9 100644
--- a/src/ServerStat.h
+++ b/src/ServerStat.h
@@ -91,7 +91,7 @@ public:
   // This method doesn't update _lastUpdate.
   void setStatus(STATUS status);
 
-  // status should be one of the followings: "OK", "ERROR".
+  // status should be one of the following: "OK", "ERROR".
   // Giving other string will not change the status of this object.
   // This method doesn't update _lastUpdate.
   void setStatus(const std::string& status);
diff --git a/src/WinTLSSession.cc b/src/WinTLSSession.cc
index 123780e7..7e6dd764 100644
--- a/src/WinTLSSession.cc
+++ b/src/WinTLSSession.cc
@@ -440,7 +440,7 @@ ssize_t WinTLSSession::readData(void* data, size_t len)
 
   // Can be filled from decBuffer entirely?
   if (decBuf_.size() >= len) {
-    A2_LOG_DEBUG("WinTLS: Fullfilling req from buffer");
+    A2_LOG_DEBUG("WinTLS: Fulfilling req from buffer");
     memcpy(data, decBuf_.data(), len);
     decBuf_.eat(len);
     return len;
diff --git a/src/getaddrinfo.c b/src/getaddrinfo.c
index 7c80dcf2..5925af27 100644
--- a/src/getaddrinfo.c
+++ b/src/getaddrinfo.c
@@ -293,7 +293,7 @@ static int is_address(s) const char* s;
 }
 
 /*
- * Calcurate length of the string `s', where `s' is set by
+ * Calculate length of the string `s', where `s' is set by
  * sprintf(s, "%d", n).
  */
 static int itoa_length(n)
diff --git a/src/usage_text.h b/src/usage_text.h
index 48684565..08715436 100644
--- a/src/usage_text.h
+++ b/src/usage_text.h
@@ -98,7 +98,7 @@
 #define TEXT_PROXY_METHOD                                               \
   _(" --proxy-method=METHOD        Set the method to use in proxy request.")
 #define TEXT_REFERER                                                    \
-  _(" --referer=REFERER            Set an http referrrer (Referer). This affects\n" \
+  _(" --referer=REFERER            Set an http referrer (Referer). This affects\n" \
     "                              all http/https downloads. If \"*\" is given,\n" \
     "                              the download URI is also used as the referrer.\n" \
     "                              This may be useful when used together with\n" \