71965 2011-11-09 16:21:21 -0800 SocketStreamHandleCFNet doesn't check for proxy errors 2011-11-30 23:28:18 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap webkit.review.bot oldest_to_newest 499452 0 ap 2011-11-09 16:21:21 -0800 We only check for 407 authentication, but the proxy may outright reject the connection. 499463 1 114393 ap 2011-11-09 16:35:08 -0800 Created attachment 114393 proposed patch 499465 2 webkit.review.bot 2011-11-09 16:37:11 -0800 Attachment 114393 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp:455: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 512004 3 114393 darin 2011-11-30 12:27:40 -0800 Comment on attachment 114393 proposed patch How did you test? 512029 4 114393 ap 2011-11-30 12:45:24 -0800 Comment on attachment 114393 proposed patch I did a fair amount of manual testing with our internal proxies, trying to execute all changed code paths. And I noticed this problem while testing my fix for bug 71964. Perhaps one day we'll find a way to make automated tests for such changes. 512031 5 117252 ap 2011-11-30 12:47:21 -0800 Created attachment 117252 patch for landing To clarify, I was just looking at tcpdump output at first, and then as Web Inspector error messages. Patch for landing with style fixed. 512422 6 117252 webkit.review.bot 2011-11-30 21:18:59 -0800 Comment on attachment 117252 patch for landing Rejecting attachment 117252 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 ERROR: /mnt/git/webkit-commit-queue/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/10693454 512434 7 117328 ap 2011-11-30 21:30:33 -0800 Created attachment 117328 patch for landing Indeed. 512525 8 117328 webkit.review.bot 2011-11-30 23:28:13 -0800 Comment on attachment 117328 patch for landing Clearing flags on attachment: 117328 Committed r101621: <http://trac.webkit.org/changeset/101621> 512526 9 webkit.review.bot 2011-11-30 23:28:18 -0800 All reviewed patches have been landed. Closing bug. 114393 2011-11-09 16:35:08 -0800 2011-11-30 12:47:21 -0800 proposed patch WSProxyError.txt text/plain 4716 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5NzgxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMTEtMDkgIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgU29ja2V0U3RyZWFtSGFuZGxl Q0ZOZXQgZG9lc24ndCBjaGVjayBmb3IgcHJveHkgZXJyb3JzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTk2NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jZi9Tb2NrZXRT dHJlYW1IYW5kbGVDRk5ldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZXRTdG9yZWRDT05ORUNU UHJveHlDcmVkZW50aWFscyk6IEFkZGVkIGEgRklYTUUgYWJvdXQgcmV0cmlldmluZyBwcm94eSBj cmVkZW50aWFscy4KKyAgICAgICAgKFdlYkNvcmU6OlNvY2tldFN0cmVhbUhhbmRsZTo6YWRkQ09O TkVDVENyZWRlbnRpYWxzKTogQWRkZWQgaHVtYW4gcmVhZGFibGUgbWVzc2FnZXMgdG8gZXJyb3Jz LAorICAgICAgICB0aGV5IGdvIHRvIFdlYiBJbnNwZWN0b3IgY29uc29sZS4KKyAgICAgICAgKFdl YkNvcmU6OlNvY2tldFN0cmVhbUhhbmRsZTo6cmVhZFN0cmVhbUNhbGxiYWNrKTogSGFuZGxlIHBy b3h5IHJlc3BvbnNlIGNvZGVzIG90aGVyIHRoYW4gMjAwCisgICAgICAgIGFuZCA0MDcgYnkgZmFp bGluZyBjbGVhbmx5LgorCiAyMDExLTExLTA5ICBEb21pbmljIENvb25leSAgPGRvbWluaWNjQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZW1vdmUgV2ViR0xDb250ZXh0RXZlbnQuaW5pdEV2ZW50 IG1ldGhvZApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Tb2NrZXRT dHJlYW1IYW5kbGVDRk5ldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jZi9Tb2NrZXRTdHJlYW1IYW5kbGVDRk5ldC5jcHAJKHJldmlzaW9uIDk5NzU4 KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Tb2NrZXRTdHJlYW1IYW5k bGVDRk5ldC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxMCw2ICszMTAsOCBAQCB2b2lkIFNvY2tl dFN0cmVhbUhhbmRsZTo6Y3JlYXRlU3RyZWFtcygpCiAKIHN0YXRpYyBib29sIGdldFN0b3JlZENP Tk5FQ1RQcm94eUNyZWRlbnRpYWxzKGNvbnN0IFByb3RlY3Rpb25TcGFjZSYgcHJvdGVjdGlvblNw YWNlLCBTdHJpbmcmIGxvZ2luLCBTdHJpbmcmIHBhc3N3b3JkKQogeworICAgIC8vIEZJWE1FICg8 cmRhcjovL3Byb2JsZW0vMTA0MTY0OTU+KTogUHJveHkgY3JlZGVudGlhbHMgc2hvdWxkIGJlIHJl dHJpZXZlZCBmcm9tIEF1dGhCcm9rZXJBZ2VudC4KKwogICAgIC8vIFRyeSBzeXN0ZW0gY3JlZGVu dGlhbCBzdG9yYWdlIGZpcnN0LCBtYXRjaGluZyBIVFRQIGJlaGF2aW9yIChDRk5ldHdvcmsgb25s eSBhc2tzIHRoZSBjbGllbnQgZm9yIHBhc3N3b3JkIGlmIGl0IGNvdWxkbid0IGZpbmQgaXQgaW4g S2V5Y2hhaW4pLgogICAgIENyZWRlbnRpYWwgc3RvcmVkQ3JlZGVudGlhbCA9IENyZWRlbnRpYWxT dG9yYWdlOjpnZXRGcm9tUGVyc2lzdGVudFN0b3JhZ2UocHJvdGVjdGlvblNwYWNlKTsKICAgICBp ZiAoc3RvcmVkQ3JlZGVudGlhbC5pc0VtcHR5KCkpCkBAIC0zNDQsNyArMzQ2LDcgQEAgdm9pZCBT b2NrZXRTdHJlYW1IYW5kbGU6OmFkZENPTk5FQ1RDcmVkZQogCiAgICAgaWYgKCFDRkhUVFBBdXRo ZW50aWNhdGlvblJlcXVpcmVzVXNlck5hbWVBbmRQYXNzd29yZChhdXRoZW50aWNhdGlvbi5nZXQo KSkpIHsKICAgICAgICAgLy8gVGhhdCdzIGFsbCB3ZSBjYW4gb2ZmZXIuLi4KLSAgICAgICAgbV9j bGllbnQtPmRpZEZhaWxTb2NrZXRTdHJlYW0odGhpcywgU29ja2V0U3RyZWFtRXJyb3IoKSk7IC8v IEZJWE1FOiBQcm92aWRlIGEgc2Vuc2libGUgZXJyb3IuCisgICAgICAgIG1fY2xpZW50LT5kaWRG YWlsU29ja2V0U3RyZWFtKHRoaXMsIFNvY2tldFN0cmVhbUVycm9yKDAsIG1fdXJsLnN0cmluZygp LCAiUHJveHkgYXV0aGVudGljYXRpb24gc2NoZW1lIGlzIG5vdCBzdXBwb3J0ZWQgZm9yIFdlYlNv Y2tldHMiKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTM2OSw3ICszNzEsNyBAQCB2 b2lkIFNvY2tldFN0cmVhbUhhbmRsZTo6YWRkQ09OTkVDVENyZWRlCiAKICAgICAgICAgaWYgKCFw cm94eUF1dGhvcml6YXRpb25TdHJpbmcpIHsKICAgICAgICAgICAgIC8vIEZhaWxzIGUuZy4gZm9y IE5UTE0gYXV0aC4KLSAgICAgICAgICAgIG1fY2xpZW50LT5kaWRGYWlsU29ja2V0U3RyZWFtKHRo aXMsIFNvY2tldFN0cmVhbUVycm9yKCkpOyAvLyBGSVhNRTogUHJvdmlkZSBhIHNlbnNpYmxlIGVy cm9yLgorICAgICAgICAgICAgbV9jbGllbnQtPmRpZEZhaWxTb2NrZXRTdHJlYW0odGhpcywgU29j a2V0U3RyZWFtRXJyb3IoMCwgbV91cmwuc3RyaW5nKCksICJQcm94eSBhdXRoZW50aWNhdGlvbiBz Y2hlbWUgaXMgbm90IHN1cHBvcnRlZCBmb3IgV2ViU29ja2V0cyIpKTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQogCkBAIC0zNzksOSArMzgxLDkgQEAgdm9pZCBTb2NrZXRTdHJlYW1I YW5kbGU6OmFkZENPTk5FQ1RDcmVkZQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgLy8g RklYTUU6IEFzayB0aGUgY2xpZW50IGlmIGNyZWRlbnRpYWxzIGNvdWxkIG5vdCBiZSBmb3VuZC4K KyAgICAvLyBGSVhNRTogT24gcGxhdGZvcm1zIHdoZXJlIEF1dGhCcm9rZXJBZ2VudCBpcyBub3Qg YXZhaWxhYmxlLCBhc2sgdGhlIGNsaWVudCBpZiBjcmVkZW50aWFscyBjb3VsZCBub3QgYmUgZm91 bmQuCiAKLSAgICBtX2NsaWVudC0+ZGlkRmFpbFNvY2tldFN0cmVhbSh0aGlzLCBTb2NrZXRTdHJl YW1FcnJvcigpKTsgLy8gRklYTUU6IFByb3ZpZGUgYSBzZW5zaWJsZSBlcnJvci4KKyAgICBtX2Ns aWVudC0+ZGlkRmFpbFNvY2tldFN0cmVhbSh0aGlzLCBTb2NrZXRTdHJlYW1FcnJvcigwLCBtX3Vy bC5zdHJpbmcoKSwgIlByb3h5IGNyZWRlbnRpYWxzIGFyZSBub3QgYXZhaWxhYmxlIikpOwogfQog CiBDRlN0cmluZ1JlZiBTb2NrZXRTdHJlYW1IYW5kbGU6OmNvcHlDRlN0cmVhbURlc2NyaXB0aW9u KHZvaWQqIGluZm8pCkBAIC00NDcsOSArNDQ5LDIwIEBAIHZvaWQgU29ja2V0U3RyZWFtSGFuZGxl OjpyZWFkU3RyZWFtQ2FsbGIKICAgICAgICAgaWYgKG1fY29ubmVjdGluZ1N1YnN0YXRlID09IFdh aXRpbmdGb3JDb25uZWN0KSB7CiAgICAgICAgICAgICBpZiAobV9jb25uZWN0aW9uVHlwZSA9PSBD T05ORUNUUHJveHkpIHsKICAgICAgICAgICAgICAgICBSZXRhaW5QdHI8Q0ZIVFRQTWVzc2FnZVJl Zj4gcHJveHlSZXNwb25zZShBZG9wdENGLCB3a0NvcHlDT05ORUNUUHJveHlSZXNwb25zZShtX3Jl YWRTdHJlYW0uZ2V0KCksIG1faHR0cHNVUkwuZ2V0KCkpKTsKLSAgICAgICAgICAgICAgICBpZiAo cHJveHlSZXNwb25zZSAmJiAoNDA3ID09IENGSFRUUE1lc3NhZ2VHZXRSZXNwb25zZVN0YXR1c0Nv ZGUocHJveHlSZXNwb25zZS5nZXQoKSkpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGFkZENPTk5F Q1RDcmVkZW50aWFscyhwcm94eVJlc3BvbnNlLmdldCgpKTsKLSAgICAgICAgICAgICAgICAgICAg cmV0dXJuOworICAgICAgICAgICAgICAgIGlmIChwcm94eVJlc3BvbnNlKSB7CisgICAgICAgICAg ICAgICAgICAgIENGSW5kZXggcHJveHlSZXNwb25zZUNvZGUgPSBDRkhUVFBNZXNzYWdlR2V0UmVz cG9uc2VTdGF0dXNDb2RlKHByb3h5UmVzcG9uc2UuZ2V0KCkpOworICAgICAgICAgICAgICAgICAg ICBzd2l0Y2ggKHByb3h5UmVzcG9uc2VDb2RlKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBj YXNlIDIwMDoKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBTdWNjZXNzZnVsIGNvbm5l Y3Rpb24uCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAg ICAgICAgICAgICBjYXNlIDQwNzoKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBhZGRDT05O RUNUQ3JlZGVudGlhbHMocHJveHlSZXNwb25zZS5nZXQoKSk7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICBtX2NsaWVudC0+ZGlkRmFpbFNvY2tldFN0cmVhbSh0aGlz LCBTb2NrZXRTdHJlYW1FcnJvcihzdGF0aWNfY2FzdDxpbnQ+KHByb3h5UmVzcG9uc2VDb2RlKSwg bV91cmwuc3RyaW5nKCksICJQcm94eSBjb25uZWN0aW9uIGNvdWxkIG5vdCBiZSBlc3RhYmxpc2hl ZCIpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBwbGF0Zm9ybUNsb3NlKCk7CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgICAgICB9CiAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKG1fY29u bmVjdGluZ1N1YnN0YXRlID09IFdhaXRpbmdGb3JDcmVkZW50aWFscykK 117252 2011-11-30 12:47:21 -0800 2011-11-30 21:30:33 -0800 patch for landing WSProxyError.txt text/plain 4676 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5NzgxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMTEtMDkgIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgU29ja2V0U3RyZWFtSGFuZGxl Q0ZOZXQgZG9lc24ndCBjaGVjayBmb3IgcHJveHkgZXJyb3JzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTk2NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jZi9Tb2NrZXRT dHJlYW1IYW5kbGVDRk5ldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZXRTdG9yZWRDT05ORUNU UHJveHlDcmVkZW50aWFscyk6IEFkZGVkIGEgRklYTUUgYWJvdXQgcmV0cmlldmluZyBwcm94eSBj cmVkZW50aWFscy4KKyAgICAgICAgKFdlYkNvcmU6OlNvY2tldFN0cmVhbUhhbmRsZTo6YWRkQ09O TkVDVENyZWRlbnRpYWxzKTogQWRkZWQgaHVtYW4gcmVhZGFibGUgbWVzc2FnZXMgdG8gZXJyb3Jz LAorICAgICAgICB0aGV5IGdvIHRvIFdlYiBJbnNwZWN0b3IgY29uc29sZS4KKyAgICAgICAgKFdl YkNvcmU6OlNvY2tldFN0cmVhbUhhbmRsZTo6cmVhZFN0cmVhbUNhbGxiYWNrKTogSGFuZGxlIHBy b3h5IHJlc3BvbnNlIGNvZGVzIG90aGVyIHRoYW4gMjAwCisgICAgICAgIGFuZCA0MDcgYnkgZmFp bGluZyBjbGVhbmx5LgorCiAyMDExLTExLTA5ICBEb21pbmljIENvb25leSAgPGRvbWluaWNjQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZW1vdmUgV2ViR0xDb250ZXh0RXZlbnQuaW5pdEV2ZW50 IG1ldGhvZApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Tb2NrZXRT dHJlYW1IYW5kbGVDRk5ldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jZi9Tb2NrZXRTdHJlYW1IYW5kbGVDRk5ldC5jcHAJKHJldmlzaW9uIDk5NzU4 KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Tb2NrZXRTdHJlYW1IYW5k bGVDRk5ldC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxMCw2ICszMTAsOCBAQCB2b2lkIFNvY2tl dFN0cmVhbUhhbmRsZTo6Y3JlYXRlU3RyZWFtcygpCiAKIHN0YXRpYyBib29sIGdldFN0b3JlZENP Tk5FQ1RQcm94eUNyZWRlbnRpYWxzKGNvbnN0IFByb3RlY3Rpb25TcGFjZSYgcHJvdGVjdGlvblNw YWNlLCBTdHJpbmcmIGxvZ2luLCBTdHJpbmcmIHBhc3N3b3JkKQogeworICAgIC8vIEZJWE1FICg8 cmRhcjovL3Byb2JsZW0vMTA0MTY0OTU+KTogUHJveHkgY3JlZGVudGlhbHMgc2hvdWxkIGJlIHJl dHJpZXZlZCBmcm9tIEF1dGhCcm9rZXJBZ2VudC4KKwogICAgIC8vIFRyeSBzeXN0ZW0gY3JlZGVu dGlhbCBzdG9yYWdlIGZpcnN0LCBtYXRjaGluZyBIVFRQIGJlaGF2aW9yIChDRk5ldHdvcmsgb25s eSBhc2tzIHRoZSBjbGllbnQgZm9yIHBhc3N3b3JkIGlmIGl0IGNvdWxkbid0IGZpbmQgaXQgaW4g S2V5Y2hhaW4pLgogICAgIENyZWRlbnRpYWwgc3RvcmVkQ3JlZGVudGlhbCA9IENyZWRlbnRpYWxT dG9yYWdlOjpnZXRGcm9tUGVyc2lzdGVudFN0b3JhZ2UocHJvdGVjdGlvblNwYWNlKTsKICAgICBp ZiAoc3RvcmVkQ3JlZGVudGlhbC5pc0VtcHR5KCkpCkBAIC0zNDQsNyArMzQ2LDcgQEAgdm9pZCBT b2NrZXRTdHJlYW1IYW5kbGU6OmFkZENPTk5FQ1RDcmVkZQogCiAgICAgaWYgKCFDRkhUVFBBdXRo ZW50aWNhdGlvblJlcXVpcmVzVXNlck5hbWVBbmRQYXNzd29yZChhdXRoZW50aWNhdGlvbi5nZXQo KSkpIHsKICAgICAgICAgLy8gVGhhdCdzIGFsbCB3ZSBjYW4gb2ZmZXIuLi4KLSAgICAgICAgbV9j bGllbnQtPmRpZEZhaWxTb2NrZXRTdHJlYW0odGhpcywgU29ja2V0U3RyZWFtRXJyb3IoKSk7IC8v IEZJWE1FOiBQcm92aWRlIGEgc2Vuc2libGUgZXJyb3IuCisgICAgICAgIG1fY2xpZW50LT5kaWRG YWlsU29ja2V0U3RyZWFtKHRoaXMsIFNvY2tldFN0cmVhbUVycm9yKDAsIG1fdXJsLnN0cmluZygp LCAiUHJveHkgYXV0aGVudGljYXRpb24gc2NoZW1lIGlzIG5vdCBzdXBwb3J0ZWQgZm9yIFdlYlNv Y2tldHMiKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTM2OSw3ICszNzEsNyBAQCB2 b2lkIFNvY2tldFN0cmVhbUhhbmRsZTo6YWRkQ09OTkVDVENyZWRlCiAKICAgICAgICAgaWYgKCFw cm94eUF1dGhvcml6YXRpb25TdHJpbmcpIHsKICAgICAgICAgICAgIC8vIEZhaWxzIGUuZy4gZm9y IE5UTE0gYXV0aC4KLSAgICAgICAgICAgIG1fY2xpZW50LT5kaWRGYWlsU29ja2V0U3RyZWFtKHRo aXMsIFNvY2tldFN0cmVhbUVycm9yKCkpOyAvLyBGSVhNRTogUHJvdmlkZSBhIHNlbnNpYmxlIGVy cm9yLgorICAgICAgICAgICAgbV9jbGllbnQtPmRpZEZhaWxTb2NrZXRTdHJlYW0odGhpcywgU29j a2V0U3RyZWFtRXJyb3IoMCwgbV91cmwuc3RyaW5nKCksICJQcm94eSBhdXRoZW50aWNhdGlvbiBz Y2hlbWUgaXMgbm90IHN1cHBvcnRlZCBmb3IgV2ViU29ja2V0cyIpKTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQogCkBAIC0zNzksOSArMzgxLDkgQEAgdm9pZCBTb2NrZXRTdHJlYW1I YW5kbGU6OmFkZENPTk5FQ1RDcmVkZQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgLy8g RklYTUU6IEFzayB0aGUgY2xpZW50IGlmIGNyZWRlbnRpYWxzIGNvdWxkIG5vdCBiZSBmb3VuZC4K KyAgICAvLyBGSVhNRTogT24gcGxhdGZvcm1zIHdoZXJlIEF1dGhCcm9rZXJBZ2VudCBpcyBub3Qg YXZhaWxhYmxlLCBhc2sgdGhlIGNsaWVudCBpZiBjcmVkZW50aWFscyBjb3VsZCBub3QgYmUgZm91 bmQuCiAKLSAgICBtX2NsaWVudC0+ZGlkRmFpbFNvY2tldFN0cmVhbSh0aGlzLCBTb2NrZXRTdHJl YW1FcnJvcigpKTsgLy8gRklYTUU6IFByb3ZpZGUgYSBzZW5zaWJsZSBlcnJvci4KKyAgICBtX2Ns aWVudC0+ZGlkRmFpbFNvY2tldFN0cmVhbSh0aGlzLCBTb2NrZXRTdHJlYW1FcnJvcigwLCBtX3Vy bC5zdHJpbmcoKSwgIlByb3h5IGNyZWRlbnRpYWxzIGFyZSBub3QgYXZhaWxhYmxlIikpOwogfQog CiBDRlN0cmluZ1JlZiBTb2NrZXRTdHJlYW1IYW5kbGU6OmNvcHlDRlN0cmVhbURlc2NyaXB0aW9u KHZvaWQqIGluZm8pCkBAIC00NDcsOSArNDQ5LDIwIEBAIHZvaWQgU29ja2V0U3RyZWFtSGFuZGxl OjpyZWFkU3RyZWFtQ2FsbGIKICAgICAgICAgaWYgKG1fY29ubmVjdGluZ1N1YnN0YXRlID09IFdh aXRpbmdGb3JDb25uZWN0KSB7CiAgICAgICAgICAgICBpZiAobV9jb25uZWN0aW9uVHlwZSA9PSBD T05ORUNUUHJveHkpIHsKICAgICAgICAgICAgICAgICBSZXRhaW5QdHI8Q0ZIVFRQTWVzc2FnZVJl Zj4gcHJveHlSZXNwb25zZShBZG9wdENGLCB3a0NvcHlDT05ORUNUUHJveHlSZXNwb25zZShtX3Jl YWRTdHJlYW0uZ2V0KCksIG1faHR0cHNVUkwuZ2V0KCkpKTsKLSAgICAgICAgICAgICAgICBpZiAo cHJveHlSZXNwb25zZSAmJiAoNDA3ID09IENGSFRUUE1lc3NhZ2VHZXRSZXNwb25zZVN0YXR1c0Nv ZGUocHJveHlSZXNwb25zZS5nZXQoKSkpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGFkZENPTk5F Q1RDcmVkZW50aWFscyhwcm94eVJlc3BvbnNlLmdldCgpKTsKLSAgICAgICAgICAgICAgICAgICAg cmV0dXJuOworICAgICAgICAgICAgICAgIGlmIChwcm94eVJlc3BvbnNlKSB7CisgICAgICAgICAg ICAgICAgICAgIENGSW5kZXggcHJveHlSZXNwb25zZUNvZGUgPSBDRkhUVFBNZXNzYWdlR2V0UmVz cG9uc2VTdGF0dXNDb2RlKHByb3h5UmVzcG9uc2UuZ2V0KCkpOworICAgICAgICAgICAgICAgICAg ICBzd2l0Y2ggKHByb3h5UmVzcG9uc2VDb2RlKSB7CisgICAgICAgICAgICAgICAgICAgIGNhc2Ug MjAwOgorICAgICAgICAgICAgICAgICAgICAgICAgLy8gU3VjY2Vzc2Z1bCBjb25uZWN0aW9uLgor ICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAgIGNhc2Ug NDA3OgorICAgICAgICAgICAgICAgICAgICAgICAgYWRkQ09OTkVDVENyZWRlbnRpYWxzKHByb3h5 UmVzcG9uc2UuZ2V0KCkpOworICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICAgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgICAgICAgICAgbV9jbGllbnQt PmRpZEZhaWxTb2NrZXRTdHJlYW0odGhpcywgU29ja2V0U3RyZWFtRXJyb3Ioc3RhdGljX2Nhc3Q8 aW50Pihwcm94eVJlc3BvbnNlQ29kZSksIG1fdXJsLnN0cmluZygpLCAiUHJveHkgY29ubmVjdGlv biBjb3VsZCBub3QgYmUgZXN0YWJsaXNoZWQiKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBw bGF0Zm9ybUNsb3NlKCk7CisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAg IH0gZWxzZSBpZiAobV9jb25uZWN0aW5nU3Vic3RhdGUgPT0gV2FpdGluZ0ZvckNyZWRlbnRpYWxz KQo= 117328 2011-11-30 21:30:33 -0800 2011-11-30 23:28:13 -0800 patch for landing WSProxyError.txt text/plain 4673 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5NzgxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMTEtMDkgIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgU29ja2V0U3RyZWFtSGFuZGxl Q0ZOZXQgZG9lc24ndCBjaGVjayBmb3IgcHJveHkgZXJyb3JzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTk2NQorCisgICAgICAgIFJldmlld2VkIGJ5 IERhcmluIEFkbGVyLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jZi9Tb2NrZXRTdHJl YW1IYW5kbGVDRk5ldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZXRTdG9yZWRDT05ORUNUUHJv eHlDcmVkZW50aWFscyk6IEFkZGVkIGEgRklYTUUgYWJvdXQgcmV0cmlldmluZyBwcm94eSBjcmVk ZW50aWFscy4KKyAgICAgICAgKFdlYkNvcmU6OlNvY2tldFN0cmVhbUhhbmRsZTo6YWRkQ09OTkVD VENyZWRlbnRpYWxzKTogQWRkZWQgaHVtYW4gcmVhZGFibGUgbWVzc2FnZXMgdG8gZXJyb3JzLAor ICAgICAgICB0aGV5IGdvIHRvIFdlYiBJbnNwZWN0b3IgY29uc29sZS4KKyAgICAgICAgKFdlYkNv cmU6OlNvY2tldFN0cmVhbUhhbmRsZTo6cmVhZFN0cmVhbUNhbGxiYWNrKTogSGFuZGxlIHByb3h5 IHJlc3BvbnNlIGNvZGVzIG90aGVyIHRoYW4gMjAwCisgICAgICAgIGFuZCA0MDcgYnkgZmFpbGlu ZyBjbGVhbmx5LgorCiAyMDExLTExLTA5ICBEb21pbmljIENvb25leSAgPGRvbWluaWNjQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBSZW1vdmUgV2ViR0xDb250ZXh0RXZlbnQuaW5pdEV2ZW50IG1l dGhvZApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Tb2NrZXRTdHJl YW1IYW5kbGVDRk5ldC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jZi9Tb2NrZXRTdHJlYW1IYW5kbGVDRk5ldC5jcHAJKHJldmlzaW9uIDk5NzU4KQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9Tb2NrZXRTdHJlYW1IYW5kbGVD Rk5ldC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxMCw2ICszMTAsOCBAQCB2b2lkIFNvY2tldFN0 cmVhbUhhbmRsZTo6Y3JlYXRlU3RyZWFtcygpCiAKIHN0YXRpYyBib29sIGdldFN0b3JlZENPTk5F Q1RQcm94eUNyZWRlbnRpYWxzKGNvbnN0IFByb3RlY3Rpb25TcGFjZSYgcHJvdGVjdGlvblNwYWNl LCBTdHJpbmcmIGxvZ2luLCBTdHJpbmcmIHBhc3N3b3JkKQogeworICAgIC8vIEZJWE1FICg8cmRh cjovL3Byb2JsZW0vMTA0MTY0OTU+KTogUHJveHkgY3JlZGVudGlhbHMgc2hvdWxkIGJlIHJldHJp ZXZlZCBmcm9tIEF1dGhCcm9rZXJBZ2VudC4KKwogICAgIC8vIFRyeSBzeXN0ZW0gY3JlZGVudGlh bCBzdG9yYWdlIGZpcnN0LCBtYXRjaGluZyBIVFRQIGJlaGF2aW9yIChDRk5ldHdvcmsgb25seSBh c2tzIHRoZSBjbGllbnQgZm9yIHBhc3N3b3JkIGlmIGl0IGNvdWxkbid0IGZpbmQgaXQgaW4gS2V5 Y2hhaW4pLgogICAgIENyZWRlbnRpYWwgc3RvcmVkQ3JlZGVudGlhbCA9IENyZWRlbnRpYWxTdG9y YWdlOjpnZXRGcm9tUGVyc2lzdGVudFN0b3JhZ2UocHJvdGVjdGlvblNwYWNlKTsKICAgICBpZiAo c3RvcmVkQ3JlZGVudGlhbC5pc0VtcHR5KCkpCkBAIC0zNDQsNyArMzQ2LDcgQEAgdm9pZCBTb2Nr ZXRTdHJlYW1IYW5kbGU6OmFkZENPTk5FQ1RDcmVkZQogCiAgICAgaWYgKCFDRkhUVFBBdXRoZW50 aWNhdGlvblJlcXVpcmVzVXNlck5hbWVBbmRQYXNzd29yZChhdXRoZW50aWNhdGlvbi5nZXQoKSkp IHsKICAgICAgICAgLy8gVGhhdCdzIGFsbCB3ZSBjYW4gb2ZmZXIuLi4KLSAgICAgICAgbV9jbGll bnQtPmRpZEZhaWxTb2NrZXRTdHJlYW0odGhpcywgU29ja2V0U3RyZWFtRXJyb3IoKSk7IC8vIEZJ WE1FOiBQcm92aWRlIGEgc2Vuc2libGUgZXJyb3IuCisgICAgICAgIG1fY2xpZW50LT5kaWRGYWls U29ja2V0U3RyZWFtKHRoaXMsIFNvY2tldFN0cmVhbUVycm9yKDAsIG1fdXJsLnN0cmluZygpLCAi UHJveHkgYXV0aGVudGljYXRpb24gc2NoZW1lIGlzIG5vdCBzdXBwb3J0ZWQgZm9yIFdlYlNvY2tl dHMiKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTM2OSw3ICszNzEsNyBAQCB2b2lk IFNvY2tldFN0cmVhbUhhbmRsZTo6YWRkQ09OTkVDVENyZWRlCiAKICAgICAgICAgaWYgKCFwcm94 eUF1dGhvcml6YXRpb25TdHJpbmcpIHsKICAgICAgICAgICAgIC8vIEZhaWxzIGUuZy4gZm9yIE5U TE0gYXV0aC4KLSAgICAgICAgICAgIG1fY2xpZW50LT5kaWRGYWlsU29ja2V0U3RyZWFtKHRoaXMs IFNvY2tldFN0cmVhbUVycm9yKCkpOyAvLyBGSVhNRTogUHJvdmlkZSBhIHNlbnNpYmxlIGVycm9y LgorICAgICAgICAgICAgbV9jbGllbnQtPmRpZEZhaWxTb2NrZXRTdHJlYW0odGhpcywgU29ja2V0 U3RyZWFtRXJyb3IoMCwgbV91cmwuc3RyaW5nKCksICJQcm94eSBhdXRoZW50aWNhdGlvbiBzY2hl bWUgaXMgbm90IHN1cHBvcnRlZCBmb3IgV2ViU29ja2V0cyIpKTsKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgfQogCkBAIC0zNzksOSArMzgxLDkgQEAgdm9pZCBTb2NrZXRTdHJlYW1IYW5k bGU6OmFkZENPTk5FQ1RDcmVkZQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgLy8gRklY TUU6IEFzayB0aGUgY2xpZW50IGlmIGNyZWRlbnRpYWxzIGNvdWxkIG5vdCBiZSBmb3VuZC4KKyAg ICAvLyBGSVhNRTogT24gcGxhdGZvcm1zIHdoZXJlIEF1dGhCcm9rZXJBZ2VudCBpcyBub3QgYXZh aWxhYmxlLCBhc2sgdGhlIGNsaWVudCBpZiBjcmVkZW50aWFscyBjb3VsZCBub3QgYmUgZm91bmQu CiAKLSAgICBtX2NsaWVudC0+ZGlkRmFpbFNvY2tldFN0cmVhbSh0aGlzLCBTb2NrZXRTdHJlYW1F cnJvcigpKTsgLy8gRklYTUU6IFByb3ZpZGUgYSBzZW5zaWJsZSBlcnJvci4KKyAgICBtX2NsaWVu dC0+ZGlkRmFpbFNvY2tldFN0cmVhbSh0aGlzLCBTb2NrZXRTdHJlYW1FcnJvcigwLCBtX3VybC5z dHJpbmcoKSwgIlByb3h5IGNyZWRlbnRpYWxzIGFyZSBub3QgYXZhaWxhYmxlIikpOwogfQogCiBD RlN0cmluZ1JlZiBTb2NrZXRTdHJlYW1IYW5kbGU6OmNvcHlDRlN0cmVhbURlc2NyaXB0aW9uKHZv aWQqIGluZm8pCkBAIC00NDcsOSArNDQ5LDIwIEBAIHZvaWQgU29ja2V0U3RyZWFtSGFuZGxlOjpy ZWFkU3RyZWFtQ2FsbGIKICAgICAgICAgaWYgKG1fY29ubmVjdGluZ1N1YnN0YXRlID09IFdhaXRp bmdGb3JDb25uZWN0KSB7CiAgICAgICAgICAgICBpZiAobV9jb25uZWN0aW9uVHlwZSA9PSBDT05O RUNUUHJveHkpIHsKICAgICAgICAgICAgICAgICBSZXRhaW5QdHI8Q0ZIVFRQTWVzc2FnZVJlZj4g cHJveHlSZXNwb25zZShBZG9wdENGLCB3a0NvcHlDT05ORUNUUHJveHlSZXNwb25zZShtX3JlYWRT dHJlYW0uZ2V0KCksIG1faHR0cHNVUkwuZ2V0KCkpKTsKLSAgICAgICAgICAgICAgICBpZiAocHJv eHlSZXNwb25zZSAmJiAoNDA3ID09IENGSFRUUE1lc3NhZ2VHZXRSZXNwb25zZVN0YXR1c0NvZGUo cHJveHlSZXNwb25zZS5nZXQoKSkpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGFkZENPTk5FQ1RD cmVkZW50aWFscyhwcm94eVJlc3BvbnNlLmdldCgpKTsKLSAgICAgICAgICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICAgICAgICAgIGlmIChwcm94eVJlc3BvbnNlKSB7CisgICAgICAgICAgICAg ICAgICAgIENGSW5kZXggcHJveHlSZXNwb25zZUNvZGUgPSBDRkhUVFBNZXNzYWdlR2V0UmVzcG9u c2VTdGF0dXNDb2RlKHByb3h5UmVzcG9uc2UuZ2V0KCkpOworICAgICAgICAgICAgICAgICAgICBz d2l0Y2ggKHByb3h5UmVzcG9uc2VDb2RlKSB7CisgICAgICAgICAgICAgICAgICAgIGNhc2UgMjAw OgorICAgICAgICAgICAgICAgICAgICAgICAgLy8gU3VjY2Vzc2Z1bCBjb25uZWN0aW9uLgorICAg ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAgIGNhc2UgNDA3 OgorICAgICAgICAgICAgICAgICAgICAgICAgYWRkQ09OTkVDVENyZWRlbnRpYWxzKHByb3h5UmVz cG9uc2UuZ2V0KCkpOworICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAg ICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgICAgICAgICAgbV9jbGllbnQtPmRp ZEZhaWxTb2NrZXRTdHJlYW0odGhpcywgU29ja2V0U3RyZWFtRXJyb3Ioc3RhdGljX2Nhc3Q8aW50 Pihwcm94eVJlc3BvbnNlQ29kZSksIG1fdXJsLnN0cmluZygpLCAiUHJveHkgY29ubmVjdGlvbiBj b3VsZCBub3QgYmUgZXN0YWJsaXNoZWQiKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBwbGF0 Zm9ybUNsb3NlKCk7CisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAg ICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0g ZWxzZSBpZiAobV9jb25uZWN0aW5nU3Vic3RhdGUgPT0gV2FpdGluZ0ZvckNyZWRlbnRpYWxzKQo=