diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-09-30 17:30:35 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-09-30 17:30:35 +0900 |
| commit | e34d0e7ffa602d611ec6ec14cf9aa381da41c24e (patch) | |
| tree | 592bb08917923313eba265001383f780ef0f930c /src/HttpRequest.cc | |
| parent | 492d6d1eeb7df7c848c07487dbdef0306a462332 (diff) | |
Dont' return SharedHandle from HttpHeader::getRange()
Diffstat (limited to 'src/HttpRequest.cc')
| -rw-r--r-- | src/HttpRequest.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index fcf8ef0c..6cb6c454 100644 --- a/src/HttpRequest.cc +++ b/src/HttpRequest.cc @@ -101,31 +101,30 @@ int64_t HttpRequest::getEndByte() const } } -SharedHandle<Range> HttpRequest::getRange() const +Range HttpRequest::getRange() const { // content-length is always 0 if(!segment_) { - return SharedHandle<Range>(new Range()); + return Range(); } else { - return SharedHandle<Range>(new Range(getStartByte(), getEndByte(), - fileEntry_->getLength())); + return Range(getStartByte(), getEndByte(), fileEntry_->getLength()); } } -bool HttpRequest::isRangeSatisfied(const SharedHandle<Range>& range) const +bool HttpRequest::isRangeSatisfied(const Range& range) const { if(!segment_) { return true; } - if((getStartByte() == range->getStartByte()) && + if((getStartByte() == range.startByte) && ((getEndByte() == 0) || - (getEndByte() == range->getEndByte())) && + (getEndByte() == range.endByte)) && ((fileEntry_->getLength() == 0) || - (fileEntry_->getLength() == range->getEntityLength()))) { + (fileEntry_->getLength() == range.entityLength))) { return true; } else { return false; - } + } } namespace { |