You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2011/06/21 12:25:41 UTC
svn commit: r1137936 - in /trafficserver/traffic/branches/3.0.x: ./ CHANGES
STATUS iocore/net/UnixNetProcessor.cc
Author: igalic
Date: Tue Jun 21 10:25:41 2011
New Revision: 1137936
URL: http://svn.apache.org/viewvc?rev=1137936&view=rev
Log:
Backport [TS-847], this fixes a bad timeout when using the CONNECT method.
Modified:
trafficserver/traffic/branches/3.0.x/ (props changed)
trafficserver/traffic/branches/3.0.x/CHANGES
trafficserver/traffic/branches/3.0.x/STATUS
trafficserver/traffic/branches/3.0.x/iocore/net/UnixNetProcessor.cc
Propchange: trafficserver/traffic/branches/3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 21 10:25:41 2011
@@ -1,4 +1,4 @@
/incubator/trafficserver/traffic/branches/dev:891823-915885
/trafficserver/traffic/branches/ts-291:965529-991993
/trafficserver/traffic/branches/wccp:1021790-1040544
-/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071
+/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1137844,1137846
Modified: trafficserver/traffic/branches/3.0.x/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/CHANGES?rev=1137936&r1=1137935&r2=1137936&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/CHANGES (original)
+++ trafficserver/traffic/branches/3.0.x/CHANGES Tue Jun 21 10:25:41 2011
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.0.0
+ *) [TS-847] Bad timeout when using CONNECT method.
+
*) [TS-827] TSMimeHdrFieldValueStringInsert() can use freed memory to
edit headers. Author: William Bardwell.
Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1137936&r1=1137935&r2=1137936&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Tue Jun 21 10:25:41 2011
@@ -66,11 +66,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Jira: https://issues.apache.org/jira/browse/TS-826
+1: zwoop, zym
- * net: Bad timeout when using CONNECT method
- Trunk patch: http://svn.apache.org/viewvc?rev=1137844&view=rev
- Jira: https://issues.apache.org/jira/browse/TS-847
- +1: zwoop, zym, igalic
-
RELEASE PROCESS
Modified: trafficserver/traffic/branches/3.0.x/iocore/net/UnixNetProcessor.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/iocore/net/UnixNetProcessor.cc?rev=1137936&r1=1137935&r2=1137936&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/iocore/net/UnixNetProcessor.cc (original)
+++ trafficserver/traffic/branches/3.0.x/iocore/net/UnixNetProcessor.cc Tue Jun 21 10:25:41 2011
@@ -390,7 +390,7 @@ struct CheckConnect:public Continuation
int _timeout, NetVCOptions * opt)
{
action_ = cont;
- timeout = HRTIME_MSECONDS(_timeout);
+ timeout = HRTIME_SECONDS(_timeout);
recursion++;
netProcessor.connect_re(this, ip, port, opt);
recursion--;