Request: Remove previousUri_

Historically, the previousUri_ has different meaning from referer_,
but in the course of development, they have the same value.  This
change remove previousUri_ in favor of referer_.

4 files changed, 4 insertions, 17 deletions

diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index efcde2c1..d6f6d16b 100644
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -224,8 +224,8 @@ std::string HttpRequest::createRequest()
     val += base64::encode(authText.begin(), authText.end());
     builtinHds.push_back(std::make_pair("Authorization:", val));
   }
-  if(!getPreviousURI().empty()) {
-    builtinHds.push_back(std::make_pair("Referer:", getPreviousURI()));
+  if(!request_->getReferer().empty()) {
+    builtinHds.push_back(std::make_pair("Referer:", request_->getReferer()));
   }
   if(cookieStorage_) {
     std::string cookiesValue;
@@ -411,11 +411,6 @@ const std::string& HttpRequest::getQuery() const
   return request_->getQuery();
 }
 
-const std::string& HttpRequest::getPreviousURI() const
-{
-  return request_->getPreviousUri();
-}
-
 std::string HttpRequest::getURIHost() const
 {
   return request_->getURIHost();
diff --git a/src/HttpRequest.h b/src/HttpRequest.h
index 38fe9986..3baac4bb 100644
--- a/src/HttpRequest.h
+++ b/src/HttpRequest.h
@@ -131,8 +131,6 @@ public:
 
   const std::string& getQuery() const;
 
-  const std::string& getPreviousURI() const;
-
   std::string getURIHost() const;
 
   Range getRange() const;
diff --git a/src/Request.cc b/src/Request.cc
index ad7b934f..09890c1f 100644
--- a/src/Request.cc
+++ b/src/Request.cc
@@ -84,7 +84,6 @@ bool Request::setUri(const std::string& uri) {
 }
 
 bool Request::resetUri() {
-  previousUri_ = referer_;
   supportsPersistentConnection_ = true;
   setConnectedAddrInfo(A2STR::NIL, A2STR::NIL, 0);
   return parseUri(uri_);
@@ -92,7 +91,7 @@ bool Request::resetUri() {
 
 void Request::setReferer(const std::string& uri)
 {
-  referer_ = previousUri_ = removeFragment(uri);
+  referer_ = removeFragment(uri);
 }
 
 bool Request::redirectUri(const std::string& uri) {
diff --git a/src/Request.h b/src/Request.h
index 24850584..1dc62617 100644
--- a/src/Request.h
+++ b/src/Request.h
@@ -52,11 +52,7 @@ private:
   std::string uri_;
   std::string currentUri_;
   /**
-   * URI previously requested to the server. This is used as Referer
-   */
-  std::string previousUri_;
-  /**
-   * URI used as Referer in the initial request
+   * URI used as Referer header field
    */
   std::string referer_;
   std::string method_;
@@ -97,7 +93,6 @@ public:
   // Returns URI passed by setUri()
   const std::string& getUri() const { return uri_; }
   const std::string& getCurrentUri() const { return currentUri_; }
-  const std::string& getPreviousUri() const { return previousUri_; }
   const std::string& getReferer() const { return referer_; }
   void setReferer(const std::string& uri);
   const std::string& getProtocol() const { return us_.protocol; }