145812 2015-06-09 12:41:53 -0700 REGRESSION(r185262): NetworkCache is in wrong location on OS X 2015-06-09 13:14:38 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned oldest_to_newest 1100751 0 koivisto 2015-06-09 12:41:53 -0700 Version directory is directly under Caches/com.apple.safari. 1100754 1 254591 koivisto 2015-06-09 12:47:07 -0700 Created attachment 254591 patch 1100757 2 254591 darin 2015-06-09 12:51:43 -0700 Comment on attachment 254591 patch r=andersca 1100770 3 koivisto 2015-06-09 13:14:38 -0700 https://trac.webkit.org/r185374 254591 2015-06-09 12:47:07 -0700 2015-06-09 12:51:43 -0700 patch user-default-init.patch text/plain 3096 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NTM3MikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA2LTA5ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIxODUyNjIp OiBOZXR3b3JrQ2FjaGUgaXMgaW4gd3JvbmcgbG9jYXRpb24gb24gT1MgWAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1ODEyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV2Vi UHJvY2Vzc1Bvb2xDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6Omxl Z2FjeVBsYXRmb3JtRGVmYXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KToKKyAgICAgICAgKFdl YktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdExvY2FsU3RvcmFnZURp cmVjdG9yeSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9y bURlZmF1bHRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KToKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzc1Bvb2w6OmlzTmV0d29ya0NhY2hlRW5hYmxlZCk6CisKKyAgICAgICAgICAgIE1ha2Ug c3VyZSBzdGF0aWMgZnVuY3Rpb25zIHRoYXQgdXNlIE5TVXNlckRlZmF1bHRzIGNhbGwgcmVnaXN0 ZXJVc2VyRGVmYXVsdHNJZk5lZWRlZCgpIGZpcnN0LgorCiAyMDE1LTA2LTA5ICBZdXN1a2UgU3V6 dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCiAgICAgICAgIENyYXNoIHdoZW4gcGFzc2lu ZyBTeW1ib2wgdG8gTlBBUEkgcGx1Z2luIG9iamVjdHMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tCShyZXZpc2lv biAxODUzNjIpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bv b2xDb2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzIyLDYgKzMyMiw4IEBAIFN0cmluZyBXZWJQ cm9jZXNzUG9vbDo6Y29udGFpbmVyVGVtcG9yYXIKIAogU3RyaW5nIFdlYlByb2Nlc3NQb29sOjps ZWdhY3lQbGF0Zm9ybURlZmF1bHRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeSgpCiB7CisgICAgcmVn aXN0ZXJVc2VyRGVmYXVsdHNJZk5lZWRlZCgpOworCiAgICAgTlNTdHJpbmcgKmRhdGFiYXNlc0Rp cmVjdG9yeSA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIG9iamVjdEZv cktleTpXZWJEYXRhYmFzZURpcmVjdG9yeURlZmF1bHRzS2V5XTsKICAgICBpZiAoIWRhdGFiYXNl c0RpcmVjdG9yeSB8fCAhW2RhdGFiYXNlc0RpcmVjdG9yeSBpc0tpbmRPZkNsYXNzOltOU1N0cmlu ZyBjbGFzc11dKQogICAgICAgICBkYXRhYmFzZXNEaXJlY3RvcnkgPSBAIn4vTGlicmFyeS9XZWJL aXQvRGF0YWJhc2VzIjsKQEAgLTMzOSw2ICszNDEsOCBAQCBTdHJpbmcgV2ViUHJvY2Vzc1Bvb2w6 OmxlZ2FjeVBsYXRmb3JtRGVmCiAKIFN0cmluZyBXZWJQcm9jZXNzUG9vbDo6bGVnYWN5UGxhdGZv cm1EZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KCkKIHsKKyAgICByZWdpc3RlclVzZXJEZWZh dWx0c0lmTmVlZGVkKCk7CisKICAgICBOU1N0cmluZyAqbG9jYWxTdG9yYWdlRGlyZWN0b3J5ID0g W1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gb2JqZWN0Rm9yS2V5OldlYlN0 b3JhZ2VEaXJlY3RvcnlEZWZhdWx0c0tleV07CiAgICAgaWYgKCFsb2NhbFN0b3JhZ2VEaXJlY3Rv cnkgfHwgIVtsb2NhbFN0b3JhZ2VEaXJlY3RvcnkgaXNLaW5kT2ZDbGFzczpbTlNTdHJpbmcgY2xh c3NdXSkKICAgICAgICAgbG9jYWxTdG9yYWdlRGlyZWN0b3J5ID0gQCJ+L0xpYnJhcnkvV2ViS2l0 L0xvY2FsU3RvcmFnZSI7CkBAIC0zNDcsNiArMzUxLDggQEAgU3RyaW5nIFdlYlByb2Nlc3NQb29s OjpsZWdhY3lQbGF0Zm9ybURlZgogCiBTdHJpbmcgV2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRm b3JtRGVmYXVsdE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoKQogeworICAgIHJlZ2lzdGVyVXNl ckRlZmF1bHRzSWZOZWVkZWQoKTsKKwogICAgIE5TU3RyaW5nICptZWRpYUtleXNTdG9yYWdlRGly ZWN0b3J5ID0gW1tOU1VzZXJEZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gb2JqZWN0Rm9y S2V5OldlYktpdE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnlEZWZhdWx0c0tleV07CiAgICAgaWYg KCFtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5IHx8ICFbbWVkaWFLZXlzU3RvcmFnZURpcmVjdG9y eSBpc0tpbmRPZkNsYXNzOltOU1N0cmluZyBjbGFzc11dKQogICAgICAgICBtZWRpYUtleXNTdG9y YWdlRGlyZWN0b3J5ID0gQCJ+L0xpYnJhcnkvV2ViS2l0L01lZGlhS2V5cyI7CkBAIC0zOTgsNiAr NDA0LDggQEAgU3RyaW5nIFdlYlByb2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9ybURlZgogYm9vbCBX ZWJQcm9jZXNzUG9vbDo6aXNOZXR3b3JrQ2FjaGVFbmFibGVkKCkKIHsKICNpZiBFTkFCTEUoTkVU V09SS19DQUNIRSkKKyAgICByZWdpc3RlclVzZXJEZWZhdWx0c0lmTmVlZGVkKCk7CisKICAgICBO U1VzZXJEZWZhdWx0cyAqZGVmYXVsdHMgPSBbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVm YXVsdHNdOwogCiAgICAgYm9vbCBuZXR3b3JrQ2FjaGVFbmFibGVkQnlEZWZhdWx0cyA9IFtkZWZh dWx0cyBib29sRm9yS2V5OldlYktpdE5ldHdvcmtDYWNoZUVuYWJsZWREZWZhdWx0c0tleV0gJiYg IVtkZWZhdWx0cyBib29sRm9yS2V5OldlYktpdE5ldHdvcmtDYWNoZVRlbXBvcmFyaWx5RGlzYWJs ZWRGb3JUZXN0aW5nS2V5XTsK