trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sor...@apache.org
Subject [2/2] trafficserver git commit: TS-3074: Fix FreeBSD regression
Date Thu, 20 Nov 2014 22:56:26 GMT
TS-3074: Fix FreeBSD regression


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/10a36130
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/10a36130
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/10a36130

Branch: refs/heads/master
Commit: 10a361304cf8e121a8c6dfaf1fa0dd19089fef90
Parents: 8ad21de
Author: Phil Sorber <sorber@apache.org>
Authored: Thu Nov 20 15:55:32 2014 -0700
Committer: Phil Sorber <sorber@apache.org>
Committed: Thu Nov 20 15:55:32 2014 -0700

----------------------------------------------------------------------
 CHANGES                   | 2 ++
 lib/ts/ink_sys_control.cc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/10a36130/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 010630a..bdbc68b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.2.0
 
+  *) [TS-3074] Fix FreeBSD regression.
+
   *) [TS-3065] Remove"Transfer-Encoding" header when the error body was set by
    ATS (e.g. plugin). Author: portl4t <portl4t.cn@gmail.com>
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/10a36130/lib/ts/ink_sys_control.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_sys_control.cc b/lib/ts/ink_sys_control.cc
index 03a6bc9..770f3aa 100644
--- a/lib/ts/ink_sys_control.cc
+++ b/lib/ts/ink_sys_control.cc
@@ -51,7 +51,7 @@ ink_max_out_rlimit(int which, bool max_it, bool unlim_it)
     }
   }
 
-#if !defined(darwin)
+#if !(defined(darwin) || defined(freebsd))
   if (unlim_it) {
     ink_release_assert(getrlimit(MAGIC_CAST(which), &rl) >= 0);
     if (rl.rlim_cur != (rlim_t)RLIM_INFINITY) {


Mime
View raw message