Author: zwoop
Date: Mon Apr 18 18:07:41 2011
New Revision: 1094678
URL: http://svn.apache.org/viewvc?rev=1094678&view=rev
Log:
TS-742 assert triggered wrongly
Modified:
trafficserver/traffic/trunk/proxy/http/HttpTunnel.cc
Modified: trafficserver/traffic/trunk/proxy/http/HttpTunnel.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpTunnel.cc?rev=1094678&r1=1094677&r2=1094678&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpTunnel.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpTunnel.cc Mon Apr 18 18:07:41
2011
@@ -955,7 +955,7 @@ HttpTunnel::producer_handler_dechunked(i
};
// Since we will consume all the data if the server is actually finished
// we don't have to translate events like we do in the
- // case producer_hander_chunked()
+ // case producer_handler_chunked()
return event;
}
@@ -1051,7 +1051,7 @@ bool HttpTunnel::producer_handler(int ev
event = producer_handler_dechunked(event, p);
// If we were in PRECOMPLETE when this function was called
- // and we are doing chuncking, then we just wrote the last
+ // and we are doing chunking, then we just wrote the last
// chunk in the the function call above. We are done with the
// tunnel.
if (event == HTTP_TUNNEL_EVENT_PRECOMPLETE) {
@@ -1082,11 +1082,10 @@ bool HttpTunnel::producer_handler(int ev
}
} //end of added logic for partial copy of POST
-
Debug("http_redirect", "[HttpTunnel::producer_handler] enable_redirection:
[%d %d %d] event: %d",
p->alive == true, sm->enable_redirection, (p->self_consumer &&
p->self_consumer->alive == true), event);
- ink_assert(p->alive == true || event == HTTP_TUNNEL_EVENT_PRECOMPLETE ||
sm->enable_redirection ||
- (p->self_consumer && p->self_consumer->alive == true));
+ ink_assert(p->alive == true || event == HTTP_TUNNEL_EVENT_PRECOMPLETE ||
event == VC_EVENT_EOS ||
+ sm->enable_redirection || (p->self_consumer &&
p->self_consumer->alive == true));
switch (event) {
case VC_EVENT_READ_READY:
