← Back to branch summary

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

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/servlets/WebdavServlet.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/catalina/servlets/WebdavServlet.java
113
113
 * http://host:port/context/webdavedit/content
114
114
 *
115
115
 * @author Remy Maucherat
116
 
 * @version $Revision: 769338 $ $Date: 2009-04-28 13:25:01 +0200 (Di, 28. Apr 2009) $
 
116
 * @version $Revision: 915069 $ $Date: 2010-02-22 22:15:11 +0100 (Mo, 22. Feb 2010) $
117
117
 */
118
118
 
119
119
public class WebdavServlet
2033
2033
            return;
2034
2034
 
2035
2035
        CacheEntry cacheEntry = resources.lookupCache(path);
 
2036
        if (!cacheEntry.exists) {
 
2037
                // File is in directory listing but doesn't appear to exist
 
2038
                // Broken symlink or odd permission settings?
 
2039
                return;
 
2040
        }
2036
2041
 
2037
2042
        generatedXML.writeElement(null, "response", XMLWriter.OPENING);
2038
2043
        String status = new String("HTTP/1.1 " + WebdavStatus.SC_OK + " "