This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 191cddf57c5fd3b18bac747e54cd4599f9015866 Author: Masakazu Kitajo <[email protected]> AuthorDate: Mon Mar 4 10:54:42 2024 -0700 http3: Propagate edata as well (#11121) (cherry picked from commit 1d58cd4512f65fe60a1fe8e6381c2f3227b5433f) --- include/proxy/http3/Http3Transaction.h | 2 +- src/proxy/http3/Http3Session.cc | 2 +- src/proxy/http3/Http3Transaction.cc | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/proxy/http3/Http3Transaction.h b/include/proxy/http3/Http3Transaction.h index 3db3ac1d6d..8db5f09f07 100644 --- a/include/proxy/http3/Http3Transaction.h +++ b/include/proxy/http3/Http3Transaction.h @@ -84,7 +84,7 @@ protected: void _schedule_write_complete_event(); void _unschedule_write_complete_event(); void _close_write_complete_event(Event *e); - void _signal_event(int event); + void _signal_event(int event, Event *e); void _signal_read_event(); void _signal_write_event(); void _delete_if_possible(); diff --git a/src/proxy/http3/Http3Session.cc b/src/proxy/http3/Http3Session.cc index 14ce9c18c4..48d8615735 100644 --- a/src/proxy/http3/Http3Session.cc +++ b/src/proxy/http3/Http3Session.cc @@ -164,7 +164,7 @@ HQSession::main_event_handler(int event, void *edata) this->do_io_close(); for (HQTransaction *t = this->_transaction_list.head; t; t = static_cast<HQTransaction *>(t->link.next)) { SCOPED_MUTEX_LOCK(lock, t->mutex, this_ethread()); - t->handleEvent(event); + t->handleEvent(event, edata); } break; } diff --git a/src/proxy/http3/Http3Transaction.cc b/src/proxy/http3/Http3Transaction.cc index a2c96ec23a..99953d5e49 100644 --- a/src/proxy/http3/Http3Transaction.cc +++ b/src/proxy/http3/Http3Transaction.cc @@ -346,15 +346,15 @@ HQTransaction::_close_write_complete_event(Event *e) } void -HQTransaction::_signal_event(int event) +HQTransaction::_signal_event(int event, Event *edata) { if (this->_write_vio.cont) { SCOPED_MUTEX_LOCK(lock, this->_write_vio.mutex, this_ethread()); - this->_write_vio.cont->handleEvent(event); + this->_write_vio.cont->handleEvent(event, edata); } if (this->_read_vio.cont && this->_read_vio.cont != this->_write_vio.cont) { SCOPED_MUTEX_LOCK(lock, this->_read_vio.mutex, this_ethread()); - this->_read_vio.cont->handleEvent(event); + this->_read_vio.cont->handleEvent(event, edata); } } @@ -503,7 +503,7 @@ Http3Transaction::state_stream_open(int event, Event *edata) case VC_EVENT_INACTIVITY_TIMEOUT: case VC_EVENT_ACTIVE_TIMEOUT: { Http3TransVDebug("%s (%d)", get_vc_event_name(event), event); - this->_signal_event(event); + this->_signal_event(event, edata); break; } default:
