holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

need to set context even for no proxy, if we need optional authentication

Browse Source
This commit is contained in:
Ralf Becker 2014-09-23 13:45:03 +00:00
parent 1289d23df9
commit 19d2b7effb
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -986,22 +986,22 @@ abstract class egw_framework
*/ */
public static function proxy_context($username=null, $password=null) public static function proxy_context($username=null, $password=null)
{ {
if (empty($GLOBALS['egw_info']['server']['httpproxy_server'])) $opts = array(
{
return null;
}
$opts = array (
'method' => 'GET', 'method' => 'GET',
'proxy' => 'tcp://'.$GLOBALS['egw_info']['server']['httpproxy_server'].':'.
($GLOBALS['egw_info']['server']['httpproxy_port'] ? $GLOBALS['egw_info']['server']['httpproxy_port'] : 8080),
'request_fulluri' => true,
); );
// proxy authentication if (!empty($GLOBALS['egw_info']['server']['httpproxy_server']))
if (!empty($GLOBALS['egw_info']['server']['httpproxy_server_username']))
{ {
$opts['header'][] = 'Proxy-Authorization: Basic '.base64_encode($GLOBALS['egw_info']['server']['httpproxy_server_username'].':'. $opts += array (
$GLOBALS['egw_info']['server']['httpproxy_server_password']); 'proxy' => 'tcp://'.$GLOBALS['egw_info']['server']['httpproxy_server'].':'.
($GLOBALS['egw_info']['server']['httpproxy_port'] ? $GLOBALS['egw_info']['server']['httpproxy_port'] : 8080),
'request_fulluri' => true,
);
// proxy authentication
if (!empty($GLOBALS['egw_info']['server']['httpproxy_server_username']))
{
$opts['header'][] = 'Proxy-Authorization: Basic '.base64_encode($GLOBALS['egw_info']['server']['httpproxy_server_username'].':'.
$GLOBALS['egw_info']['server']['httpproxy_server_password']);
}
} }
// optional authentication // optional authentication
if (isset($username)) if (isset($username))