summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordscho <dscho>2006-03-27 15:41:51 +0000
committerdscho <dscho>2006-03-27 15:41:51 +0000
commit10c61b53c275f125432fa20d8348aafcfed2bf93 (patch)
tree90c8504a9e18f8eab360e3d036fe72a30bad2f26
parent199ec23a058a46c5caebc632756862d968eb437f (diff)
downloadlibtdevnc-10c61b53.tar.gz
libtdevnc-10c61b53.zip
ignore maxRectsPerUpdate when encoding is Zlib (thanks scarr)
-rw-r--r--AUTHORS3
-rw-r--r--ChangeLog4
-rw-r--r--libvncserver/rfbserver.c2
3 files changed, 8 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 9698253..4fb0583 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,7 +28,8 @@ email!): Akira Hatakeyama, Karl J. Runge, Justin "Zippy" Dearing,
Oliver Mihatsch, Greg Sternberg, Werner Hofer, Giampiero Giancipoli,
Glenn Mabutt, Paul Kreiner, Erik Kunze, Mike Frysinger, Martin Waitz,
Mark McLoughlin, Paul Fox, Juan Jose Costello, Andre Leiadella,
-Alberto Lusiani, Malvina Mazin, Dave Stuart, Rohit Kumar, and Donald Dugger.
+Alberto Lusiani, Malvina Mazin, Dave Stuart, Rohit Kumar, Donald Dugger,
+and Steven Carr.
Probably I forgot quite a few people sending a patch here and there, which
really made a difference. Without those, some obscure bugs still would
diff --git a/ChangeLog b/ChangeLog
index 9c29744..d341875 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-27 Steven Carr <scarr@jsa-usa.com>
+ * rfbserver.c: Zlib encoding cannot have a limit via
+ maxRectsPerUpdate
+
2006-02-28 Donald Dugger <donald.d.dugger@intel.com>
* rfb.h, sockets.c, main.c: add a flag to handle all pending
input events instead of one at a time.
diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c
index 8fab930..f565f05 100644
--- a/libvncserver/rfbserver.c
+++ b/libvncserver/rfbserver.c
@@ -1383,6 +1383,8 @@ rfbSendFramebufferUpdate(rfbClientPtr cl,
&& cl->preferredEncoding != rfbEncodingTight
/* XXX Should rfbEncodingCoRRE be in here? */
&& cl->preferredEncoding != rfbEncodingCoRRE
+ /* Zlib encoding splits rectangles up into smaller chunks */
+ && cl->preferredEncoding != rfbEncodingZlib
#endif
#endif
&& nUpdateRegionRects>cl->screen->maxRectsPerUpdate) {