diff --git a/rtc_base/httpcommon.cc b/rtc_base/httpcommon.cc index 86bfe97461..3d6476c819 100644 --- a/rtc_base/httpcommon.cc +++ b/rtc_base/httpcommon.cc @@ -511,28 +511,6 @@ bool HttpData::hasHeader(const std::string& name, std::string* value) const { return true; } -void HttpData::setContent(const std::string& content_type, - StreamInterface* document) { - setHeader(HH_CONTENT_TYPE, content_type); - setDocumentAndLength(document); -} - -void HttpData::setDocumentAndLength(StreamInterface* document) { - // TODO: Consider calling Rewind() here? - RTC_DCHECK(!hasHeader(HH_CONTENT_LENGTH, nullptr)); - RTC_DCHECK(!hasHeader(HH_TRANSFER_ENCODING, nullptr)); - RTC_DCHECK(document != nullptr); - this->document.reset(document); - size_t content_length = 0; - if (this->document->GetAvailable(&content_length)) { - char buffer[32]; - sprintfn(buffer, sizeof(buffer), "%d", content_length); - setHeader(HH_CONTENT_LENGTH, buffer); - } else { - setHeader(HH_TRANSFER_ENCODING, "chunked"); - } -} - // // HttpRequestData // diff --git a/rtc_base/httpcommon.h b/rtc_base/httpcommon.h index 11c01caf10..5014ac65a6 100644 --- a/rtc_base/httpcommon.h +++ b/rtc_base/httpcommon.h @@ -318,9 +318,6 @@ struct HttpData { return headers_.upper_bound(ToString(header)); } - void setContent(const std::string& content_type, StreamInterface* document); - void setDocumentAndLength(StreamInterface* document); - virtual size_t formatLeader(char* buffer, size_t size) const = 0; virtual HttpError parseLeader(const char* line, size_t len) = 0; diff --git a/rtc_base/logging_unittest.cc b/rtc_base/logging_unittest.cc index bb6b657b4f..a475e52d46 100644 --- a/rtc_base/logging_unittest.cc +++ b/rtc_base/logging_unittest.cc @@ -39,7 +39,6 @@ class StringStream : public StreamInterface { bool SetPosition(size_t position) override; bool GetPosition(size_t* position) const override; bool GetSize(size_t* size) const override; - bool GetAvailable(size_t* size) const override; bool ReserveSize(size_t size) override; private: @@ -110,12 +109,6 @@ bool StringStream::GetSize(size_t* size) const { return true; } -bool StringStream::GetAvailable(size_t* size) const { - if (size) - *size = str_.size() - read_pos_; - return true; -} - bool StringStream::ReserveSize(size_t size) { if (read_only_) return false; diff --git a/rtc_base/stream.cc b/rtc_base/stream.cc index 3f4d3dc93b..d1ec1400de 100644 --- a/rtc_base/stream.cc +++ b/rtc_base/stream.cc @@ -124,10 +124,6 @@ bool StreamInterface::GetSize(size_t* size) const { return false; } -bool StreamInterface::GetAvailable(size_t* size) const { - return false; -} - bool StreamInterface::GetWriteRemaining(size_t* size) const { return false; } @@ -192,10 +188,6 @@ bool StreamAdapterInterface::GetSize(size_t* size) const { return stream_->GetSize(size); } -bool StreamAdapterInterface::GetAvailable(size_t* size) const { - return stream_->GetAvailable(size); -} - bool StreamAdapterInterface::GetWriteRemaining(size_t* size) const { return stream_->GetWriteRemaining(size); } @@ -379,18 +371,6 @@ bool FileStream::GetSize(size_t* size) const { return true; } -bool FileStream::GetAvailable(size_t* size) const { - RTC_DCHECK(nullptr != size); - if (!GetSize(size)) - return false; - long result = ftell(file_); - if (result < 0) - return false; - if (size) - *size -= result; - return true; -} - bool FileStream::ReserveSize(size_t size) { // TODO: extend the file to the proper length return true; @@ -496,12 +476,6 @@ bool MemoryStreamBase::GetSize(size_t* size) const { return true; } -bool MemoryStreamBase::GetAvailable(size_t* size) const { - if (size) - *size = data_length_ - seek_position_; - return true; -} - bool MemoryStreamBase::ReserveSize(size_t size) { return (SR_SUCCESS == DoReserve(size, nullptr)); } diff --git a/rtc_base/stream.h b/rtc_base/stream.h index ac8193b3d5..81c5e41801 100644 --- a/rtc_base/stream.h +++ b/rtc_base/stream.h @@ -118,12 +118,8 @@ class StreamInterface : public MessageHandler { // be used. // // Even though several of these operations are related, you should - // always use whichever operation is most relevant. For example, you may - // be tempted to use GetSize() and GetPosition() to deduce the result of - // GetAvailable(). However, a stream which is read-once may support the - // latter operation but not the former. + // always use whichever operation is most relevant. // - // The following four methods are used to avoid copying data multiple times. // GetReadData returns a pointer to a buffer which is owned by the stream. @@ -178,10 +174,6 @@ class StreamInterface : public MessageHandler { // is not known. virtual bool GetSize(size_t* size) const; - // Return the number of Read()-able bytes remaining before end-of-stream. - // Returns false if not known. - virtual bool GetAvailable(size_t* size) const; - // Return the number of Write()-able bytes remaining before end-of-stream. // Returns false if not known. virtual bool GetWriteRemaining(size_t* size) const; @@ -293,7 +285,6 @@ class StreamAdapterInterface : public StreamInterface, bool SetPosition(size_t position) override; bool GetPosition(size_t* position) const override; bool GetSize(size_t* size) const override; - bool GetAvailable(size_t* size) const override; bool GetWriteRemaining(size_t* size) const override; bool ReserveSize(size_t size) override; bool Flush() override; @@ -349,7 +340,6 @@ class FileStream : public StreamInterface { bool SetPosition(size_t position) override; bool GetPosition(size_t* position) const override; bool GetSize(size_t* size) const override; - bool GetAvailable(size_t* size) const override; bool ReserveSize(size_t size) override; bool Flush() override; @@ -385,7 +375,6 @@ class MemoryStreamBase : public StreamInterface { bool SetPosition(size_t position) override; bool GetPosition(size_t* position) const override; bool GetSize(size_t* size) const override; - bool GetAvailable(size_t* size) const override; bool ReserveSize(size_t size) override; char* GetBuffer() { return buffer_; } diff --git a/rtc_base/stream_unittest.cc b/rtc_base/stream_unittest.cc index 11e0be0422..616783cb4d 100644 --- a/rtc_base/stream_unittest.cc +++ b/rtc_base/stream_unittest.cc @@ -60,8 +60,6 @@ class TestStream : public StreamInterface { bool GetSize(size_t* size) const override { return false; } - bool GetAvailable(size_t* size) const override { return false; } - private: size_t pos_; };