rpms/libxcb/devel libxcb-1.2-no-nagle.patch, NONE, 1.1 libxcb.spec, 1.21, 1.22

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/libxcb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18374

Modified Files:
	libxcb.spec 
Added Files:
	libxcb-1.2-no-nagle.patch 
Log Message:
* Wed Jun 24 2009 Adam Jackson <ajax at redhat.com> 1.2-5
- libxcb-1.2-no-nagle.patch: Disable Nagle's algorithm on TCP. (#442158)


libxcb-1.2-no-nagle.patch:

--- NEW FILE libxcb-1.2-no-nagle.patch ---
commit ee89850e68205a7f8961ace0839b5be86040dade
Author: elupus <elupus at ecce.se>
Date:   Tue May 26 16:14:48 2009 +0200

    Disable Nagle on TCP socket
    
    Signed-off-by: Julien Danjou <julien at danjou.info>

diff --git a/src/xcb_util.c b/src/xcb_util.c
index adac909..55aadb7 100644
--- a/src/xcb_util.c
+++ b/src/xcb_util.c
@@ -30,6 +30,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #ifdef DNETCONN
 #include <netdnet/dnetdb.h>
 #include <netdnet/dn.h>
@@ -257,6 +258,9 @@ static int _xcb_open_tcp(char *host, char *protocol, const unsigned short port)
     {
         fd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
         if(fd >= 0) {
+            int on = 1;
+            setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
+
             if (connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0)
                 break;
             close(fd);


Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/libxcb.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- libxcb.spec	19 May 2009 18:29:36 -0000	1.21
+++ libxcb.spec	24 Jun 2009 16:07:48 -0000	1.22
@@ -4,7 +4,7 @@
 
 Name:           libxcb
 Version:        1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -21,6 +21,7 @@ Source2:	http://xcb.freedesktop.org/dist
 
 Patch0:         libxcb-1.1-no-pthread-stubs.patch
 Patch1:		libxcb-1.2-to-git-6e2e87d.patch
+Patch2:		libxcb-1.2-no-nagle.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
@@ -67,6 +68,7 @@ Python bindings for %{name}.
 %setup -q -b2
 %patch0 -p1 -b .pthread-stubs
 %patch1 -p1 -b .git
+%patch2 -p1 -b .no-nagle
 
 %build
 autoreconf -v --install
@@ -116,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/xcb
 
 %changelog
+* Wed Jun 24 2009 Adam Jackson <ajax at redhat.com> 1.2-5
+- libxcb-1.2-no-nagle.patch: Disable Nagle's algorithm on TCP. (#442158)
+
 * Tue May 19 2009 Adam Jackson <ajax at redhat.com> 1.2-4
 - Add libxcb-python subpackage