Merge pull request #27 in OVZ/prl-vzvncserver from ~ALEXANDER.ALEKSEEV/prl-vzvncserver:flexible-ipv6 to master* commit '5bdaeb9e27b0fa58d21a74f5e4b273fb06e6c088':
Convert indents to tabs
PSBM-133502. Add more flexible ipv6 preferences
Merge pull request #26 in OVZ/prl-vzvncserver from ~IGOR/prl-vzvncserver:master to master* commit '52a69333d3395a1a4149c2042a78c9472c741e5a':
Revert "[vz8]: console support #PSBM-130590"
Merge pull request #25 in OVZ/prl-vzvncserver from ~IGOR/prl-vzvncserver:master to master* commit '312c3990d6d735c835e86eb7acb418f34aad1a42':
[vz8]: console support #PSBM-130590
Merge pull request #24 in OVZ/prl-vzvncserver from ~WORKND/prl-vzvncserver:master to master* commit '01af7c72407a887a0da698bc14d82c4d434d5985':
Rate limit prl_vzvnc_app logs on connection #PSBM-100792
PSBM-126948 Fixed stucked Ctrl key.Ctrl could be stucked on window detach or client disconnect due to the current
logic. At the same time, there is no real need to keep a reference counter on
Ctrl's up/down - it is a rare case that VNC console for the same container is
used simultaneously by several users.
New logic still have the same problem with detach or disconnect - but exit is
easy now - just press/unpress Ctrl key one mo...
Merge pull request #22 in OVZ/prl-vzvncserver from ~IGOR/prl-vzvncserver:master to master* commit '2da07006705fa170d3ad5b1a310364c3e7c9abd0':
Update Copyright
Merge pull request #21 in OVZ/prl-vzvncserver from ~BKBBKB/prl-vzvncserver:master to master* commit '9b37ff2cac7415373836616671a791c85a911902':
Rename variables in vz.conf
PSBM-82313 - vnc websockets connection timeout Read default timeout values from global VZ config file
PSBM-82313 - vnc websocket connection times out Add two new options to prl_vzvncserver: --connect-timeout set websocket connect timeout --send-timeout set websocket send timeout
PSBM-82313 - vnc websocket connection times outAdd two new options to prl_vzvncserver:
--connect-timeout set websocket connect timeout
--send-timeout set websocket send timeout
Merge pull request #20 in OVZ/prl-vzvncserver from ~PVOKHMYANIN/prl-vzvncserver-term-race:master to master* commit '19ad2c3e14045f880bf5d42b9211f4bd28856e3e':
Ignore IL/DL sequences if cursor is outside of scrolling region #PSBM-77784
Ignore IL/DL sequences if cursor is outside of scrolling region #PSBM-77784Tolerating such commands could lead to a segmentation fault. Ignoring
such commands is a correct approach outlined in a vt100 programmers
guide documentation.
Signed-off-by: Pavel Vokhmyanin <pvokhmyanin@virtuozzo.com>
Merge pull request #18 in OVZ/prl-vzvncserver from ~PVOKHMYANIN/prl-vzvncserver-term-race:master to master* commit '7345db587711397e3a1539c93340cccf8066c4c2':
Eliminate race on SIGTERM #PSBM-78542
Eliminate race on SIGTERM #PSBM-78542On SIGTERM we shutdown the screen, but in the meantime, there is
another thread handling events for the screen. There is a race
opportunity between listensocket check and socket processing
if shutdown is in progress. To eliminate the race we will close
the screen and sockets after worker thread exits.
Signed-off-by: Pavel Vokhmyanin <pvokhmyanin@virtuozzo.com>
Merge pull request #16 in OVZ/prl-vzvncserver from ~IPYASS/prl-vzvncserver:master to master* commit 'd7f420bd39fcb951414b4083fab2c988048f3616':
Fix init_logger place PSBM-67292
Merge pull request #15 in OVZ/prl-vzvncserver from ~IPYASS/prl-vzvncserver:master to master* commit '77e62ec32e47235c2d29caa909ea9f16a4019cad':
Move logging initialization after port message
Move logging initialization after port messageDispatcher waits for port from prl_vzvncserver from stdout.
Move logging initialization after required server initialization and set the default
debug level to INFO (actually it was changed to INFO from ERR by default
in init_logger function). PSBM-67292
Merge pull request #14 in OVZ/prl-vzvncserver from ~IPYASS/prl-vzvncserver:master to master* commit '658fb29ac275af357b4efa69b91d5959ccc9be81':
Add verbose option to enable/disable libVNCServer library functions logging to stderr PSBM-58100
Add verbose option to enable/disable libVNCServer library functions logging to stderr PSBM-58100This patch allows to enable or disable libVNCServer library functions logging to stderr.
By default logging is disabled. Also minor fix - fix the log file naming (pid is not informative).
Now the log file name will contain container name/id as it passed to program and date (e.g. test-2017531.log)
Merge pull request #13 in OVZ/prl-vzvncserver from ~IGOR/prl-vzvncserver:master to masterRequires libvncserver-0.9.9-9.vl7.4
* commit '49d7d52abb9f89d28e8ec097e170514693c3847d':
Limit VNC ports range #PSBM-63821
Limit VNC ports range #PSBM-63821Restore --min-port/--max-port logic, introduced in libvncserver-0.9.9-9.vl7.4
Signed-off-by: Igor Sukhih <igor@virtuozzo.com>
Limit VNC ports range #PSBM-63821Restore --min-port/--max-port logic, introduced in libvncserver-0.9.9-9.vl7.4
Signed-off-by: Igor Sukhih <igor@virtuozzo.com>
