Fix DirectoryIterator when multiple wildcards are used.

Notes/VFALCO_LOG.txt

@@ -1,28 +0,0 @@
-Vinnie Falco's Change Log
-
-2013/08/07
-
-- Add 'print' test that shows all the tests
-- Improved "package.test" match string format when choosing tests to run
-
-2013/08/04
-
-- Begin reworking of socket code
-
-2013/08/01
-
-- Add beast::SemanticVersion
-- Change rippled to use SemanticVersion
-- Add runStartup to UnitTest, allowing forced tests on startup
-- Force rippled BuildInfo unit test to run on every startup
-
-2013/07/31
-
-- Add "hostname" to server_info output
-- Replace "build_version" in server_info with the actual build version
-- Remove "client_version" from server_info
-
-2013/07/30
-
-- Add FatalErrorReporter to main
-- Rewrote the build and protocol version numbering code

Notes/VFALCO_TODO.txt

@@ -8,10 +8,7 @@ Vinnie's List: Changes day to day, descending priority
   (Items marked '*' can be handled by others.)
 
 - beast::Socket integration in Ripple
-- Socket implementation for PROXY protocol
+- Configuration list for Jenkins
-- Socket that supports multiple protcols
-- Unit tests for boost::asio wrappers
-- Review boost::asio wrappers and consolidation of network code in ripple_net
 - Deeply create directories specified in config settings
 - Finish unit tests and code for Validators
 * Document the command line options for the beast unit test framework

Subtrees/beast/modules/beast_core/files/beast_DirectoryIterator.cpp

@@ -104,8 +104,8 @@ bool DirectoryIterator::next (bool* const isDirResult, bool* const isHiddenResul
                 matches = (whatToLookFor & File::findFiles) != 0;
             }
 
-            // if recursive, we're not relying on the OS iterator to do the wildcard match, so do it now..
+            // if we're not relying on the OS iterator to do the wildcard match, do it now..
-            if (matches && isRecursive)
+            if (matches && (isRecursive || wildCards.size() > 1))
                 matches = fileMatches (wildCards, filename);
 
             if (matches && (whatToLookFor & File::ignoreHiddenFiles) != 0)