projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
93dd282
)
Move log message around to include the socket number.
author
Fabian Keil
<fk@fabiankeil.de>
Sat, 22 Nov 2008 11:54:04 +0000
(11:54 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Sat, 22 Nov 2008 11:54:04 +0000
(11:54 +0000)
gateway.c
patch
|
blob
|
history
diff --git
a/gateway.c
b/gateway.c
index
781a4ad
..
2d3a491
100644
(file)
--- a/
gateway.c
+++ b/
gateway.c
@@
-1,4
+1,4
@@
-const char gateway_rcs[] = "$Id: gateway.c,v 1.4
2 2008/11/13 09:08:42
fabiankeil Exp $";
+const char gateway_rcs[] = "$Id: gateway.c,v 1.4
3 2008/11/13 09:15:51
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/gateway.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/gateway.c,v $
@@
-34,6
+34,9
@@
const char gateway_rcs[] = "$Id: gateway.c,v 1.42 2008/11/13 09:08:42 fabiankeil
*
* Revisions :
* $Log: gateway.c,v $
*
* Revisions :
* $Log: gateway.c,v $
+ * Revision 1.43 2008/11/13 09:15:51 fabiankeil
+ * Make keep_alive_timeout static.
+ *
* Revision 1.42 2008/11/13 09:08:42 fabiankeil
* Add new config option: keep-alive-timeout.
*
* Revision 1.42 2008/11/13 09:08:42 fabiankeil
* Add new config option: keep-alive-timeout.
*
@@
-885,13
+888,7
@@
jb_socket forwarded_connect(const struct forward_spec * fwd,
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
sfd = get_reusable_connection(http, fwd);
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
sfd = get_reusable_connection(http, fwd);
- if (JB_INVALID_SOCKET == sfd)
- {
- log_error(LOG_LEVEL_CONNECT,
- "No reusable socket for %s:%d found. Opening a new one.",
- http->host, http->port);
- }
- else
+ if (JB_INVALID_SOCKET != sfd)
{
return sfd;
}
{
return sfd;
}
@@
-930,6
+927,13
@@
jb_socket forwarded_connect(const struct forward_spec * fwd,
"SOCKS4 impossible internal error - bad SOCKS type.");
}
"SOCKS4 impossible internal error - bad SOCKS type.");
}
+ if (JB_INVALID_SOCKET != sfd)
+ {
+ log_error(LOG_LEVEL_CONNECT,
+ "Created new connection to %s:%d on socket %d.",
+ http->host, http->port, sfd);
+ }
+
return sfd;
}
return sfd;
}