release: merge back stable branch into default

docs/release-notes/release-notes-4.1.2.rst

@@ -0,0 +1,16 b''
+|RCE| 4.1.2 |RNS|
+-----------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2016-06-16
+
+Fixes
+^^^^^
+
+- ssl: fixed http middleware so it works correctly with pyramid views. This
+  fixed http -> https redirection problems on login.
+
+- ldap: fixed ldap usergroup authentication plugin so after upgrade it's
+   possible to change the settings again (EE only).

.hgtags

@@ -2,3 +2,4 b' 1bd3e92b7e2e2d2024152b34bb88dff1db544a71'
 170c5398320ea6cddd50955e88d408794c21d43a v4.0.1
 c3fe200198f5aa34cf2e4066df2881a9cefe3704 v4.1.0
 7fd5c850745e2ea821fb4406af5f4bff9b0a7526 v4.1.1
+41c87da28a179953df86061d817bc35533c66dd2 v4.1.2

docs/release-notes/release-notes.rst

@@ -9,6 +9,7 b' Release Notes'
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.1.2.rst
    release-notes-4.1.1.rst
    release-notes-4.1.0.rst
    release-notes-4.0.1.rst

rhodecode/config/middleware.py

@@ -99,9 +99,6 b' def make_app(global_conf, full_stack=Tru'
         # need any pylons stack middleware in them
         app = VCSMiddleware(app, config, appenlight_client)
 
-    # enable https redirects based on HTTP_X_URL_SCHEME set by proxy
-    app = HttpsFixup(app, config)
-
     # Establish the Registry for this application
     app = RegistryManager(app)
 
@@ -321,7 +318,11 b' def wrap_app_in_wsgi_middlewares(pyramid'
     """
     settings = config.registry.settings
 
+    # enable https redirects based on HTTP_X_URL_SCHEME set by proxy
+    pyramid_app = HttpsFixup(pyramid_app, settings)
+
     # Add RoutesMiddleware to support the pylons compatibility tween during
+
     # migration to pyramid.
     pyramid_app = RoutesMiddleware(
         pyramid_app, config.registry._pylons_compat_config['routes.map'])

rhodecode/login/views.py

@@ -154,6 +154,7 b' class LoginView(object):'
                 self.session,
                 username=form_result['username'],
                 remember=form_result['remember'])
+            log.debug('Redirecting to "%s" after login.', came_from)
             raise HTTPFound(came_from, headers=headers)
         except formencode.Invalid as errors:
             defaults = errors.value