#
#
# patch "src/server_manager.cc"
#  from [8687f611e8ce3b9093c3b0b4161568f79aa9eb0b]
#    to [f56b78561e089b0fa5a944d216b2696412f7b789]
# 
# patch "test/run-tests.sh"
#  from [e729c2ca845fbe9f6c34fe20b14ea3a153ca10ba]
#    to [788d4990135232caa3177afe126c4e90a0074b3f]
#
============================================================
--- src/server_manager.cc	8687f611e8ce3b9093c3b0b4161568f79aa9eb0b
+++ src/server_manager.cc	f56b78561e089b0fa5a944d216b2696412f7b789
@@ -35,6 +35,16 @@ server_manager::set_opts(map<string, vec
   opts = o;
 }
 
+namespace {
+  string lowercase(string const & in)
+  {
+    string out;
+    std::transform(in.begin(), in.end(),
+		   std::back_inserter(out), &tolower);
+    return out;
+  }
+}
+
 void
 server_manager::add_replace_server(shared_ptr<server> srv, serverdata const &dat)
 {
@@ -42,7 +52,7 @@ server_manager::add_replace_server(share
   by_name.insert(make_pair(dat.name, srv));
   for (set<string>::iterator i = dat.hosts.begin();
        i != dat.hosts.end(); ++i)
-    by_host.insert(make_pair(*i, srv));
+    by_host.insert(make_pair(lowercase(*i), srv));
   for (set<string>::iterator i = dat.patterns.begin();
        i != dat.patterns.end(); ++i)
     by_pattern.insert(make_pair(*i, srv));
@@ -66,7 +76,7 @@ server_manager::delist_server(shared_ptr
   for (set<string>::iterator j = sd.hosts.begin();
        j != sd.hosts.end(); ++j)
     {
-      i = by_host.find(*j);
+      i = by_host.find(lowercase(*j));
       if (i != by_host.end())
         by_host.erase(i);
     }
@@ -121,7 +131,8 @@ server_manager::reload_servers()
         }
       serverdata sd;
       sd.name = ss.name;
-      sd.hosts = ss.hosts;
+      std::transform(ss.hosts.begin(), ss.hosts.end(),
+		     std::inserter(sd.hosts, sd.hosts.end()), &lowercase);
       sd.patterns = ss.patterns;
       if (preexist)
         {
@@ -167,7 +178,7 @@ server_manager::find_server(string const
 {
   shared_ptr<server> srv;
   if (!host.empty() && !by_host.empty())
-    srv = find_by_prefix(by_host, host);
+    srv = find_by_prefix(by_host, lowercase(host));
   if (!srv && !pattern.empty() && !by_pattern.empty())
     srv = find_by_prefix(by_pattern, pattern);
   return srv;
============================================================
--- test/run-tests.sh	e729c2ca845fbe9f6c34fe20b14ea3a153ca10ba
+++ test/run-tests.sh	788d4990135232caa3177afe126c4e90a0074b3f
@@ -64,7 +64,7 @@ for test_name in $(ls $SRCDIR/test/); do
 EXIT_STATUS=0
 
 for test_name in $(ls $SRCDIR/test/); do
-    if [ -d $SRCDIR/test/$test_name ]; then
+    if [ -d $SRCDIR/test/$test_name -a "$test_name" != "confdir" ]; then
         echo "Running test $test_name..."
         TEST_SRC=$SRCDIR/test/$test_name
         cd $TESTDIR