| author | Jiri Kukacka <jiri.kukacka@oracle.com> |
| Tue, 14 Jan 2014 08:01:05 -0800 | |
| branch | s11u1-sru |
| changeset 2934 | ed4c692fa932 |
| parent 331 | 5001b63ddc8a |
| permissions | -rw-r--r-- |
|
2934
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
1 |
Developed in-house reflecting community issue. |
|
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
2 |
http://redmine.lighttpd.net/issues/1239 |
|
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
3 |
Solaris-specific, currently ignored by community. |
|
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
4 |
|
|
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
5 |
--- src/network.c 2013-11-05 09:41:41.841723296 -0800 |
|
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
6 |
+++ src/network.c 2013-11-05 09:40:25.359053258 -0800 |
|
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
7 |
@@ -251,6 +251,10 @@ |
|
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
8 |
log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt(SO_REUSEADDR) failed:", strerror(errno)); |
|
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
9 |
goto error_free_socket; |
|
331
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
} |
|
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
+ if (setsockopt(srv_socket->fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val)) < 0) {
|
|
2934
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
12 |
+ log_error_write(srv, __FILE__, __LINE__, "ss", "socketsockopt(TCP_NODELAY) failed:", strerror(errno)); |
|
ed4c692fa932
17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
331
diff
changeset
|
13 |
+ goto error_free_socket; |
|
331
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
+ } |
|
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
|
|
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
switch(srv_socket->addr.plain.sa_family) {
|
|
5001b63ddc8a
7057442 Move Lighttpd to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
#ifdef HAVE_IPV6 |