Merge pull request #2336 from getnikola/fix-2331

Fix #2331 -- fix folder handling/redirects in auto

CHANGES.txt

@@ -23,6 +23,7 @@ Features
 Bugfixes
 --------
 
+* Fix folder handling and redirects in ``nikola auto`` (Issue #2331)
 * Use state files in ``nikola github_deploy`` and ``nikola status``
   (Issue #2317)
 * Add ``align`` options for ``youtube``, ``vimeo``, ``soundcloud``

nikola/plugins/command/auto/__init__.py

@@ -302,8 +302,8 @@ def serve_static(self, environ, start_response):
         mimetype = 'text/html' if uri.endswith('/') else mimetypes.guess_type(uri)[0] or 'application/octet-stream'
 
         if os.path.isdir(f_path):
-            if not f_path.endswith('/'):  # Redirect to avoid breakage
-                start_response('301 Redirect', [('Location', p_uri.path + '/')])
+            if not p_uri.path.endswith('/'):  # Redirect to avoid breakage
+                start_response('301 Moved Permanently', [('Location', p_uri.path + '/')])
                 return []
             f_path = os.path.join(f_path, self.site.config['INDEX_FILE'])
             mimetype = 'text/html'