Commit Graph

8 Commits

Author SHA1 Message Date
Konstantina Chremmou
489d8684e4 Merge remote-tracking branch 'upstream/master' into CAR-2214
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>

# Conflicts:
#	Branding/branding.sh
#	mk/archive-unsigned.sh
#	mk/build.sh
#	mk/bumpBuildNumber.sh
#	mk/copy-build-output.sh
#	mk/declarations.sh
#	mk/tests-checks-cover.sh
#	mk/tests-checks.sh
2017-01-24 14:46:57 +00:00
Konstantina Chremmou
88b4104dac Moved the ProxyAuthenticationMethod enum to the HTTP class so the VNCControl can compile.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2017-01-20 14:47:04 +00:00
Gabor Apati-Nagy
7c0bc50b4a CA-176169: Changed copyright statements to include the comma in Citrix Systems,
Inc.

Signed-off-by: Gabor Apati-Nagy<gabor.apati-nagy@citrix.com>
2017-01-16 19:59:50 +00:00
Frezzle
3522e2980d [CP-19111] Added ability to choose Basic or Digest authentication for proxy server
2 new radio buttons in Connection Options page, for Basic and Digest; Digest is the default as it's the most secure.
New proxy authentication method setting, which is used to configure XenAPI's HTTP class and the .NET AuthenticationManager (which handles which authentication schemes can be used by the .NET web classes).
The new setting is also transferred and used by the Health Check service.

The bug noted in CA-214653 also occurs here, but the work-around on PR#1201 for that bug will also work for this.

Signed-off-by: Frezzle <frederico.mazzone@citrix.com>
2016-10-12 19:09:35 +01:00
Frederico Mazzone
9fa8740cb9 [CP-17401] Use Proxy authentication in Health Check Service
Removed last bits of code relating to "Bypass proxy server for local addresses" option.
New proxy settings are sent from XenCenter to health check service and used to configure the proxy using GetProxyFromSettings().
Health check service now correctly saves its proxy settings and updates the static Proxy property for the Session class; done in new ReconfigureConnectionSettings().

Signed-off-by: Frederico Mazzone <fredericom@citrite.net>
2016-06-22 13:05:21 +01:00
Rob Hoes
f5a12452ca CA-192640: Don't log exceptions when HealthCheck service is not installed
Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
2016-01-14 13:52:20 +00:00
Mihaela Stoica
2eba1c705f Merge remote-tracking branch 'upstream/master' into CP-12156_2
Conflicts:
	XenModel/XenAPI-Extensions/Pool.cs
	XenModel/XenModel.csproj
2015-08-27 01:03:58 +01:00
Hui Zhang
0761aa5be2 CP-13848: XenCenter transfers proxy settings to HealthCheckService.
Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
2015-08-25 20:32:58 +08:00