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

sticking to the rules of the protocoll while writing a request to port, ensures that lighttpd (>=1.4.28) understands our requests

Browse Source
This commit is contained in:
Klaus Leithoff 2011-08-03 13:36:59 +00:00
parent 9b8921116b
commit 8d7c954544
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpgwapi/inc/class.network.inc.php
View File

@ -191,7 +191,7 @@
//allows for access to http-auth pages - added by Dave Hall <dave.hall@mbox.com.au> //allows for access to http-auth pages - added by Dave Hall <dave.hall@mbox.com.au>
if(!((empty($user))&&(empty($passwd)))) if(!((empty($user))&&(empty($passwd))))
{ {
$auth = 'Authorization: Basic '.base64_encode("$user:$passwd")."\n"; $auth = 'Authorization: Basic '.base64_encode("$user:$passwd")."\r\n";
} }
else else
{ {
@ -205,11 +205,11 @@
{ {
$proxyUsername = $GLOBALS['egw_info']['server']['httpproxy_server_username']; $proxyUsername = $GLOBALS['egw_info']['server']['httpproxy_server_username'];
$proxyPassword = $GLOBALS['egw_info']['server']['httpproxy_server_password']; $proxyPassword = $GLOBALS['egw_info']['server']['httpproxy_server_password'];
$proxyAuth = 'Proxy-Authorization: Basic '.base64_encode("$proxyUsername:$proxyPassword")."\n"; $proxyAuth = 'Proxy-Authorization: Basic '.base64_encode("$proxyUsername:$proxyPassword")."\r\n";
} }
if($this->open_port($server,80, 15)) if($this->open_port($server,80, 15))
{ {
if(!$this->write_port('GET http://' . $server . $file . ' HTTP/1.0'."\n".$proxyAuth.$auth."\r\n\r\n")) if(!$this->write_port('GET http://' . $server . $file . ' HTTP/1.0'."\r\n".$proxyAuth.$auth."\r\n\r\n"))
{ {
return False; return False;
} }
@ -237,10 +237,10 @@
} }
else else
{ {
if($this->open_port($server, 80, 15)) if($this->open_port($server, 80, 30))
{ {
$lines = array(); $lines = array();
if(!$this->write_port('GET '.$file.' HTTP/1.0'."\n".'Host: '.$server."\n".$auth."\r\n\r\n")) if(!$this->write_port('GET '.$file.' HTTP/1.0'."\r\n".'Host: '.$server."\r\nAccept: */*".($auth?"\r\n".$auth:'')."\r\n\r\n"))
{ {
return 0; return 0;
} }