diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-09-25 22:41:03 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-09-25 22:41:03 +0900 |
| commit | be77d1394e94bf42c644586d2e7dfcaec778504b (patch) | |
| tree | 781189ab0c6352dc9b1607a3502bcc7f2771ea12 /src/HttpRequest.cc | |
| parent | c186e93488d3a4c4f41584bbd3ba47dafb391e9d (diff) | |
Removed Request::PROTO_*
Diffstat (limited to 'src/HttpRequest.cc')
| -rw-r--r-- | src/HttpRequest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index 837f91de..d25e0f11 100644 --- a/src/HttpRequest.cc +++ b/src/HttpRequest.cc @@ -145,7 +145,7 @@ std::string HttpRequest::createRequest() std::string requestLine = request_->getMethod(); requestLine += " "; if(proxyRequest_) { - if(getProtocol() == Request::PROTO_FTP && + if(getProtocol() == "ftp" && request_->getUsername().empty() && authConfig_) { // Insert user into URI, like ftp://USER@host/ std::string uri = getCurrentURI(); @@ -201,7 +201,7 @@ std::string HttpRequest::createRequest() std::string rangeHeader(fmt("bytes=%" PRId64 "-", getStartByte())); if(request_->isPipeliningEnabled()) { rangeHeader += util::itos(getEndByte()); - } else if(getProtocol() != Request::PROTO_FTP && endOffsetOverride_ > 0) { + } else if(getProtocol() != "ftp" && endOffsetOverride_ > 0) { // FTP via http proxy does not support endbytes rangeHeader += util::itos(endOffsetOverride_-1); } @@ -231,7 +231,7 @@ std::string HttpRequest::createRequest() std::vector<Cookie> cookies = cookieStorage_->criteriaFind(getHost(), path, Time().getTime(), - getProtocol() == Request::PROTO_HTTPS); + getProtocol() == "https"); for(std::vector<Cookie>::const_iterator itr = cookies.begin(), eoi = cookies.end(); itr != eoi; ++itr) { cookiesValue += (*itr).toString(); |