Skip to content

TS-2578 Close the client connection when you close TransformTerminus #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jablko wants to merge 11 commits into from
Closed

TS-2578 Close the client connection when you close TransformTerminus #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
21e67b8
Reorder some functions so related functions are grouped together
jablko Feb 5, 2014
8240d65
Rename some variables to more easily disambiguate them
jablko Feb 5, 2014
07e418d
Copy the upstream nbytes (if known) downstream to preserve the "Conte…
jablko Feb 5, 2014
4b2a7dd
Avoid segfault in TSVIOReenable() if the client disconnected
jablko Feb 5, 2014
4f73676
Drop TSVIOBufferGet() and test TSVIOReaderGet() instead
jablko Feb 5, 2014
d43b801
I don't know what this does
jablko Feb 5, 2014
8569775
Improve comments
jablko Feb 5, 2014
274a45f
Minor edits
jablko Feb 5, 2014
943364c
TS-2553 CHANGES
jablko Feb 5, 2014
69d38bc
TS-2578 Close the client connection when you close TransformTerminus
jablko Feb 19, 2014
b08e0b8
Merge remote branch 'upstream/master'
jablko Feb 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.0.0

*) [TS-2578] Close the client connection when you close TransformTerminus

*) [TS-1893] Add more options to server session control.

*) [TS-2239] Initial ALPN TLS extension support.
Expand Down
16 changes: 6 additions & 10 deletions proxy/Transform.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,20 +251,16 @@ TransformTerminus::handle_event(int event, void * /* edata ATS_UNUSED */)
// exist).
if (m_tvc->m_closed == 0) {
if (m_closed == TS_VC_CLOSE_ABORT) {
if (m_read_vio.op == VIO::NONE) {
if (!m_called_user) {
m_called_user = 1;
m_tvc->m_cont->handleEvent(VC_EVENT_ERROR, NULL);
}
if (m_read_vio.op == VIO::NONE && !m_called_user) {
m_called_user = 1;
m_tvc->m_cont->handleEvent(VC_EVENT_ERROR, NULL);
} else {
m_read_vio._cont->handleEvent(VC_EVENT_ERROR, &m_read_vio);
}
} else {
if (m_read_vio.op == VIO::NONE) {
if (!m_called_user) {
m_called_user = 1;
m_tvc->m_cont->handleEvent(VC_EVENT_EOS, NULL);
}
if (m_read_vio.op == VIO::NONE && !m_called_user) {
m_called_user = 1;
m_tvc->m_cont->handleEvent(VC_EVENT_EOS, NULL);
} else {
m_read_vio._cont->handleEvent(VC_EVENT_EOS, &m_read_vio);
}
Expand Down