FileServer

Summary: Based on new FileRegion interface

Test Plan: ran it, streamed lots of files. I have found an obscure way to break it but I don't think it's a FileRegion issue, rather a pipeline/bootstrap issue. Still digging

Reviewed By: hans@fb.com

Subscribers: fugalh, folly-diffs@, jsedgwick, yfeldblum, chalfant

FB internal diff: D2088094

Signature: t1:2088094:1432758904:0f1e5765dbedea5ddbe047db50e7b632cfb0c053

diff --git a/folly/wangle/channel/Pipeline.h b/folly/wangle/channel/Pipeline.h
index 81b68023903c876dc6e287810711727c40c23fef..47c719ca763b1d8ee05c79c7ab0e273871c29ed5 100644 (file)
--- a/folly/wangle/channel/Pipeline.h
+++ b/folly/wangle/channel/Pipeline.h
@@ -31,7 +31,7 @@ class PipelineManager {
   virtual void deletePipeline(PipelineBase* pipeline) = 0;
 };
 
-class PipelineBase {
+class PipelineBase : public DelayedDestruction {
  public:
   virtual ~PipelineBase() {}
 
@@ -69,7 +69,7 @@ struct Nothing{};
  * If W is Nothing, write() and close() will be disabled.
  */
 template <class R, class W = Nothing>
-class Pipeline : public PipelineBase, public DelayedDestruction {
+class Pipeline : public PipelineBase {
  public:
   Pipeline();
   ~Pipeline();