Module Name: src
Committed By: christos
Date: Sun Feb 25 20:04:56 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder: prepare-import.sh
src/external/apache2/mDNSResponder/dist/mDNSCore: mDNS.c
mDNSEmbeddedAPI.h uDNS.c
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
src/external/apache2/mDNSResponder/dist/mDNSShared: dns_sd.h
Log Message:
merge conflicts; also:
- Do the reuse-port first like MacOS/X otherwise we can't bind
- Disable SO_RECV_ANYIF hack
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/apache2/mDNSResponder/prepare-import.sh
cvs rdiff -u -r1.8 -r1.9 \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/apache2/mDNSResponder/dist/mDNSCore/uDNS.c
cvs rdiff -u -r1.14 -r1.15 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
