fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #526 from kijin/pr/proxy-improvement

Browse source 
외부 요청시 프록시 설정 방식 개선
This commit is contained in:
Kijin Sung 2016-06-18 15:27:27 +09:00 • committed by GitHub
commit 50a8c77097
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
classes/file/FileHandler.class.php
View file

@ -377,14 +377,17 @@ class FileHandler
$request_headers['Content-Type'] = $content_type; $request_headers['Content-Type'] = $content_type;
} }
$proxy = parse_url(__PROXY_SERVER__); if(defined('__PROXY_SERVER__'))
if($proxy["host"])
{ {
$request_options['proxy'] = array($proxy['host'] . ($proxy['port'] ? (':' . $proxy['port']) : '')); $proxy = parse_url(__PROXY_SERVER__);
if($proxy['user'] && $proxy['pass']) if($proxy["host"])
{ {
$request_options['proxy'][] = $proxy['user']; $request_options['proxy'] = array($proxy['host'] . ($proxy['port'] ? (':' . $proxy['port']) : ''));
$request_options['proxy'][] = $proxy['pass']; if($proxy['user'] && $proxy['pass'])
{
$request_options['proxy'][] = $proxy['user'];
$request_options['proxy'][] = $proxy['pass'];
}
} }
} }

1
common/constants.php
View file

@ -133,7 +133,6 @@ define('_XE_PACKAGE_', 'XE');
define('_XE_LOCATION_', 'en'); define('_XE_LOCATION_', 'en');
define('_XE_LOCATION_SITE_', 'https://www.xpressengine.com/'); define('_XE_LOCATION_SITE_', 'https://www.xpressengine.com/');
define('_XE_DOWNLOAD_SERVER_', 'https://download.xpressengine.com/'); define('_XE_DOWNLOAD_SERVER_', 'https://download.xpressengine.com/');
define('__PROXY_SERVER__', null);
define('__DEBUG__', 0); define('__DEBUG__', 0);
/** /**