aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-10-22 14:17:04 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-10-22 14:17:04 +0200
commitc478ba2937b6a7e6c55b615ddeac3ca525f6a743 (patch)
treed653868d76c53ae89ff9f33d0c7becc3d5c77e16 /nx-X11
parentd3bbca712dc7109539f9af985fe2d30a7c9b0419 (diff)
parentda9d1a5298d34f36accfac0af3640d11e4f70543 (diff)
downloadnx-libs-c478ba2937b6a7e6c55b615ddeac3ca525f6a743.tar.gz
nx-libs-c478ba2937b6a7e6c55b615ddeac3ca525f6a743.tar.bz2
nx-libs-c478ba2937b6a7e6c55b615ddeac3ca525f6a743.zip
Merge branch 'uli42-pr/fix_bigrequests' into 3.6.x
Attributes GH PR #729: https://github.com/ArcticaProject/nx-libs/pull/729
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/os/io.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c
index 6eeee349a..ad1fdcd20 100644
--- a/nx-X11/programs/Xserver/os/io.c
+++ b/nx-X11/programs/Xserver/os/io.c
@@ -301,7 +301,8 @@ ReadRequestFromClient(ClientPtr client)
*/
oci->lenLastReq = 0;
- if (needed > MAXBUFSIZE)
+#ifdef BIGREQS
+ if (needed > maxBigRequestSize << 2)
{
/* request is too big for us to handle */
/*
@@ -312,6 +313,7 @@ ReadRequestFromClient(ClientPtr client)
oci->lenLastReq = gotnow;
return needed;
}
+#endif
if ((gotnow == 0) ||
((oci->bufptr - oci->buffer + needed) > oci->size))
{