31603 2009-11-17 16:26:39 -0800 WebSocket server is confused if WebKit tests run from within /tmp on Mac OS X 2009-11-17 17:25:36 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 31501 1 mrowe webkit-unassigned ap yuzo oldest_to_newest 164382 0 mrowe 2009-11-17 16:26:39 -0800 On Mac OS X /tmp is a symlink to /private/tmp. If the WebSocket server is started from below this directory it gets confused and logs errors rather than serving content: mrowe@angara:/tmp/WebKit$ PYTHONPATH=WebKitTools/pywebsocket /usr/bin/python WebKitTools/pywebsocket/mod_pywebsocket/standalone.py -p 2048 -d $PWD/LayoutTests -s $PWD/LayoutTests/websocket/tests ---------------------------------------- Exception happened during processing of request from ('127.0.0.1', 50785) Traceback (most recent call last): File "/System/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/SocketServer.py", line 558, in process_request_thread self.finish_request(request, client_address) File "/System/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/SocketServer.py", line 320, in finish_request self.RequestHandlerClass(request, client_address, self) File "WebKitTools/pywebsocket/mod_pywebsocket/standalone.py", line 170, in __init__ WebSocketRequestHandler.options.scan_dir) File "/private/tmp/WebKit/WebKitTools/pywebsocket/mod_pywebsocket/dispatch.py", line 141, in __init__ 'root_dir:%s.' % (scan_dir, root_dir)) DispatchError: scan_dir:/tmp/WebKit/LayoutTests/websocket/tests must be a directory under root_dir:.. ---------------------------------------- This happens because dispatch.py uses the following code to determine if scan_dir is below root_dir: os.path.abspath(scan_dir).startswith(os.path.abspath(root_dir)) scan_dir is “/tmp/WebKit/LayoutTests/websocket/tests” and so abspath(scan_dir) evalutes to "/tmp/WebKit/LayoutTests/websocket/tests”. root_dir is “.” and so abspath(root_dir) evaluates to “/private/tmp/WebKit/LayoutTests”. I suspect this code wants to be using os.path.realpath rather than os.path.abspath. This returns the canonical version of the path and therefore is not confused by the /tmp symlink. 164386 1 43388 mrowe 2009-11-17 16:33:12 -0800 Created attachment 43388 Patch I suspect that pywebsocket is from an external source but the README doesn’t include any information about that. This patch appears to address the problem. 164397 2 43388 ap 2009-11-17 16:55:42 -0800 Comment on attachment 43388 Patch r=me 164403 3 mrowe 2009-11-17 17:13:04 -0800 Landed in r51099. 164405 4 yuzo 2009-11-17 17:25:36 -0800 Sorry for the bug and thank you for fixing. I'll fix this also upstream. ( http://code.google.com/p/pywebsocket/issues/detail?id=23 ) FYI: os.path.abspath is used also in line 65. Yuzo 43388 2009-11-17 16:33:12 -0800 2009-11-17 16:55:42 -0800 Patch 0001-http-webkit.org-b-31603-WebSocket-server-is-confused.patch text/plain 2201 mrowe RnJvbSA5YjkxYzk2ODQyY2IwY2E1MTNkNGEyOTZlMWQ0NjE4N2I1Njc1ZTVjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJrIFJvd2UgPG1yb3dlQGFwcGxlLmNvbT4KRGF0ZTogVHVl LCAxNyBOb3YgMjAwOSAxNjozMjowNSAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIDxodHRwOi8vd2Vi a2l0Lm9yZy9iLzMxNjAzPiBXZWJTb2NrZXQgc2VydmVyIGlzIGNvbmZ1c2VkIGlmIFdlYktpdCB0 ZXN0cyBydW4gZnJvbSB3aXRoaW4gL3RtcCBvbiBNYWMgT1MgWAoKUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCgoqIHB5d2Vic29ja2V0L21vZF9weXdlYnNvY2tldC9kaXNwYXRjaC5weTogVXNl IG9zLnBhdGgucmVhbHBhdGggYXMgaXQgcmV0dXJucyB0aGUgY2Fub25pY2FsIHBhdGggb2YgYSBm aWxlLgpUaGlzIHByZXZlbnRzIHN5bWxpbmtzIGZyb20gY29uZnVzaW5nIHRoZSBkZXNjZW5kYW50 IGNoZWNrLgotLS0KIFdlYktpdFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHwgICAgOSArKysrKysrKysKIC4uLi9weXdlYnNvY2tldC9tb2RfcHl3ZWJzb2NrZXQv ZGlzcGF0Y2gucHkgICAgICAgIHwgICAgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRp b25zKCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxv ZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCA1ZGY5NTdiLi5lNDE0ZWYwIDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDUgKzEsMTQgQEAKIDIwMDktMTEtMTcgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4K IAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICA8aHR0cDov L3dlYmtpdC5vcmcvYi8zMTYwMz4gV2ViU29ja2V0IHNlcnZlciBpcyBjb25mdXNlZCBpZiBXZWJL aXQgdGVzdHMgcnVuIGZyb20gd2l0aGluIC90bXAgb24gTWFjIE9TIFgKKworICAgICAgICAqIHB5 d2Vic29ja2V0L21vZF9weXdlYnNvY2tldC9kaXNwYXRjaC5weTogVXNlIG9zLnBhdGgucmVhbHBh dGggYXMgaXQgcmV0dXJucyB0aGUgY2Fub25pY2FsIHBhdGggb2YgYSBmaWxlLgorICAgICAgICBU aGlzIHByZXZlbnRzIHN5bWxpbmtzIGZyb20gY29uZnVzaW5nIHRoZSBkZXNjZW5kYW50IGNoZWNr LgorCisyMDA5LTExLTE3ICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CisKICAgICAgICAg UmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KIAogICAgICAgICA8aHR0cDovL3dlYmtp dC5vcmcvYi8zMTYwMj4gRmFpbGluZyB0byBzdGFydCB0aGUgV2ViU29ja2V0IHNlcnZlciBzaG91 bGRu4oCZdCB0ZXJtaW5hdGUgZW50aXJlIHRlc3QgcnVuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9weXdlYnNvY2tldC9tb2RfcHl3ZWJzb2NrZXQvZGlzcGF0Y2gucHkgYi9XZWJLaXRUb29scy9w eXdlYnNvY2tldC9tb2RfcHl3ZWJzb2NrZXQvZGlzcGF0Y2gucHkKaW5kZXggODQ0MjJlYi4uNmQ1 MDBjYiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvcHl3ZWJzb2NrZXQvbW9kX3B5d2Vic29ja2V0 L2Rpc3BhdGNoLnB5CisrKyBiL1dlYktpdFRvb2xzL3B5d2Vic29ja2V0L21vZF9weXdlYnNvY2tl dC9kaXNwYXRjaC5weQpAQCAtMTM2LDcgKzEzNiw3IEBAIGNsYXNzIERpc3BhdGNoZXIob2JqZWN0 KToKICAgICAgICAgc2VsZi5fc291cmNlX3dhcm5pbmdzID0gW10KICAgICAgICAgaWYgc2Nhbl9k aXIgaXMgTm9uZToKICAgICAgICAgICAgIHNjYW5fZGlyID0gcm9vdF9kaXIKLSAgICAgICAgaWYg bm90IG9zLnBhdGguYWJzcGF0aChzY2FuX2Rpcikuc3RhcnRzd2l0aChvcy5wYXRoLmFic3BhdGgo cm9vdF9kaXIpKToKKyAgICAgICAgaWYgbm90IG9zLnBhdGgucmVhbHBhdGgoc2Nhbl9kaXIpLnN0 YXJ0c3dpdGgob3MucGF0aC5yZWFscGF0aChyb290X2RpcikpOgogICAgICAgICAgICAgcmFpc2Ug RGlzcGF0Y2hFcnJvcignc2Nhbl9kaXI6JXMgbXVzdCBiZSBhIGRpcmVjdG9yeSB1bmRlciAnCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdyb290X2Rpcjolcy4nICUgKHNjYW5fZGly LCByb290X2RpcikpCiAgICAgICAgIHNlbGYuX3NvdXJjZV9maWxlc19pbl9kaXIocm9vdF9kaXIs IHNjYW5fZGlyKQotLSAKMS42LjUuMy4xNDguZzc4NWM1Cgo=