Merge branch 'next' of ssh://git.code.sf.net/p/flightgear/simgear into next

simgear/io/test_HTTP.hxx

@@ -235,7 +235,6 @@ public:
         it = std::remove_if(_channels.begin(), _channels.end(), EraseIfClosed());
 
         for (typename std::vector<T*>::iterator it2 = it; it2 != _channels.end(); ++it2) {
-            _poller.removeChannel(*it2);
             delete *it2;
         }
 

simgear/io/test_repository.cxx

@@ -899,6 +899,9 @@ int main(int argc, char* argv[])
 
     testAbandonCorruptFiles(&cl);
 
+    testServer.disconnectAll();
+    cl.clearAllConnections();
+    
     testPartialUpdateBasic(&cl);
     testPartialUpdateExisting(&cl);
     testPartialUpdateWidenWhileInProgress(&cl);