lib/async/dns/extensions/resolv.rb in async-dns-1.2.2 vs lib/async/dns/extensions/resolv.rb in async-dns-1.2.3
- old
+ new
@@ -24,11 +24,11 @@
class DNS
class Message
# Merge the given message with this message. A number of heuristics are applied in order to ensure that the result makes sense. For example, If the current message is not recursive but is being merged with a message that was recursive, this bit is maintained. If either message is authoritive, then the result is also authoritive.
#
# Modifies the current message in place.
- def merge! (other)
+ def merge!(other)
# Authoritive Answer
@aa = @aa && other.aa
@question += other.question
@answer += other.answer
@@ -64,10 +64,9 @@
origin = Label.split(origin) if String === origin
return self.class.new(@labels + origin, absolute)
end
-
# Return the name, typically relative, without the specified origin suffix. If the origin is nil, don't change the name, but change it to absolute (as specified).
def without_origin(origin, absolute = false)
return self.class.new(@labels, absolute) if origin == nil
\ No newline at end of file