This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.1.x by this push:
new 9c8deac Adjust vc read errors (#7923)
9c8deac is described below
commit 9c8deacff37cb8508b9e504303ed77ddd6cbae22
Author: Susan Hinrichs <[email protected]>
AuthorDate: Mon Jun 7 20:03:42 2021 -0500
Adjust vc read errors (#7923)
* Adjust vc read errors
* Adjust assert assumptions
* Try adjusting the read error again
* Remove the error signalling on read completely
(cherry picked from commit b62da7d71546f13bee2f6e721428849a95eae3b5)
---
iocore/net/UnixNetVConnection.cc | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index 7b297a7..d1f6d9f 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -199,12 +199,6 @@ read_from_net(NetHandler *nh, UnixNetVConnection *vc,
EThread *thread)
return;
}
- if (vc->has_error()) {
- vc->lerrno = vc->error;
- vc->readSignalAndUpdate(VC_EVENT_ERROR);
- return;
- }
-
// It is possible that the closed flag got set from HttpSessionManager in the
// global session pool case. If so, the closed flag should be stable once
we get the
// s->vio.mutex (the global session pool mutex).
@@ -330,6 +324,7 @@ read_from_net(NetHandler *nh, UnixNetVConnection *vc,
EThread *thread)
}
}
}
+
// If here are is no more room, or nothing to do, disable the connection
if (s->vio.ntodo() <= 0 || !s->enabled || !buf.writer()->write_avail()) {
read_disable(nh, vc);