projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only compile client-tags.c if FEATURE_CLIENT_TAGS is enabled
[privoxy.git]
/
jbsockets.c
diff --git
a/jbsockets.c
b/jbsockets.c
index
ff1d7a8
..
48f43c9
100644
(file)
--- a/
jbsockets.c
+++ b/
jbsockets.c
@@
-1,4
+1,4
@@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.13
1 2014/11/14 10:40:24
fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.13
4 2015/11/06 13:37:35
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@
-8,7
+8,7
@@
const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.131 2014/11/14 10:40:24 fabia
* OS-independent. Contains #ifdefs to make this work
* on many platforms.
*
* OS-independent. Contains #ifdefs to make this work
* on many platforms.
*
- * Copyright : Written by and Copyright (C) 2001-201
4
the
+ * Copyright : Written by and Copyright (C) 2001-201
6
the
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@
-1307,7
+1307,7
@@
int accept_connection(struct client_state * csp, jb_socket fds[])
struct linger linger_options;
linger_options.l_onoff = 1;
linger_options.l_linger = 5;
struct linger linger_options;
linger_options.l_onoff = 1;
linger_options.l_linger = 5;
- if (0 != setsockopt(fd, SOL_SOCKET, SO_LINGER, &linger_options, sizeof(linger_options)))
+ if (0 != setsockopt(
a
fd, SOL_SOCKET, SO_LINGER, &linger_options, sizeof(linger_options)))
{
log_error(LOG_LEVEL_ERROR, "Setting SO_LINGER on socket %d failed.", afd);
}
{
log_error(LOG_LEVEL_ERROR, "Setting SO_LINGER on socket %d failed.", afd);
}
@@
-1329,6
+1329,8
@@
int accept_connection(struct client_state * csp, jb_socket fds[])
mark_socket_for_close_on_execute(afd);
#endif
mark_socket_for_close_on_execute(afd);
#endif
+ set_no_delay_flag(afd);
+
csp->cfd = afd;
#ifdef HAVE_RFC2553
csp->ip_addr_str = malloc_or_die(NI_MAXHOST);
csp->cfd = afd;
#ifdef HAVE_RFC2553
csp->ip_addr_str = malloc_or_die(NI_MAXHOST);