You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by en...@apache.org on 2010/02/24 06:22:05 UTC

svn commit: r915677 - in /sling/trunk/bundles/extensions/formauth/src/main: java/org/apache/sling/formauth/AuthenticationFormServlet.java resources/org/apache/sling/formauth/login.html

Author: enorman
Date: Wed Feb 24 05:22:04 2010
New Revision: 915677

URL: http://svn.apache.org/viewvc?rev=915677&view=rev
Log:
SLING-1116 make sure the login form action is an absolute path

Modified:
    sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java
    sling/trunk/bundles/extensions/formauth/src/main/resources/org/apache/sling/formauth/login.html

Modified: sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java?rev=915677&r1=915676&r2=915677&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java (original)
+++ sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java Wed Feb 24 05:22:04 2010
@@ -112,6 +112,7 @@
 
         form = form.replace("${resource}", getResource(request));
         form = form.replace("${j_reason}", getReason(request));
+        form = form.replace("${requestContextPath}", request.getContextPath());
 
         return form;
     }

Modified: sling/trunk/bundles/extensions/formauth/src/main/resources/org/apache/sling/formauth/login.html
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/main/resources/org/apache/sling/formauth/login.html?rev=915677&r1=915676&r2=915677&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/formauth/src/main/resources/org/apache/sling/formauth/login.html (original)
+++ sling/trunk/bundles/extensions/formauth/src/main/resources/org/apache/sling/formauth/login.html Wed Feb 24 05:22:04 2010
@@ -58,7 +58,7 @@
 
 <div id="main"><!-- Login Form -->
 <h3>Login:</h3>
-<form id="loginform" method="POST" action="j_security_check"
+<form id="loginform" method="POST" action="${requestContextPath}/j_security_check"
         enctype="multipart/form-data" accept-charset="UTF-8">
 
    <input type="hidden" name="_charset_" value="UTF-8" />