You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2011/08/09 00:12:08 UTC
svn commit: r1155125 - in /trafficserver/traffic/trunk/iocore/net:
SSLNetVConnection.cc UnixNetVConnection.cc
Author: jplevyak
Date: Mon Aug 8 22:12:08 2011
New Revision: 1155125
URL: http://svn.apache.org/viewvc?rev=1155125&view=rev
Log:
TS-888: fix SSL by enabling the right direction on successful setup.
Modified:
trafficserver/traffic/trunk/iocore/net/SSLNetVConnection.cc
trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc
Modified: trafficserver/traffic/trunk/iocore/net/SSLNetVConnection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/SSLNetVConnection.cc?rev=1155125&r1=1155124&r2=1155125&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/SSLNetVConnection.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/SSLNetVConnection.cc Mon Aug 8 22:12:08 2011
@@ -204,9 +204,9 @@ SSLNetVConnection::net_read_io(NetHandle
write.triggered = 0;
nh->write_ready_list.remove(this);
} else if (ret == EVENT_DONE) {
- write.triggered = 1;
- if (write.enabled)
- nh->write_ready_list.in_or_enqueue(this);
+ read.triggered = 1;
+ if (read.enabled)
+ nh->read_ready_list.in_or_enqueue(this);
} else
readReschedule(nh);
return;
Modified: trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc?rev=1155125&r1=1155124&r2=1155125&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc Mon Aug 8 22:12:08 2011
@@ -386,9 +386,9 @@ write_to_net_io(NetHandler *nh, UnixNetV
vc->write.triggered = 0;
nh->write_ready_list.remove(vc);
} else if (ret == EVENT_DONE) {
- vc->read.triggered = 1;
- if (vc->read.enabled)
- nh->read_ready_list.in_or_enqueue(vc);
+ vc->write.triggered = 1;
+ if (vc->write.enabled)
+ nh->write_ready_list.in_or_enqueue(vc);
} else
write_reschedule(nh, vc);
return;