projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename socket_is_still_usable() to socket_is_still_alive().
[privoxy.git]
/
jbsockets.c
diff --git
a/jbsockets.c
b/jbsockets.c
index
5de9a54
..
b234b20
100644
(file)
--- a/
jbsockets.c
+++ b/
jbsockets.c
@@
-1,4
+1,4
@@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.7
0 2009/12/15 17:51:14
fabiankeil Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.7
2 2010/02/15 15:14:10
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@
-176,6
+176,8
@@
jb_socket connect_to(const char *host, int portnum, struct client_state *csp)
{
log_error(LOG_LEVEL_INFO,
"Can not resolve %s: %s", host, gai_strerror(retval));
{
log_error(LOG_LEVEL_INFO,
"Can not resolve %s: %s", host, gai_strerror(retval));
+ /* XXX: Should find a better way to propagate this error. */
+ errno = EINVAL;
csp->http->host_ip_addr_str = strdup("unknown");
return(JB_INVALID_SOCKET);
}
csp->http->host_ip_addr_str = strdup("unknown");
return(JB_INVALID_SOCKET);
}
@@
-1207,9
+1209,9
@@
unsigned long resolve_hostname_to_ip(const char *host)
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
/*********************************************************************
*
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
/*********************************************************************
*
- * Function : socket_is_still_
usabl
e
+ * Function : socket_is_still_
aliv
e
*
*
- * Description :
Decides whether or not an open socket is still usabl
e.
+ * Description :
Figures out whether or not a socket is still aliv
e.
*
* Parameters :
* 1 : sfd = The socket to check.
*
* Parameters :
* 1 : sfd = The socket to check.
@@
-1217,7
+1219,7
@@
unsigned long resolve_hostname_to_ip(const char *host)
* Returns : TRUE for yes, otherwise FALSE.
*
*********************************************************************/
* Returns : TRUE for yes, otherwise FALSE.
*
*********************************************************************/
-int socket_is_still_
usabl
e(jb_socket sfd)
+int socket_is_still_
aliv
e(jb_socket sfd)
{
char buf[10];
int no_data_waiting;
{
char buf[10];
int no_data_waiting;