提交: e2c88ccc8992a50fef131dfc5fb62f95e7978e51 - pukiwiki-fork (git)

Commit MetaInfo

• 修订版: e2c88ccc8992a50fef131dfc5fb62f95e7978e51 (tree)
• 时间: 2017-08-23 06:02:56
• 作者: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2102 Disable output buffering on sending an file

更改概述

• modified: plugin/attach.inc.php
• modified: plugin/dump.inc.php
• modified: plugin/ref.inc.php

差异

--- a/plugin/attach.inc.php
+++ b/plugin/attach.inc.php
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone
 // attach.inc.php
 // Copyright
-//   2003-2016 PukiWiki Development Team
+//   2003-2017 PukiWiki Development Team
 //   2002-2003 PANDA <[e-mail]> http://home.arino.jp/
 //   2002      Y.MASUI <[e-mail]> http://masui.net/pukiwiki/
 //   2001-2002 Originally written by yu-ji
@@ -746,7 +746,11 @@ EOD;
 			. '"; filename*=utf-8\'\'' . rawurlencode($utf8filename));
 		header('Content-Length: ' . $this->size);
 		header('Content-Type: '   . $this->type);
-
+		// Disable output bufferring
+		while (ob_get_level()) {
+			ob_end_flush();
+		}
+		flush();
 		@readfile($this->filename);
 		exit;
 	}

--- a/plugin/dump.inc.php
+++ b/plugin/dump.inc.php
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone
 // dump.inc.php
 // Copyright
-//   2004-2016 PukiWiki Development Team
+//   2004-2017 PukiWiki Development Team
 //   2004      teanan / Interfair Laboratory
 // License: GPL v2 or (at your option) any later version
 //
@@ -204,6 +204,11 @@ function download_tarfile($tempnam, $arc_kind)
 	header('Content-Length: ' . $size);
 	header('Content-Type: application/octet-stream');
 	header('Pragma: no-cache');
+	// Disable output bufferring
+	while (ob_get_level()) {
+		ob_end_flush();
+	}
+	flush();
 	@readfile($tempnam);
 }
 

--- a/plugin/ref.inc.php
+++ b/plugin/ref.inc.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: ref.inc.php,v 1.51 2011/01/25 15:01:01 henoheno Exp $
-// Copyright (C)
-//   2002-2006 PukiWiki Developers Team
+// ref.inc.php
+// Copyright
+//   2002-2017 PukiWiki Development Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -430,6 +430,11 @@ function plugin_ref_action()
 		.'"; filename*=utf-8\'\'' . rawurlencode($utf8filename));
 	header('Content-Length: ' . $size);
 	header('Content-Type: '   . $type);
+	// Disable output bufferring
+	while (ob_get_level()) {
+		ob_end_flush();
+	}
+	flush();
 	@readfile($ref);
 	exit;
 }