[Svn-src-all:3594] [version-2_12_3 22506] #1934 r22282 にて対応頂いた内容をリリースbranchにマージ

[h_yoshimoto]

Subversion committed to /home/svn/open 22506
http://svn.ec-cube.net/open_trac/changeset/22506
┌────────────────────────────┐
│更新者　:  h_yoshimoto                                  │
│更新日時:  2013-02-06 16:30:41 +0900 (水, 06  2月 2013)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#1934 r22282 にて対応頂いた内容をリリースbranchにマージ

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
_U  branches/version-2_12_3/
_U  branches/version-2_12_3/data/
U   branches/version-2_12_3/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php


Property changes on: branches/version-2_12_3
___________________________________________________________________
変更: svn:mergeinfo
   - /branches/version-2_12-dev:22231,22241
/branches/version-2_12_2:21999-22009
/branches/version-2_4:18516-18517,18519,18522-18525,18527,18531,18541,18555,18560
/branches/version-2_4-dev:18473-18475
   + /branches/version-2_12-dev:22231,22241,22282
/branches/version-2_12_2:21999-22009
/branches/version-2_4:18516-18517,18519,18522-18525,18527,18531,18541,18555,18560
/branches/version-2_4-dev:18473-18475


Property changes on: branches/version-2_12_3/data
___________________________________________________________________
変更: svn:mergeinfo
   - /branches/version-2_12-dev:22241
/branches/version-2_12-dev/data:22231,22241
/branches/version-2_12_2/data:21999-22009
/branches/version-2_4/data:18516-18517,18519,18522-18525,18527,18531,18541,18555,18560
/branches/version-2_4-dev/data:18473-18475
   + /branches/version-2_12-dev:22241
/branches/version-2_12-dev/data:22231,22241,22282
/branches/version-2_12_2/data:21999-22009
/branches/version-2_4/data:18516-18517,18519,18522-18525,18527,18531,18541,18555,18560
/branches/version-2_4-dev/data:18473-18475

変更: branches/version-2_12_3/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php
===================================================================
--- branches/version-2_12_3/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php	2013-02-05 12:31:33 UTC (rev 22505)
+++ branches/version-2_12_3/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php	2013-02-06 07:30:41 UTC (rev 22506)
@@ -252,8 +252,7 @@
             header('Content-Length: ' . $content_length);
         }
         echo fread($fp, $content_length) ;
-        ob_flush();
-        flush();
+        SC_Utils_Ex::sfFlush();
     }
 
     /**
@@ -305,8 +304,8 @@
             while (!feof($realpath) && (!connection_aborted()) && ($bytes_send<$new_length)) {
                 $buffer = fread($realpath, $chunksize);
                 print($buffer);
-                ob_flush();
-                flush();
+                SC_Utils_Ex::sfFlush();
+                SC_Utils_Ex::extendTimeOut();
                 $bytes_send += strlen($buffer);
             }
             fclose($realpath);