← Back to branch summary

~ubuntu-branches/ubuntu/maverick/tomcat6/maverick

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/authenticator/BasicAuthenticator.java

  • Committer: Bazaar Package Importer
  • Author(s): Torsten Werner
  • Date: 2010-06-28 21:41:31 UTC
  • mfrom: (2.2.15 sid)
  • Revision ID: james.westby@ubuntu.com-20100628214131-3wktukpb3lgdf83h
Tags: 6.0.26-5
http://bugs.debian.org/587447
* Convert patches to dep3 format.
* Backport security fix from trunk to fix CVE-2010-1157. (Closes: #587447)
* Set urgency to medium due to the security fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/catalina/authenticator/BasicAuthenticator.java
194
194
        CharChunk authenticateCC = authenticate.getCharChunk();
195
195
        authenticateCC.append("Basic realm=\"");
196
196
        if (config.getRealmName() == null) {
197
 
            authenticateCC.append(request.getServerName());
198
 
            authenticateCC.append(':');
199
 
            authenticateCC.append(Integer.toString(request.getServerPort()));
 
197
            authenticateCC.append(REALM_NAME);
200
198
        } else {
201
199
            authenticateCC.append(config.getRealmName());
202
200
        }