You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ji...@apache.org on 2011/09/23 20:44:51 UTC
svn commit: r1174948 - in /trafficserver/traffic/branches/3.0.x: STATUS
iocore/net/SSLNetVConnection.cc iocore/net/UnixNetVConnection.cc
Author: jim
Date: Fri Sep 23 18:44:50 2011
New Revision: 1174948
URL: http://svn.apache.org/viewvc?rev=1174948&view=rev
Log:
Merge r1155125 from trunk:
TS-888: fix SSL by enabling the right direction on successful setup.
Submitted by: jplevyak
Reviewed/backported by: jim
Modified:
trafficserver/traffic/branches/3.0.x/STATUS
trafficserver/traffic/branches/3.0.x/iocore/net/SSLNetVConnection.cc
trafficserver/traffic/branches/3.0.x/iocore/net/UnixNetVConnection.cc
Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1174948&r1=1174947&r2=1174948&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Fri Sep 23 18:44:50 2011
@@ -44,11 +44,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
Jira: https://issues.apache.org/jira/browse/TS-730
+1: igalic, zwoop, jim
- *) SSL: it's pretty much totally busted, a miracle that it works.
- Trunk patch: http://svn.apache.org/viewvc?view=rev&revision=1155125
- Jira: https://issues.apache.org/jira/browse/TS-888
- +1: zwoop, igalic, jim
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: trafficserver/traffic/branches/3.0.x/iocore/net/SSLNetVConnection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/iocore/net/SSLNetVConnection.cc?rev=1174948&r1=1174947&r2=1174948&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/iocore/net/SSLNetVConnection.cc (original)
+++ trafficserver/traffic/branches/3.0.x/iocore/net/SSLNetVConnection.cc Fri Sep 23 18:44:50 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/branches/3.0.x/iocore/net/UnixNetVConnection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/iocore/net/UnixNetVConnection.cc?rev=1174948&r1=1174947&r2=1174948&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/iocore/net/UnixNetVConnection.cc (original)
+++ trafficserver/traffic/branches/3.0.x/iocore/net/UnixNetVConnection.cc Fri Sep 23 18:44:50 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;