Merge remote-tracking branch 'upstream/master' into rake-13

Author: HarlemSquirrel

.travis.yml

@@ -7,6 +7,7 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   # optional
   - ruby-head
   - jruby-19mode

lib/net/ldap/connection.rb

@@ -710,7 +710,7 @@ def socket
   # Wrap around Socket.tcp to normalize with other Socket initializers
   class DefaultSocket
     def self.new(host, port, socket_opts = {})
-      Socket.tcp(host, port, socket_opts)
+      Socket.tcp(host, port, **socket_opts)
     end
   end
 end # class Connection

lib/net/ldap/filter.rb

@@ -755,7 +755,7 @@ def parse_paren_expression(scanner)
     # This parses a given expression inside of parentheses.
     def parse_filter_branch(scanner)
       scanner.scan(/\s*/)
-      if token = scanner.scan(/[-\w:.]*[\w]/)
+      if token = scanner.scan(/[-\w:.;]*[\w]/)
         scanner.scan(/\s*/)
         if op = scanner.scan(/<=|>=|!=|:=|=/)
           scanner.scan(/\s*/)

test/test_filter_parser.rb

@@ -21,4 +21,8 @@ def test_slash
   def test_colons
     assert_kind_of Net::LDAP::Filter, Net::LDAP::Filter::FilterParser.parse("(ismemberof=cn=edu:berkeley:app:calmessages:deans,ou=campus groups,dc=berkeley,dc=edu)")
   end
+
+  def test_attr_tag
+    assert_kind_of Net::LDAP::Filter, Net::LDAP::Filter::FilterParser.parse("(mail;[email protected])")
+  end
 end