From 057994f4aa7d60428c4c097798b0fa12863c1d76 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Thu, 24 Sep 2015 22:31:05 +0300
Subject: Uniform behavour for tar and zip

---
 lib/private/streamer.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/private')

diff --git a/lib/private/streamer.php b/lib/private/streamer.php
index 2502807330b..48a926f42f8 100644
--- a/lib/private/streamer.php
+++ b/lib/private/streamer.php
@@ -48,7 +48,12 @@ class Streamer {
 	 */
 	public function sendHeaders($name){
 		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
-		$this->streamerInstance->sendHeaders($name . $extension);
+		$fullName = $name . $extension;
+		// ZipStreamer does not escape name in Content-Disposition atm
+		if ($this->streamerInstance instanceof ZipStreamer) {
+			$fullName = rawurlencode($fullName);
+		}
+		$this->streamerInstance->sendHeaders($fullName);
 	}
 	
 	/**
-- 
cgit v1.2.3