Skip to content

Restore cqssrt log field dropped by the 11-Dev merge#13337

Open
masaori335 wants to merge 1 commit into
apache:masterfrom
masaori335:restore-cqssrt-12404
Open

Restore cqssrt log field dropped by the 11-Dev merge#13337
masaori335 wants to merge 1 commit into
apache:masterfrom
masaori335:restore-cqssrt-12404

Conversation

@masaori335

Copy link
Copy Markdown
Contributor

The cqssrt (client_req_ssl_resumption_type) log field added in #12404 was silently dropped from master by the 11-Dev integration merge (#12983, 8415cef). A criss-cross merge resolution removed its registration in Log.cc and the LogAccess marshal path, while the supporting HttpUserAgent::get_client_ssl_resumption_type() machinery survived, leaving that accessor as dead code with no caller.

Re-register the field and re-add the marshal function plus the TransactionLogData bridge accessor so the orphaned machinery is wired back into the log system. Declare it as sINT (it marshals a single int), not the original dINT, matching the type/marshal-framing fix in #13223.

The cqssrt (client_req_ssl_resumption_type) log field added in apache#12404
was silently dropped from master by the 11-Dev integration merge
(apache#12983, 8415cef). A criss-cross merge resolution removed its
registration in Log.cc and the LogAccess marshal path, while the
supporting HttpUserAgent::get_client_ssl_resumption_type() machinery
survived, leaving that accessor as dead code with no caller.

Re-register the field and re-add the marshal function plus the
TransactionLogData bridge accessor so the orphaned machinery is wired
back into the log system. Declare it as sINT (it marshals a single
int), not the original dINT, matching the type/marshal-framing fix in
apache#13223.
@masaori335 masaori335 added this to the 11.0.0 milestone Jun 26, 2026
@masaori335 masaori335 requested review from bneradt and cmcfarlen June 26, 2026 02:03
@masaori335 masaori335 self-assigned this Jun 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant