Changeset 51099 in webkit

Timestamp:

Nov 17, 2009 5:12:50 PM (14 years ago)

Author:

mrowe@apple.com

Message:

<​http://webkit.org/b/31603> WebSocket server is confused if WebKit tests run from within /tmp on Mac OS X

Reviewed by Alexey Proskuryakov.

• pywebsocket/mod_pywebsocket/dispatch.py: Use os.path.realpath as it returns the canonical path of a file.

This prevents symlinks from confusing the descendant check.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• pywebsocket/mod_pywebsocket/dispatch.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-17  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        <http://webkit.org/b/31603> WebSocket server is confused if WebKit tests run from within /tmp on Mac OS X
+
+        * pywebsocket/mod_pywebsocket/dispatch.py: Use os.path.realpath as it returns the canonical path of a file.
+        This prevents symlinks from confusing the descendant check.
+
 2009-11-17  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKitTools/pywebsocket/mod_pywebsocket/dispatch.py

@@ -137 +137 @@
         if scan_dir is None:
             scan_dir = root_dir
-        if not os.path.abspath(scan_dir).startswith(os.path.abspath(root_dir)):
+        if not os.path.realpath(scan_dir).startswith(os.path.realpath(root_dir)):
             raise DispatchError('scan_dir:%s must be a directory under '
                                 'root_dir:%s.' % (scan_dir, root_dir))