Changeset 21876


Ignore:
Timestamp:
2012/06/01 14:19:40 (9 years ago)
Author:
shutta
Message:

#1838 (zlib.output_compressionがOnの場合に無限ループ)
zlib用のバッファはob_end_clean()で削除できないっぽいので、バッファが削除できなかった場合はループを抜けるように修正。

Location:
branches/version-2_12-dev/html
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_12-dev/html/admin/require.php

    r21867 r21876  
    2727 
    2828require_once HTML_REALDIR . 'define.php'; 
    29 while (ob_get_level() >= 1) { 
    30     ob_end_clean(); 
     29if (ob_get_level() > 0) { 
     30    while (ob_end_clean()); 
    3131} 
    3232require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php'; 
  • branches/version-2_12-dev/html/install/index.php

    r21869 r21876  
    2828define('INSTALL_FUNCTION', true); 
    2929define('INSTALL_INFO_URL', 'http://www.ec-cube.net/install_info/index.php'); 
    30 while (ob_get_level() >= 1) { 
    31     ob_end_clean(); 
     30if (ob_get_level() > 0) { 
     31    while (ob_end_clean()); 
    3232} 
    3333require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php'; 
  • branches/version-2_12-dev/html/require.php

    r21867 r21876  
    3030 
    3131require_once HTML_REALDIR . 'define.php'; 
    32 while (ob_get_level() >= 1) { 
    33     ob_end_clean(); 
     32if (ob_get_level() > 0) { 
     33    while (ob_end_clean()); 
    3434} 
    3535require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php'; 
Note: See TracChangeset for help on using the changeset viewer.