Merge commit 'origin/master' into switch_to_perl_mod

This commit is contained in:
Duncan Ferguson 2009-12-21 19:11:30 +00:00
commit 2a98b506db
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
0000-00-00 Duncan Ferguson <duncan_ferguson@user.sf.net> - v3.29
* Handle hostnames containing % properly (Debian bug 543368)
- Thanks to Tony Mancill for the patch
2009-12-19 Duncan Ferguson <duncan_ferguson@user.sf.net> - v3.28
* Look for usernames when adding clusters

View file

@ -967,7 +967,7 @@ sub split_hostname {
# check for correct syntax of using [<IPv6 address>]
# See http://tools.ietf.org/html/rfc2732 for more details
if ( $connect_string =~ m/^\[([\w:]+)\](?::(\d+))?$/xsm ) {
if ( $connect_string =~ m/^\[([\w:%]+)\](?::(\d+))?$/xsm ) {
logmsg( 3, 'connect_string contains IPv6 address' );
$server = $1;
$port = $2;
@ -1005,7 +1005,7 @@ sub split_hostname {
# method will warn if it cannot connect anyhow
# However, this also catchs IPv4 addresses, possibly with ports
( $server, $port )
= $connect_string =~ m/^([\w.-]+)(?::(\d+))?$/xsm;
= $connect_string =~ m/^([\w%.-]+)(?::(\d+))?$/xsm;
}
}
}