Skip to content

Fix font server reconnection timeout

Peter Harris requested to merge peterh/libxfont:master into master

The great libxfont2 rewrite 135fb032 split fs_wakeup into fs_wakeup and fs_fd_handler. The fs_fd_handler side is called when there is new data on the socket. The fs_wakeup side is called on a timeout.

If there's a connection timeout, the block handler will set the timeout to zero, expecting fs_wakeup to handle the timeout. Therefore, we need to call _fs_check_reconnect in fs_wakeup to handle the connection timeout. If we don't, the X server will go to 100% CPU (and the font server connection will not be retried).

Signed-off-by: Peter Harris pharris@opentext.com

Merge request reports