# # # patch "usher/dir_serverlist_reader.cc" # from [6194b3e367705eddb464681642044cc82688002d] # to [b94813f8a04f399a775d70b936f5f046fb4596e4] # # patch "usher/server_manager.cc" # from [5c701d81bee22a2275ea098acd51ad7c5ed6f0fb] # to [9000781536344bc6cc1bb1ecb275b5c869cac891] # ============================================================ --- usher/dir_serverlist_reader.cc 6194b3e367705eddb464681642044cc82688002d +++ usher/dir_serverlist_reader.cc b94813f8a04f399a775d70b936f5f046fb4596e4 @@ -2,6 +2,8 @@ #include #include +#include +#include using std::string; using std::vector; @@ -41,6 +43,10 @@ dir_serverlist_reader::get_next() string mydir = project_dir + "/" + ss.name; ss.local_args.push_back("--db=" + mydir + "/database"); ss.local_args.push_back("--confdir=" + mydir); + + std::string hostname; + std::transform(ss.name.begin(), ss.name.end(), + std::back_inserter(hostname), &tolower); ss.hosts.insert(ss.name + "."); return ss; } ============================================================ --- usher/server_manager.cc 5c701d81bee22a2275ea098acd51ad7c5ed6f0fb +++ usher/server_manager.cc 9000781536344bc6cc1bb1ecb275b5c869cac891 @@ -8,6 +8,8 @@ using std::make_pair; using std::make_pair; #include +#include +#include #include //#include @@ -192,8 +194,11 @@ server_manager::connect_to_server(string map >::iterator i; if (!host.empty() && !by_host.empty()) { - i = by_host.lower_bound(prefix(host, false)); - if (i != by_host.end() && i->first == prefix(host, false)) + string lower_host; + std::transform(host.begin(), host.end(), + std::back_inserter(lower_host), &tolower); + i = by_host.lower_bound(prefix(lower_host, false)); + if (i != by_host.end() && i->first == prefix(lower_host, false)) srv = i->second; } if (!srv && !pattern.empty() && !by_pattern.empty())