You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2011/12/17 19:37:45 UTC
svn commit: r1215550 - in /trafficserver/traffic/trunk: cop/TrafficCop.cc
iocore/net/P_UnixNet.h
Author: zwoop
Date: Sat Dec 17 18:37:45 2011
New Revision: 1215550
URL: http://svn.apache.org/viewvc?rev=1215550&view=rev
Log:
TS-992 Guard against missing ENOSR and EPROTO definitions.
Author: Piotr Sikora
Review: Leif
Modified:
trafficserver/traffic/trunk/cop/TrafficCop.cc
trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
Modified: trafficserver/traffic/trunk/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/cop/TrafficCop.cc?rev=1215550&r1=1215549&r2=1215550&view=diff
==============================================================================
--- trafficserver/traffic/trunk/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/trunk/cop/TrafficCop.cc Sat Dec 17 18:37:45 2011
@@ -442,7 +442,7 @@ transient_error(int error, int wait_ms)
#ifdef ENOBUFS
case ENOBUFS:
#endif
-#if !defined(freebsd) && !defined(darwin)
+#if defined(ENOSR) && !defined(freebsd) && !defined(darwin)
case ENOSR:
#endif
if (wait_ms)
Modified: trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h?rev=1215550&r1=1215549&r2=1215550&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UnixNet.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UnixNet.h Sat Dec 17 18:37:45 2011
@@ -390,7 +390,7 @@ accept_error_seriousness(int res)
return 1;
case -EMFILE:
case -ENOMEM:
-#if !defined(freebsd)
+#if defined(ENOSR) && !defined(freebsd)
case -ENOSR:
#endif
ink_assert(!"throttling misconfigured: set too high");
@@ -404,7 +404,7 @@ accept_error_seriousness(int res)
case -EINTR:
ink_assert(!"should be handled at a lower level");
return 0;
-#if !defined(freebsd)
+#if defined(EPROTO) && !defined(freebsd)
case -EPROTO:
#endif
case -EOPNOTSUPP: