[PR #1143] [MERGED] Merge fix empty option at end of edns #2006

New issue

Closed

opened 2026-03-16 04:24:35 +03:00 by kerem · 0 comments

kerem commented

2026-03-16 04:24:35 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hickory-dns/hickory-dns/pull/1143
Author: @bluejekyll
Created: 6/21/2020
Status: ✅ Merged
Merged: 6/21/2020
Merged by: @bluejekyll

Base: main ← Head: merge-fix-empty-option-at-end-of-edns

📝 Commits (3)

b9af6d6 Do not fail on parsing an empty Option within an EDNS record
02f5755 Only use minimal feature set from futures
68e75fc Merge branch 'fix-empty-option-at-end-of-edns' of https://github.com/jonasbb/trust-dns into merge-fix-empty-option-at-end-of-edns

📊 Changes

1 file changed (+41 additions, -6 deletions)

View changed files

📝 crates/proto/src/rr/rdata/opt.rs (+41 -6)

📄 Description

Close: #744
Fixes: #1138

Not sure why the other PR paused. After reviewing it those changes were fine, and the last question didn't need to be answered as it was just a style question. So I'll be merging as is.

This branch fixes the merge conflict.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/hickory-dns/hickory-dns/pull/1143 **Author:** [@bluejekyll](https://github.com/bluejekyll) **Created:** 6/21/2020 **Status:** ✅ Merged **Merged:** 6/21/2020 **Merged by:** [@bluejekyll](https://github.com/bluejekyll) **Base:** `main` ← **Head:** `merge-fix-empty-option-at-end-of-edns` --- ### 📝 Commits (3) - [`b9af6d6`](https://github.com/hickory-dns/hickory-dns/commit/b9af6d64c608c7b45f8d03af5e1a5c079699f9b1) Do not fail on parsing an empty Option within an EDNS record - [`02f5755`](https://github.com/hickory-dns/hickory-dns/commit/02f5755308a43bc5fe1e6c17dce213ca582539bf) Only use minimal feature set from futures - [`68e75fc`](https://github.com/hickory-dns/hickory-dns/commit/68e75fcfff41895f70f9cab0e850027b356f4f44) Merge branch 'fix-empty-option-at-end-of-edns' of https://github.com/jonasbb/trust-dns into merge-fix-empty-option-at-end-of-edns ### 📊 Changes **1 file changed** (+41 additions, -6 deletions) <details> <summary>View changed files</summary> 📝 `crates/proto/src/rr/rdata/opt.rs` (+41 -6) </details> ### 📄 Description Close: #744 Fixes: #1138 Not sure why the other PR paused. After reviewing it those changes were fine, and the last question didn't need to be answered as it was just a style question. So I'll be merging as is. This branch fixes the merge conflict. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>