You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2010/10/12 16:49:14 UTC
svn commit: r1021785 - in /trafficserver/traffic/trunk:
iocore/net/P_UnixNetVConnection.h proxy/http2/HttpSM.cc
Author: amc
Date: Tue Oct 12 14:49:14 2010
New Revision: 1021785
URL: http://svn.apache.org/viewvc?rev=1021785&view=rev
Log:
Applying patch for TS-480.
Modified:
trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h
trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
Modified: trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h?rev=1021785&r1=1021784&r2=1021785&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h Tue Oct 12 14:49:14 2010
@@ -50,7 +50,7 @@ NetVCOptions::reset()
local_addr = 0;
addr_binding = ANY_ADDR;
f_blocking = false;
- f_blocking_connect = true;
+ f_blocking_connect = false;
socks_support = NORMAL_SOCKS;
socks_version = SOCKS_DEFAULT_VERSION;
socket_recv_bufsize =
Modified: trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc?rev=1021785&r1=1021784&r2=1021785&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpSM.cc Tue Oct 12 14:49:14 2010
@@ -4243,6 +4243,7 @@ HttpSM::do_http_server_open(bool raw)
HSMresult_t shared_result;
NetVCOptions opt;
+ opt.f_blocking_connect = false;
opt.set_sock_param(t_state.http_config_param->sock_recv_buffer_size_out,
t_state.http_config_param->sock_send_buffer_size_out,
t_state.http_config_param->sock_option_flag_out);