1 files changed, 5 insertions, 0 deletions
diff --git a/methods/server.cc b/methods/server.cc
index c91d3b218..1b6511c59 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -531,6 +531,11 @@ int ServerMethod::Loop()
 
 	    // Run the data
 	    bool Result = true;
+
+            // ensure we don't fetch too much
+            if (Queue->ExpectedSize > 0)
+               Server->ExpectedSize = Queue->ExpectedSize;
+
             if (Server->HaveContent)
 	       Result = Server->RunData(File);