View | Details | Raw Unified | Return to bug 65433
Collapse All | Expand All

(-)a/java/org/apache/catalina/webresources/DirResourceSet.java (-3 / +5 lines)
Lines 172-180 public class DirResourceSet extends AbstractFileResourceSet { Link Here
172
                                // path that was contributed by 'f' and check
172
                                // path that was contributed by 'f' and check
173
                                // that what is left does not contain a symlink.
173
                                // that what is left does not contain a symlink.
174
                                absPath = entry.getAbsolutePath().substring(f.getAbsolutePath().length());
174
                                absPath = entry.getAbsolutePath().substring(f.getAbsolutePath().length());
175
                                canPath = entry.getCanonicalPath().substring(f.getCanonicalPath().length());
175
                                if (entry.getCanonicalPath().length() >= f.getCanonicalPath().length()) {
176
                                if (absPath.equals(canPath)) {
176
                                    canPath = entry.getCanonicalPath().substring(f.getCanonicalPath().length());
177
                                    symlink = false;
177
                                    if (absPath.equals(canPath)) {
178
                                        symlink = false;
179
                                    }
178
                                }
180
                                }
179
                            } catch (IOException ioe) {
181
                            } catch (IOException ioe) {
180
                                // Ignore the exception. Assume we have a symlink.
182
                                // Ignore the exception. Assume we have a symlink.

Return to bug 65433