mirror of
https://github.com/mageddo/dns-proxy-server.git
synced 2026-04-25 09:25:56 +03:00
[PR #658] [MERGED] Changed resolv.conf handling format to make it compatible with alpine linux #656
Labels
No labels
bug
confirmed
discussion
duplicate
enhancement
feature
feature-request
not-planned
pull-request
secondary-feature
stale
triage
waiting-feedback
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
starred/dns-proxy-server-mageddo#656
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/mageddo/dns-proxy-server/pull/658
Author: @mageddo
Created: 12/17/2025
Status: ✅ Merged
Merged: 12/17/2025
Merged by: @mageddo
Base:
master← Head:feat/594📝 Commits (10+)
779a2beAdjusts552cc25adjusts276b6d1adjusts4ab882dadjustsa79f32fadjustsdfaf4ecadjustsdf9c703adjusts05d78ebadjusts658cab8adjustsca9d75aadjusts📊 Changes
14 files changed (+710 additions, -15 deletions)
View changed files
📝
RELEASE-NOTES.md(+4 -1)📝
gradle.properties(+1 -1)📝
src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorDefault.java(+1 -1)📝
src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinux.java(+2 -2)📝
src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxResolverConfDetector.java(+1 -0)📝
src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfigurator.java(+4 -0)➕
src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfiguratorV2.java(+422 -0)📝
src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvedConfigurator.java(+2 -2)📝
src/main/java/com/mageddo/dnsproxyserver/solver/remote/mapper/ResolverMapper.java(+1 -1)📝
src/main/java/com/mageddo/net/IpAddr.java(+2 -2)📝
src/main/java/com/mageddo/net/NetExecutorWatchdog.java(+1 -1)📝
src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorDefaultTest.java(+1 -1)📝
src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java(+4 -3)➕
src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfiguratorV2Test.java(+264 -0)📄 Description
See #627
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.