openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-11 03:39:26 +00:00
Code Issues Projects Releases Wiki Activity

Update to xorg-server 1.9.3. Tested by japser@, landry@ and ajacoutot@

Browse Source 
in various configurations.
This commit is contained in:
matthieu
2010-12-21 20:10:44 +00:00
parent 26690df79b
commit dd56fb17b5
159 changed files with 1650 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
xserver/os/io.c
View File

@@ -410,16 +410,29 @@ ReadRequestFromClient(ClientPtr client)
else
needed = sizeof(xReq);
}
oci->lenLastReq = needed;
/* If there are bytes to ignore, ignore them now. */
if (oci->ignoreBytes > 0) {
assert(needed == oci->ignoreBytes || needed == oci->size);
oci->ignoreBytes -= gotnow;
needed = gotnow = 0;
/*
* The _XSERVTransRead call above may return more or fewer bytes than we
* want to ignore. Ignore the smaller of the two sizes.
*/
if (gotnow < needed) {
oci->ignoreBytes -= gotnow;
oci->bufptr += gotnow;
gotnow = 0;
} else {
oci->ignoreBytes -= needed;
oci->bufptr += needed;
gotnow -= needed;
}
needed = 0;
}
oci->lenLastReq = needed;
/*
* Check to see if client has at least one whole request in the
* buffer beyond the request we're returning to the caller.