trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1096575 - in /trafficserver/traffic/trunk: lib/ts/ink_cap.cc proxy/http/HttpTransact.cc
Date Mon, 25 Apr 2011 19:51:58 GMT
Author: amc
Date: Mon Apr 25 19:51:58 2011
New Revision: 1096575

URL: http://svn.apache.org/viewvc?rev=1096575&view=rev
Log:
TS-748 tweaks

Modified:
    trafficserver/traffic/trunk/lib/ts/ink_cap.cc
    trafficserver/traffic/trunk/proxy/http/HttpTransact.cc

Modified: trafficserver/traffic/trunk/lib/ts/ink_cap.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_cap.cc?rev=1096575&r1=1096574&r2=1096575&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_cap.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_cap.cc Mon Apr 25 19:51:58 2011
@@ -18,10 +18,10 @@ DebugCapabilities(char const* tag) {
     Debug(tag,
       "uid=%u, gid=%u, euid=%u, egid=%u"
 # if TS_USE_POSIX_CAP
-      ", caps %s thread 0x%x",
+      ", caps %s thread 0x%x"
 # endif
-      (unsigned)getuid(), (unsigned)getgid(),
-      (unsigned)geteuid(), (unsigned)getegid()
+      ,(unsigned)getuid(), (unsigned)getgid()
+      ,(unsigned)geteuid(), (unsigned)getegid()
 # if TS_USE_POSIX_CAP
       ,caps_text
       ,pthread_self()
@@ -37,7 +37,11 @@ DebugCapabilities(char const* tag) {
 
 int
 PreserveCapabilities() {
-  return prctl(PR_SET_KEEPCAPS, 1);
+  int zret = 0;
+# if TS_USE_POSIX_CAP
+  zret = prctl(PR_SET_KEEPCAPS, 1);
+# endif
+  return zret;
 }
 
 // Adjust the capabilities to only those needed.

Modified: trafficserver/traffic/trunk/proxy/http/HttpTransact.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpTransact.cc?rev=1096575&r1=1096574&r2=1096575&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpTransact.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpTransact.cc Mon Apr 25 19:51:58 2011
@@ -3762,7 +3762,7 @@ HttpTransact::retry_server_connection_no
   ink_debug_assert(s->current.attempts <= max_retries);
   ink_debug_assert(s->current.server->connect_failure != 0);
 
-  char *url_string = s->hdr_info.client_request.url_string_get(&s->arena) : NULL;
+  char *url_string = s->hdr_info.client_request.url_string_get(&s->arena);
 
   Debug("http_trans", "[%d] failed to connect [%d] to %u.%u.%u.%u", s->current.attempts,
conn_state,
         PRINT_IP(s->current.server->ip));



Mime
View raw message