Merge "[FileBackend] Bumped Swift auth caching TTL."

diff --combined includes/filebackend/SwiftFileBackend.php
index e545b94,fb385de..960d71c
--- 1/includes/filebackend/SwiftFileBackend.php
--- 2/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@@ -111,7 -111,7 +111,7 @@@ class SwiftFileBackend extends FileBack
                        : false;
                $this->swiftCDNExpiry = isset( $config['swiftCDNExpiry'] )
                        ? $config['swiftCDNExpiry']
-                       : 3600; // hour
+                       : 12*3600; // 12 hours is safe (tokens last 24 hours per http://docs.openstack.org)
                $this->swiftCDNPurgable = isset( $config['swiftCDNPurgable'] )
                        ? $config['swiftCDNPurgable']
                        : true;
@@@ -852,13 -852,13 +852,13 @@@
                                                // See function "create_container_table" in common/db.py.
                                                // If a directory is not "greater" than the last one,
                                                // then it was already listed by the calling iterator.
 -                                              if ( $objectDir > $lastDir ) {
 +                                              if ( strcmp( $objectDir, $lastDir ) > 0 ) {
                                                        $pDir = $objectDir;
                                                        do { // add dir and all its parent dirs
                                                                $dirs[] = "{$pDir}/";
                                                                $pDir = $this->getParentDir( $pDir );
                                                        } while ( $pDir !== false // sanity
 -                                                              && $pDir > $lastDir // not done already
 +                                                              && strcmp( $pDir, $lastDir ) > 0 // not done already
                                                                && strlen( $pDir ) > strlen( $dir ) // within $dir
                                                        );
                                                }