components/lighttpd/patches/lighttpd-nodelay.patch
branchs11u1-sru
changeset 2934 ed4c692fa932
parent 331 5001b63ddc8a
--- a/components/lighttpd/patches/lighttpd-nodelay.patch	Fri Jan 17 17:43:13 2014 +0100
+++ b/components/lighttpd/patches/lighttpd-nodelay.patch	Tue Jan 14 08:01:05 2014 -0800
@@ -1,12 +1,16 @@
---- src/network.c-orig	Mon Sep  7 05:46:50 2009
-+++ src/network.c	Mon Sep  7 05:59:17 2009
-@@ -175,6 +175,10 @@
- 		log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt failed:", strerror(errno));
- 		return -1;
+Developed in-house reflecting community issue.
+http://redmine.lighttpd.net/issues/1239
+Solaris-specific, currently ignored by community.
+
+--- src/network.c	2013-11-05 09:41:41.841723296 -0800
++++ src/network.c	2013-11-05 09:40:25.359053258 -0800
+@@ -251,6 +251,10 @@
+ 		log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt(SO_REUSEADDR) failed:", strerror(errno));
+ 		goto error_free_socket;
  	}
 +        if (setsockopt(srv_socket->fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)) < 0) {
-+                log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt failed:", strerror(errno));
-+                return -1;
++                log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt(TCP_NODELAY) failed:", strerror(errno));
++                goto error_free_socket;
 +        }
  
  	switch(srv_socket->addr.plain.sa_family) {