[X2Go-Commits] [nx-libs] 28/108: nxagent: Fix an excessive request size limitation that broke big-requests.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit da9d1a5298d34f36accfac0af3640d11e4f70543
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sat Oct 6 20:59:25 2018 +0200

    nxagent: Fix an excessive request size limitation that broke big-requests.
    
    Fixes ArcticaProject/nx-libs#301, #631
    
    Backport from xorg-xserver:
    
      commit ca82d4bddf235c9b68d51d68636bab40eafb9889
      Author: Eric Anholt <eric at anholt.net>
      Date:   Fri Aug 31 13:00:23 2007 -0700
    
        Bug #7186: Fix an excessive request size limitation that broke big-requests.
    
        MAXBUFSIZE appears to be a leftover of some previous time.  Instead, just
        use maxBigRequestSize when bigreqs are available (limiting buffers to ~16MB).
        When bigreqs are not available, needed won't be larger than the maximum
        size of a non-bigreqs request (256kB).
---
 nx-X11/programs/Xserver/os/io.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c
index 6eeee34..ad1fdcd 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))
 	{

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git