aboutsummaryrefslogtreecommitdiff
path: root/libxcb
diff options
context:
space:
mode:
Diffstat (limited to 'libxcb')
-rw-r--r--libxcb/NEWS8
-rw-r--r--libxcb/configure.ac2
-rw-r--r--libxcb/src/xcb_conn.c8
-rw-r--r--libxcb/xcb-proto/src/xkb.xml4
4 files changed, 19 insertions, 3 deletions
diff --git a/libxcb/NEWS b/libxcb/NEWS
index 0855448c5..457059877 100644
--- a/libxcb/NEWS
+++ b/libxcb/NEWS
@@ -1,3 +1,11 @@
+Release 1.6 (2010-04-09)
+========================
+- darwin: xnu doesn't support poll on ttys on the master side
+- Fix descriptor leak on memory error path
+- Support xcb_discard_reply
+- Open the X11 socket with close-on-exec flag
+- Fix authentication on hpux and Hurd
+
Release 1.5 (2009-12-03)
========================
- setsockopt(SO_KEEPALIVE) on TCP display connections
diff --git a/libxcb/configure.ac b/libxcb/configure.ac
index 23f4f2253..c5f454bee 100644
--- a/libxcb/configure.ac
+++ b/libxcb/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libxcb],
- 1.5,
+ 1.6,
[xcb@lists.freedesktop.org])
AC_CONFIG_SRCDIR([xcb.pc.in])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
diff --git a/libxcb/src/xcb_conn.c b/libxcb/src/xcb_conn.c
index ed2153d27..1d3761452 100644
--- a/libxcb/src/xcb_conn.c
+++ b/libxcb/src/xcb_conn.c
@@ -210,6 +210,14 @@ xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info)
{
xcb_connection_t* c;
+#ifndef USE_POLL
+ if(fd >= FD_SETSIZE) /* would overflow in FD_SET */
+ {
+ close(fd);
+ return (xcb_connection_t *) &error_connection;
+ }
+#endif
+
c = calloc(1, sizeof(xcb_connection_t));
if(!c) {
close(fd);
diff --git a/libxcb/xcb-proto/src/xkb.xml b/libxcb/xcb-proto/src/xkb.xml
index fb97ba408..33d3ea354 100644
--- a/libxcb/xcb-proto/src/xkb.xml
+++ b/libxcb/xcb-proto/src/xkb.xml
@@ -1127,7 +1127,7 @@ authorization from the authors.
</switch>
</request>
- <request name="Bell" opcode="2">
+ <request name="Bell" opcode="3">
<field name="deviceSpec" type="DeviceSpec" />
<field name="bellClass" type="BellClassSpec" />
<field name="bellID" type="IDSpec" />
@@ -1142,7 +1142,7 @@ authorization from the authors.
<field name="window" type="WINDOW" />
</request>
- <request name="GetState" opcode="3">
+ <request name="GetState" opcode="4">
<field name="deviceSpec" type="DeviceSpec" />
<pad bytes="2" />
<reply>