summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2011-07-29 17:31:01 +0200
committerArnon Gilboa <agilboa@redhat.com>2011-07-31 13:32:49 +0300
commit0c8438c7ffffed9c581d529997423bc736159970 (patch)
tree839c36d1647b24c0cab2a44f5c83befd1f134b08 /server
parent54c660470a5aea19f799c5574cc0d4a707696712 (diff)
downloadspice-0c8438c7ffffed9c581d529997423bc736159970.tar.gz
spice-0c8438c7ffffed9c581d529997423bc736159970.tar.xz
spice-0c8438c7ffffed9c581d529997423bc736159970.zip
client: fix 30s timeout regression
Changelog from Arnon Gilboa, patch from me: Commit eb6f55409412 caused the following regression: When client runs without the auto-conf or disable-effects options (either from CLI or controller), which is the case when using Spice from Admin Portal, the client will unecessarily wait for 30sec before connecting to a Windows guest with an agent running (this won't happen with linux guests or without an agent running). The mentioned patch assumed that on_agent_reply() of VD_AGENT_DISPLAY_CONFIG will call send_main_attach_channels() and connect. However, when auto-conf or disable-effects are not used, on_agent_reply() will ignore the reply and not call send_main_attach_channels(). Therefore, send_main_attach_channels() will only be called on agent timeout. The solution is to activate agent timer only if auto-conf or disable-effects. Otherwise, simply call send_main_attach_channels(). Fixes rhbz #726441
Diffstat (limited to 'server')
0 files changed, 0 insertions, 0 deletions