1
0
OBS User unknown 2008-10-25 23:47:09 +00:00 committed by Git OBS Bridge
parent 8a43cd2e1b
commit 7fb45b1dad
3 changed files with 45 additions and 1 deletions

View File

@ -0,0 +1,31 @@
diff --git a/hw/vnc/sockets.c b/hw/vnc/sockets.c
index 942fa36..c7a9ea2 100644
--- a/hw/vnc/sockets.c
+++ b/hw/vnc/sockets.c
@@ -448,7 +448,7 @@ WriteExact(sock, buf, len)
int n;
fd_set fds;
struct timeval tv;
-#if 0
+#if 1
int totalTimeWaited = 0;
#endif
@@ -469,7 +469,7 @@ WriteExact(sock, buf, len)
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 */
@@ -487,7 +487,7 @@ WriteExact(sock, buf, len)
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;

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Oct 25 13:46:03 CEST 2008 - sndirsch@suse.de
- xorg-server-xf4vnc-busyloop.diff
* prevent Xvnc from busylooping when client disconnects
(bnc #403901)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 17 15:52:27 CEST 2008 - sndirsch@suse.de Fri Oct 17 15:52:27 CEST 2008 - sndirsch@suse.de

View File

@ -29,7 +29,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/ Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0 %define EXPERIMENTAL 0
Version: 7.4 Version: 7.4
Release: 9 Release: 10
License: X11/MIT License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -77,6 +77,7 @@ Patch40: xorg-server-xf4vnc-disable-dmxvnc.diff
Patch42: xorg-server-xf4vnc-TranslateNone.diff Patch42: xorg-server-xf4vnc-TranslateNone.diff
Patch43: xorg-server-xf4vnc-abi-version.diff Patch43: xorg-server-xf4vnc-abi-version.diff
Patch44: xorg-server-xf4vnc-cutpaste.diff Patch44: xorg-server-xf4vnc-cutpaste.diff
Patch46: xorg-server-xf4vnc-busyloop.diff
%endif %endif
Patch41: loadmod-bug197195.diff Patch41: loadmod-bug197195.diff
Patch45: bug-197858_dpms.diff Patch45: bug-197858_dpms.diff
@ -190,6 +191,7 @@ popd
%patch42 -p1 %patch42 -p1
%patch43 -p0 %patch43 -p0
%patch44 %patch44
%patch46 -p1
chmod 755 hw/vnc/symlink-vnc.sh chmod 755 hw/vnc/symlink-vnc.sh
%endif %endif
%patch41 -p1 %patch41 -p1
@ -535,6 +537,10 @@ exit 0
%endif %endif
%changelog %changelog
* Sat Oct 25 2008 sndirsch@suse.de
- xorg-server-xf4vnc-busyloop.diff
* prevent Xvnc from busylooping when client disconnects
(bnc #403901)
* Fri Oct 17 2008 sndirsch@suse.de * Fri Oct 17 2008 sndirsch@suse.de
- miPointerUpdate-crashfix.diff - miPointerUpdate-crashfix.diff
* fixes Xserver crash at startup with ELO touchscreen * fixes Xserver crash at startup with ELO touchscreen