← Back to branch summary

~ubuntu-branches/ubuntu/natty/tomcat6/natty-proposed

« back to all changes in this revision

Viewing changes to java/org/apache/coyote/http11/Http11Processor.java

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez
  • Date: 2010-05-21 13:51:15 UTC
  • mfrom: (2.2.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100521135115-qfwnf24lzvi3644v
Tags: 6.0.26-2
http://bugs.debian.org/581018
https://launchpad.net/bugs/557300
https://launchpad.net/bugs/569118
* debian/tomcat6.{postinst,prerm}: Respect TOMCAT6_USER and TOMCAT6_GROUP
  as defined in /etc/default/tomcat6 when setting directory permissions and
  authbind configuration (Closes: #581018, LP: #557300)
* debian/tomcat6.postinst: Use group "tomcat6" instead of "adm" for
  permissions in /var/lib/tomcat6, so that group "adm" doesn't get write
  permissions over /var/lib/tomcat6/webapps (LP: #569118)

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/coyote/http11/Http11Processor.java
1562
1562
            outputBuffer.addActiveFilter(outputFilters[Constants.GZIP_FILTER]);
1563
1563
            headers.setValue("Content-Encoding").setString("gzip");
1564
1564
            // Make Proxies happy via Vary (from mod_deflate)
1565
 
            headers.setValue("Vary").setString("Accept-Encoding");
 
1565
            MessageBytes vary = headers.getValue("Vary");
 
1566
            if (vary == null) {
 
1567
                // Add a new Vary header
 
1568
                headers.setValue("Vary").setString("Accept-Encoding");
 
1569
            } else if (vary.equals("*")) {
 
1570
                // No action required
 
1571
            } else {
 
1572
                // Merge into current header
 
1573
                headers.setValue("Vary").setString(
 
1574
                        vary.getString() + ",Accept-Encoding");
 
1575
            }
1566
1576
        }
1567
1577
 
1568
1578
        // Add date header