diff options
| author | Keith Packard <keithp@keithp.com> | 2012-01-12 12:09:55 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-01-12 12:09:55 -0800 |
| commit | 3be37375eed9eb9cfb9c42821deda4213af4057b (patch) | |
| tree | 6ed706ef45af9e2b7074714ab936751d95e18cca /os | |
| parent | 5b9f5c8a53aca03c3c73bc10bd362987621a9d72 (diff) | |
Revert "dix: Extend initial connection handshake for forwarding proxies"
This reverts commit 78fa121f4097d29458e5453c13473595df06e26e.
ABI change pended for 1.13
Diffstat (limited to 'os')
| -rw-r--r-- | os/connection.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/os/connection.c b/os/connection.c index a91501a13..e1b77bb48 100644 --- a/os/connection.c +++ b/os/connection.c @@ -882,7 +882,7 @@ ErrorConnMax(XtransConnInfo trans_conn) xConnSetupPrefix csp; char pad[3]; struct iovec iov[3]; - char order = 0; + char byteOrder = 0; int whichbyte = 1; struct timeval waittime; fd_set mask; @@ -895,16 +895,16 @@ ErrorConnMax(XtransConnInfo trans_conn) FD_SET(fd, &mask); (void)Select(fd + 1, &mask, NULL, NULL, &waittime); /* try to read the byte-order of the connection */ - (void)_XSERVTransRead(trans_conn, &order, 1); - if (order == 'l' || order == 'B' || order == 'r' || order == 'R') + (void)_XSERVTransRead(trans_conn, &byteOrder, 1); + if ((byteOrder == 'l') || (byteOrder == 'B')) { csp.success = xFalse; csp.lengthReason = sizeof(NOROOM) - 1; csp.length = (sizeof(NOROOM) + 2) >> 2; csp.majorVersion = X_PROTOCOL; csp.minorVersion = X_PROTOCOL_REVISION; - if (((*(char *) &whichbyte) && (order == 'B' || order == 'R')) || - (!(*(char *) &whichbyte) && (order == 'l' || order == 'r'))) + if (((*(char *) &whichbyte) && (byteOrder == 'B')) || + (!(*(char *) &whichbyte) && (byteOrder == 'l'))) { swaps(&csp.majorVersion); swaps(&csp.minorVersion); |