Stefan Dirsch
7e6a980b1f
Copy from home:oertel:branches:openSUSE:Factory/xorg-x11-server via accept of submit request 35298 revision 8. Request was accepted with message: reviewed ok. OBS-URL: https://build.opensuse.org/request/show/35298 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=229
32 lines
768 B
Diff
32 lines
768 B
Diff
Index: xorg-server-1.6.3.901/hw/vnc/sockets.c
|
|
================================================================================
|
|
--- xorg-server-1.7.99/hw/vnc/sockets.c
|
|
+++ xorg-server-1.7.99/hw/vnc/sockets.c
|
|
@@ -448,7 +448,7 @@
|
|
int n;
|
|
fd_set fds;
|
|
struct timeval tv;
|
|
-#if 0
|
|
+#if 1
|
|
int totalTimeWaited = 0;
|
|
#endif
|
|
|
|
@@ -470,7 +470,7 @@
|
|
return n;
|
|
}
|
|
|
|
-#if 0
|
|
+#if 1
|
|
/* Retry every 5 seconds until we exceed rfbMaxClientWait. We
|
|
need to do this because select doesn't necessarily return
|
|
immediately when the other end has gone away */
|
|
@@ -488,7 +488,7 @@
|
|
tv.tv_usec = 0;
|
|
#endif
|
|
n = select(sock+1, NULL, &fds, NULL, &tv);
|
|
-#if 0
|
|
+#if 1
|
|
if (n < 0) {
|
|
rfbLogPerror("WriteExact: select");
|
|
return n;
|