Commit Graph

9 Commits

Author SHA1 Message Date
Stephen Turner
d1b4b75258 Fix for NRE in fix for CA-214653 2017-02-03 14:57:42 +00:00
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
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
2f7a938643 [CA-214653] Code clean-up following code review
Signed-off-by: Frezzle <frederico.mazzone@citrix.com>
2016-10-12 19:25:38 +01:00
Frezzle
ec62027342 CA-214653: Work-around for XC reconnecting to proxy server with new wrong credentials
Normally, a heartbeat is done every 15 seconds by getting the server time, and starts as soon as connection to host is established, but if an error occurs XC retries once more in another 15 seconds before actually closing the connection to the host.

Now, if a 407 Proxy Authentication Required error occurs on the initial heartbeat then XC does not retry again in 15 seconds; it will close the connection immediately. The disconnection was instant to up to 2 seconds, depending on time taken to get server time (testing with FreeProxy was ~instant and CCProxy was ~2 seconds). This is only a work-around, as the exact reason for this behaviour is still unknown.

Signed-off-by: Frezzle <frederico.mazzone@citrix.com>
2016-10-11 17:40:06 +01:00
Mihaela Stoica
3cb4807737 CA-108676: Put the Heartbeat and event.next sessions on their own ConnectionGroups.
Also make sure that the MeddlingAction's cancel session gets disposed.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2014-06-30 14:21:42 +01:00
Stephen Turner
416425a21e CA-132066 Make Heartbeat work as designed
The Heartbeat would log out the session after the first missed heartbeat.
This worked fine when the Heartbeat was on its own session, back in George
and earlier versions. However, when it was changed to use just a
DuplicateSession() instead of a new Session(), this broke the main session
of the connection. This caused a first heartbeat failure to break the
connection, and also caused the expectDisruption flag to be ignored.

This patch restores the old behaviour by not logging out the session until
the second failure.
2014-05-15 15:46:01 +01:00
Stephen Turner
e9ad35848a CA-94466: Log when the heartbeat has come back 2014-04-17 11:43:08 +01:00
Mihaela Stoica
bd36a85bff CP-4816: Initial commit to git repo
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-24 12:41:48 +01:00