You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@locus.apache.org on 2000/10/08 08:05:22 UTC
cvs commit: apache-2.0/src/modules/proxy proxy_util.c
wrowe 00/10/07 23:05:22
Modified: src/modules/proxy proxy_util.c
Log:
Missed it, a rather messy canonical error example.
Revision Changes Path
1.20 +5 -6 apache-2.0/src/modules/proxy/proxy_util.c
Index: proxy_util.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_util.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- proxy_util.c 2000/10/08 03:23:05 1.19
+++ proxy_util.c 2000/10/08 06:05:22 1.20
@@ -1145,14 +1145,13 @@
}
for(;;)
{
- switch(apr_connect(sock, host))
- {
- case APR_EINTR:
+ apr_status_t rv = apr_connect(sock, host);
+ if (APR_STATUS_IS_EINTR(rv))
continue;
- case APR_SUCCESS:
+ else if (rv == APR_SUCCESS)
return 0;
- default:
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "proxy connect to %s port %d failed", host, port);
+ else {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "proxy connect to %s port %d failed", host, port);
return -1;
}
}