* HttpConnection.cc:

	* common.h: defined the user agent name as macro

4 files changed, 29 insertions, 7 deletions

diff --git a/src/FtpConnection.cc b/src/FtpConnection.cc
index 9e7b9d44..dac5a387 100644
--- a/src/FtpConnection.cc
+++ b/src/FtpConnection.cc
@@ -127,7 +127,7 @@ bool FtpConnection::isEndOfResponse(int status, string response) const {
   if(response.size() <= 4) {
     return false;
   }
-  // if forth character of buf is '-', then multi line response is expected.
+  // if 4th character of buf is '-', then multi line response is expected.
   if(response.at(3) == '-') {
     // multi line response
     string::size_type p;
diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc
index 3c5b3c97..8122141d 100644
--- a/src/HttpConnection.cc
+++ b/src/HttpConnection.cc
@@ -39,7 +39,7 @@ void HttpConnection::sendProxyRequest() const {
   string request =
     string("CONNECT ")+req->getHost()+":"+Util::llitos(req->getPort())+
     string(" HTTP/1.1\r\n")+
-    "User-Agent: aria2\r\n"+
+    "User-Agent: "+USER_AGENT+"\r\n"+
     "Proxy-Connection: close\r\n"+
     "Host: "+getHost(req->getHost(), req->getPort())+"\r\n";
   if(useProxyAuth()) {
@@ -66,7 +66,7 @@ string HttpConnection::createRequest(const Segment& segment) const {
      req->getCurrentUrl() :
      ((req->getDir() == "/" ? "/" : req->getDir()+"/")+req->getFile()))+
     string(" HTTP/1.1\r\n")+
-    "User-Agent: aria2\r\n"+
+    "User-Agent: "+USER_AGENT+"\r\n"+
     "Connection: close\r\n"+
     "Accept: */*\r\n"+        /* */
     "Host: "+getHost(req->getHost(), req->getPort())+"\r\n"+
diff --git a/src/HttpConnection.h b/src/HttpConnection.h
index f4926f0b..33b14caf 100644
--- a/src/HttpConnection.h
+++ b/src/HttpConnection.h
@@ -22,20 +22,17 @@
 #ifndef _D_HTTP_CONNECTION_H_
 #define _D_HTTP_CONNECTION_H_
 
-#include "SegmentMan.h"
+#include "Segment.h"
 #include "Socket.h"
 #include "Request.h"
 #include "Option.h"
 #include "Logger.h"
 #include "HttpHeader.h"
 #include "common.h"
-#include <map>
 #include <string>
 
 using namespace std;
 
-//typedef multimap<string, string> HttpHeader;
-
 class HttpConnection {
 private:
   string getHost(const string& host, int port) const;
@@ -53,8 +50,31 @@ private:
 public:
   HttpConnection(int cuid, const Socket* socket, const Request* req, const Option* op, const Logger* logger);
 
+  /**
+   * Sends Http request.
+   * If segment.sp+segment.ds > 0 then Range header is added.
+   * This method is used in HTTP/HTTP downloading and FTP downloading via
+   * HTTP proxy(GET method).
+   * @param segment indicates starting postion of the file for downloading
+   */
   void sendRequest(const Segment& segment) const;
+
+  /**
+   * Sends Http proxy request using CONNECT method.
+   */
   void sendProxyRequest() const;
+
+  /**
+   * Receives HTTP response from the server and store the response header
+   * into the variable headers.
+   * If response header is not fully received, received header is buffured
+   * in this object and headers is undefined and this method returns 0. 
+   * You should continue to call this method until whole response header is
+   * received and this method returns non-zero value.
+   * 
+   * @param headers holder to store HTTP response header
+   * @return HTTP status or 0 if whole response header is not received
+   */
   int receiveResponse(HttpHeader& headers);
 };
 
diff --git a/src/common.h b/src/common.h
index 4e965073..1ac60d63 100644
--- a/src/common.h
+++ b/src/common.h
@@ -31,4 +31,6 @@
 # define LONG_LONG_MIN      (-LONG_LONG_MAX - 1LL)
 #endif // LONG_LONG_MAX
 
+#define USER_AGENT "aria2"
+
 using namespace std;