[jbossweb-commits] JBossWeb SVN: r1444 - in trunk: webapps/docs and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2010-04-21 18:28:31 -0400 (Wed, 21 Apr 2010)
New Revision: 1444
Modified:
trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
trunk/webapps/docs/changelog.xml
Log:
- Port default realm name fix (simplified).
Modified: trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
===================================================================
--- trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java 2010-04-21
16:54:16 UTC (rev 1443)
+++ trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java 2010-04-21
22:28:31 UTC (rev 1444)
@@ -193,9 +193,7 @@
CharChunk authenticateCC = authenticate.getCharChunk();
authenticateCC.append("Basic realm=\"");
if (config.getRealmName() == null) {
- authenticateCC.append(request.getServerName());
- authenticateCC.append(':');
- authenticateCC.append(Integer.toString(request.getServerPort()));
+ authenticateCC.append("Realm");
} else {
authenticateCC.append(config.getRealmName());
}
Modified: trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
===================================================================
--- trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2010-04-21
16:54:16 UTC (rev 1443)
+++ trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2010-04-21
22:28:31 UTC (rev 1444)
@@ -74,8 +74,7 @@
if (md5Helper == null)
md5Helper = MessageDigest.getInstance("MD5");
} catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
- throw new IllegalStateException();
+ throw new IllegalStateException(e);
}
}
@@ -404,8 +403,7 @@
// Get the realm name
String realmName = config.getRealmName();
if (realmName == null)
- realmName = request.getServerName() + ":"
- + request.getServerPort();
+ realmName = "Realm";
byte[] buffer = null;
synchronized (md5Helper) {
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2010-04-21 16:54:16 UTC (rev 1443)
+++ trunk/webapps/docs/changelog.xml 2010-04-21 22:28:31 UTC (rev 1444)
@@ -25,6 +25,12 @@
<fix>
<jira>165</jira>: Correct fix for <bug>42727</bug>.
(remm)
</fix>
+ <fix>
+ Remove incorrect Context.annotationsIgnored field. (remm)
+ </fix>
+ <fix>
+ Default realm name with BASIC and DIGEST. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">