Author: kkolinko
Date: Mon May 28 19:30:41 2012
New Revision: 1343369
URL: http://svn.apache.org/viewvc?rev=1343369&view=rev
Log:
Backport http://svn.apache.org/viewvc?view=revision&revision=1084103
Remove unnecessary code that makes switching to other authentication methods
difficult.
Fixes https://issues.apache.org/bugzilla/show_bug.cgi?id=52983
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/host-manager/401.jsp
tomcat/tc6.0.x/trunk/webapps/host-manager/403.jsp
tomcat/tc6.0.x/trunk/webapps/manager/401.jsp
tomcat/tc6.0.x/trunk/webapps/manager/403.jsp
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1343369&r1=1343368&r2=1343369&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon May 28 19:30:41 2012
@@ -176,6 +176,10 @@
documentation page. (rjung)
</fix>
<fix>
+ <bug>52983</bug>: Remove unnecessary code that makes switching to
+ other authentication methods difficult. (markt)
+ </fix>
+ <fix>
<bug>53158</bug>: Fix documented defaults for DBCP.
Patch provided by ph.dezanneau at gmail.com. (rjung)
</fix>
Modified: tomcat/tc6.0.x/trunk/webapps/host-manager/401.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/401.jsp?rev=1343369&r1=1343368&r2=1343369&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/host-manager/401.jsp (original)
+++ tomcat/tc6.0.x/trunk/webapps/host-manager/401.jsp Mon May 28 19:30:41 2012
@@ -14,9 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%
- response.setHeader("WWW-Authenticate", "Basic realm=\"Tomcat Host Manager
Application\"");
-%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
<html>
<head>
Modified: tomcat/tc6.0.x/trunk/webapps/host-manager/403.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/403.jsp?rev=1343369&r1=1343368&r2=1343369&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/host-manager/403.jsp (original)
+++ tomcat/tc6.0.x/trunk/webapps/host-manager/403.jsp Mon May 28 19:30:41 2012
@@ -14,9 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%
- response.setHeader("WWW-Authenticate", "Basic realm=\"Tomcat Host Manager
Application\"");
-%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
<html>
<head>
Modified: tomcat/tc6.0.x/trunk/webapps/manager/401.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/401.jsp?rev=1343369&r1=1343368&r2=1343369&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/manager/401.jsp (original)
+++ tomcat/tc6.0.x/trunk/webapps/manager/401.jsp Mon May 28 19:30:41 2012
@@ -14,9 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%
- response.setHeader("WWW-Authenticate", "Basic realm=\"Tomcat Manager
Application\"");
-%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
<html>
<head>
Modified: tomcat/tc6.0.x/trunk/webapps/manager/403.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/403.jsp?rev=1343369&r1=1343368&r2=1343369&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/manager/403.jsp (original)
+++ tomcat/tc6.0.x/trunk/webapps/manager/403.jsp Mon May 28 19:30:41 2012
@@ -14,9 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%
- response.setHeader("WWW-Authenticate", "Basic realm=\"Tomcat Manager
Application\"");
-%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
<html>
<head>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
