tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-03-13 Kikuchi Koichiro <koichiro@rworks.jp> 

* extensions/update_manager/lib/xmlrpc/xmlrpc.inc: Keep original
	 connection params when xmlrpc_client->sendPayloadHTTP10() follows
	 30x redirect.

	Merged from: branch_4.0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7842 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
koichirok 2013-03-13 08:01:38 +00:00
parent 8f157b7a67
commit e6726ddda3
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-03-13 Kikuchi Koichiro <koichiro@rworks.jp>
* extensions/update_manager/lib/xmlrpc/xmlrpc.inc: Keep original
connection params when xmlrpc_client->sendPayloadHTTP10() follows
30x redirect.
Merged from: branch_4.0
2013-03-12 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_components_form.php,

16
pandora_console/extensions/update_manager/lib/xmlrpc/xmlrpc.inc
View File

@ -1457,8 +1457,24 @@
{
$this->redirs++;
}
// backup original params
$method = $this->method;
$server = $this->server;
$port = $this->port;
$path = $this->path;
$username = $this->username;
$password = $this->password;
$this->setup_by_path($m[1]);
$r =& $this->send($msg, $timeout);
// restore original params
$this->method = $method;
$this->server = $server;
$this->path = $path;
$this->port = $port;
$this->username = $username;
$this->password = $password;
} else {
$r =& $msg->parseResponse($ipd, false, $this->return_type);
$this->redirs = 0;