52897 2011-01-21 07:53:05 -0800 WebKit2: Need WebKit2 equivalent of WebResourceLoadDelegate::willSendRequest in the Bundle 2011-02-03 23:28:11 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 jberlin sam jberlin mjs oldest_to_newest 338059 0 jberlin 2011-01-21 07:53:05 -0800 <rdar://problem/8898294> 345363 1 81191 mjs 2011-02-03 22:29:27 -0800 Created attachment 81191 Patch 345366 2 81191 mitz 2011-02-03 22:35:20 -0800 Comment on attachment 81191 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=81191&action=review > Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h:90 > +typedef WKURLRequestRef (*WKBundlePageWillSendRequestForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, uint64_t resourceIdentifier, WKURLRequestRef request, WKURLResponseRef redirectResponse, const void* clientInfo); I think we’re keeping the “void *” rather than “void* ” format for now. 345386 3 mjs 2011-02-03 23:28:11 -0800 Committed r77611: <http://trac.webkit.org/changeset/77611> 81191 2011-02-03 22:29:27 -0800 2011-02-03 22:35:19 -0800 Patch bug-52897-20110203222925.patch text/plain 12899 mjs SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3NjA2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDItMDMgIE1hY2llaiBT dGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWJLaXQyOiBOZWVkIFdlYktpdDIgZXF1aXZhbGVudCBvZiBX ZWJSZXNvdXJjZUxvYWREZWxlZ2F0ZTo6d2lsbFNlbmRSZXF1ZXN0IGluIHRoZSBCdW5kbGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyODk3CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS84ODk4Mjk0PgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46 IEFkZCBleHBvcnQgbm93IG5lZWRlZCBieSBXZWJLaXQyCisKIDIwMTEtMDItMDMgIEJyaWFuIFJ5 bmVyICA8YnJ5bmVyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBG aXNoZXIuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkocmV2aXNpb24gNzc1MjgpCisrKyBTb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkod29ya2luZyBjb3B5KQpAQCAtMTA4OSw2ICsxMDg5 LDcgQEAgX19aTks3V2ViQ29yZTE5QW5pbWF0aW9uQ29udHJvbGxlcjI0bnVtYgogX19aTks3V2Vi Q29yZTE5UmVzb3VyY2VSZXF1ZXN0QmFzZTEwaHR0cE1ldGhvZEV2CiBfX1pOSzdXZWJDb3JlMTlS ZXNvdXJjZVJlcXVlc3RCYXNlMTVodHRwSGVhZGVyRmllbGRFUEtjCiBfX1pOSzdXZWJDb3JlMTlS ZXNvdXJjZVJlcXVlc3RCYXNlM3VybEV2CitfX1pOSzdXZWJDb3JlMTlSZXNvdXJjZVJlcXVlc3RC YXNlNmlzTnVsbEV2CiBfX1pOSzdXZWJDb3JlMTlSZXNvdXJjZVJlcXVlc3RCYXNlN2lzRW1wdHlF dgogX19aTks3V2ViQ29yZTE5U2VsZWN0aW9uQ29udHJvbGxlcjExY3VycmVudEZvcm1FdgogX19a Tks3V2ViQ29yZTE5U2VsZWN0aW9uQ29udHJvbGxlcjE1Y29weVR5cGluZ1N0eWxlRXYKSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cJKHJldmlzaW9uIDc3NjA2KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDItMDMgIE1hY2llaiBTdGFjaG93 aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXZWJLaXQyOiBOZWVkIFdlYktpdDIgZXF1aXZhbGVudCBvZiBXZWJSZXNv dXJjZUxvYWREZWxlZ2F0ZTo6d2lsbFNlbmRSZXF1ZXN0IGluIHRoZSBCdW5kbGUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyODk3CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS84ODk4Mjk0PgorCisgICAgICAgICogU2hhcmVkL0FQSS9jL1dLU2hhcmVk QVBJQ2FzdC5oOgorICAgICAgICAoV2ViS2l0Ojp0b0FQSSk6CisgICAgICAgICogV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9j ZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkluamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudDo6d2lsbFNlbmRS ZXF1ZXN0Rm9yRnJhbWUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5q ZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaFdpbGxTZW5kUmVxdWVzdCk6CisKIDIwMTEtMDIt MDMgIEFkYW0gTGFuZ2xleSAgPGFnbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgQWRhbSBCYXJ0aC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1NoYXJl ZEFQSUNhc3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tT aGFyZWRBUElDYXN0LmgJKHJldmlzaW9uIDc3NTI4KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVk L0FQSS9jL1dLU2hhcmVkQVBJQ2FzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC00MSw2ICs0MSw4IEBA CiAjaW5jbHVkZSAiV2ViTnVtYmVyLmgiCiAjaW5jbHVkZSAiV2ViU3RyaW5nLmgiCiAjaW5jbHVk ZSAiV2ViVVJMLmgiCisjaW5jbHVkZSAiV2ViVVJMUmVxdWVzdC5oIgorI2luY2x1ZGUgIldlYlVS TFJlc3BvbnNlLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9Db250ZXh0TWVudUl0ZW0uaD4KICNpbmNs dWRlIDxXZWJDb3JlL0Zsb2F0UmVjdC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVMb2FkZXJU eXBlcy5oPgpAQCAtMTc0LDYgKzE3NiwxNiBAQCBpbmxpbmUgUHJveHlpbmdSZWZQdHI8V2ViRXJy b3I+IHRvQVBJKGNvCiAgICAgcmV0dXJuIFByb3h5aW5nUmVmUHRyPFdlYkVycm9yPihXZWJFcnJv cjo6Y3JlYXRlKGVycm9yKSk7CiB9CiAKK2lubGluZSBQcm94eWluZ1JlZlB0cjxXZWJVUkxSZXF1 ZXN0PiB0b0FQSShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCit7Cisg ICAgcmV0dXJuIFByb3h5aW5nUmVmUHRyPFdlYlVSTFJlcXVlc3Q+KFdlYlVSTFJlcXVlc3Q6OmNy ZWF0ZShyZXF1ZXN0KSk7Cit9CisKK2lubGluZSBQcm94eWluZ1JlZlB0cjxXZWJVUkxSZXNwb25z ZT4gdG9BUEkoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCit7Cisg ICAgcmV0dXJuIFByb3h5aW5nUmVmUHRyPFdlYlVSTFJlc3BvbnNlPihXZWJVUkxSZXNwb25zZTo6 Y3JlYXRlKHJlc3BvbnNlKSk7Cit9CisKIC8qIEdlb21ldHJ5IGNvbnZlcnNpb25zICovCiAKIGlu bGluZSBXZWJDb3JlOjpGbG9hdFJlY3QgdG9GbG9hdFJlY3QoY29uc3QgV0tSZWN0JiB3a1JlY3Qp CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVk QnVuZGxlUGFnZUxvYWRlckNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQu Y3BwCShyZXZpc2lvbiA3NzUyOCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTc2LDEyICsxNzYsMTIgQEAgdm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGll bnQ6OmRpZAogICAgIHVzZXJEYXRhID0gYWRvcHRSZWYodG9JbXBsKHVzZXJEYXRhVG9QYXNzKSk7 CiB9CiAKLWJvb2wgSW5qZWN0ZWRCdW5kbGVQYWdlTG9hZGVyQ2xpZW50OjpzaG91bGRMb2FkUmVz b3VyY2VGb3JGcmFtZShXZWJQYWdlKiBwYWdlLCBXZWJGcmFtZSogZnJhbWUsIGNvbnN0IFN0cmlu ZyYgcmVzb3VyY2VVUkwpCit2b2lkIEluamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudDo6d2ls bFNlbmRSZXF1ZXN0Rm9yRnJhbWUoV2ViUGFnZSogcGFnZSwgV2ViRnJhbWUqIGZyYW1lLCB1aW50 NjRfdCBpZGVudGlmaWVyLCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFJlc291cmNl UmVzcG9uc2UmIHJlZGlyZWN0UmVzcG9uc2UpCiB7Ci0gICAgaWYgKCFtX2NsaWVudC5zaG91bGRM b2FkUmVzb3VyY2VGb3JGcmFtZSkKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKCFtX2Ns aWVudC53aWxsU2VuZFJlcXVlc3RGb3JGcmFtZSkKKyAgICAgICAgcmV0dXJuOwogCi0gICAgcmV0 dXJuIG1fY2xpZW50LnNob3VsZExvYWRSZXNvdXJjZUZvckZyYW1lKHRvQVBJKHBhZ2UpLCB0b0FQ SShmcmFtZSksIHRvQVBJKHJlc291cmNlVVJMLmltcGwoKSksIG1fY2xpZW50LmNsaWVudEluZm8p OworICAgIHJlcXVlc3QgPSB0b0ltcGwobV9jbGllbnQud2lsbFNlbmRSZXF1ZXN0Rm9yRnJhbWUo dG9BUEkocGFnZSksIHRvQVBJKGZyYW1lKSwgaWRlbnRpZmllciwgdG9BUEkocmVxdWVzdCksIHRv QVBJKHJlZGlyZWN0UmVzcG9uc2UpLCBtX2NsaWVudC5jbGllbnRJbmZvKSktPnJlc291cmNlUmVx dWVzdCgpOwogfQogCiB2b2lkIEluamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudDo6ZGlkQ2xl YXJXaW5kb3dPYmplY3RGb3JGcmFtZShXZWJQYWdlKiBwYWdlLCBXZWJGcmFtZSogZnJhbWUsIERP TVdyYXBwZXJXb3JsZCogd29ybGQpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0lu amVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZUxvYWRlckNsaWVudC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5k bGVQYWdlTG9hZGVyQ2xpZW50LmgJKHJldmlzaW9uIDc3NTI4KQorKysgU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2VMb2FkZXJDbGllbnQu aAkod29ya2luZyBjb3B5KQpAQCAtMzUsNiArMzUsOCBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewog Y2xhc3MgRE9NV3JhcHBlcldvcmxkOwogY2xhc3MgUmVzb3VyY2VFcnJvcjsKK2NsYXNzIFJlc291 cmNlUmVxdWVzdDsKK2NsYXNzIFJlc291cmNlUmVzcG9uc2U7CiB9CiAKIG5hbWVzcGFjZSBXZWJL aXQgewpAQCAtNjAsNyArNjIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaWREaXNwbGF5SW5zZWN1 cmVDb250ZW50Rm9yRnJhbWUoV2ViUGFnZSosIFdlYkZyYW1lKiwgUmVmUHRyPEFQSU9iamVjdD4m IHVzZXJEYXRhKTsKICAgICB2b2lkIGRpZFJ1bkluc2VjdXJlQ29udGVudEZvckZyYW1lKFdlYlBh Z2UqLCBXZWJGcmFtZSosIFJlZlB0cjxBUElPYmplY3Q+JiB1c2VyRGF0YSk7CiAKLSAgICBib29s IHNob3VsZExvYWRSZXNvdXJjZUZvckZyYW1lKFdlYlBhZ2UqLCBXZWJGcmFtZSosIGNvbnN0IFN0 cmluZyYpOworICAgIHZvaWQgd2lsbFNlbmRSZXF1ZXN0Rm9yRnJhbWUoV2ViUGFnZSosIFdlYkZy YW1lKiwgdWludDY0X3QgaWRlbnRpZmllciwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYpOwogCiAgICAgdm9pZCBkaWRDbGVhcldpbmRv d09iamVjdEZvckZyYW1lKFdlYlBhZ2UqLCBXZWJGcmFtZSosIFdlYkNvcmU6OkRPTVdyYXBwZXJX b3JsZCopOwogICAgIHZvaWQgZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RGb3JGcmFtZShXZWJQYWdl KiwgV2ViRnJhbWUqKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvQVBJL2MvV0tCdW5kbGVQYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvYy9XS0J1bmRsZVBhZ2UuaAkocmV2aXNpb24g Nzc1MjgpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9j L1dLQnVuZGxlUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC04Nyw3ICs4Nyw4IEBAIHR5cGVkZWYg dm9pZCAoKldLQnVuZGxlUGFnZURpZENsZWFyV2luZG8KIHR5cGVkZWYgdm9pZCAoKldLQnVuZGxl UGFnZURpZENhbmNlbENsaWVudFJlZGlyZWN0Rm9yRnJhbWVDYWxsYmFjaykoV0tCdW5kbGVQYWdl UmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8p OwogdHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlV2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdEZv ckZyYW1lQ2FsbGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1bmRsZUZyYW1lUmVmIGZy YW1lLCBXS1VSTFJlZiB1cmwsIGRvdWJsZSBkZWxheSwgZG91YmxlIGRhdGUsIGNvbnN0IHZvaWQg KmNsaWVudEluZm8pOwogdHlwZWRlZiB2b2lkICgqV0tCdW5kbGVQYWdlRGlkSGFuZGxlT25sb2Fk RXZlbnRzRm9yRnJhbWVDYWxsYmFjaykoV0tCdW5kbGVQYWdlUmVmIHBhZ2UsIFdLQnVuZGxlRnJh bWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwotdHlwZWRlZiBib29sICgqV0tC dW5kbGVQYWdlU2hvdWxkTG9hZFJlc291cmNlRm9yRnJhbWVDYWxsYmFjaykoV0tCdW5kbGVQYWdl UmVmIHBhZ2UsIFdLQnVuZGxlRnJhbWVSZWYgZnJhbWUsIFdLU3RyaW5nUmVmIHVybCwgY29uc3Qg dm9pZCAqY2xpZW50SW5mbyk7Cit0eXBlZGVmIFdLVVJMUmVxdWVzdFJlZiAoKldLQnVuZGxlUGFn ZVdpbGxTZW5kUmVxdWVzdEZvckZyYW1lQ2FsbGJhY2spKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBX S0J1bmRsZUZyYW1lUmVmIGZyYW1lLCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIsIFdLVVJM UmVxdWVzdFJlZiByZXF1ZXN0LCBXS1VSTFJlc3BvbnNlUmVmIHJlZGlyZWN0UmVzcG9uc2UsIGNv bnN0IHZvaWQqIGNsaWVudEluZm8pOworCiAKIAogc3RydWN0IFdLQnVuZGxlUGFnZUxvYWRlckNs aWVudCB7CkBAIC0xMTMsNyArMTE0LDcgQEAgc3RydWN0IFdLQnVuZGxlUGFnZUxvYWRlckNsaWVu dCB7CiAgICAgV0tCdW5kbGVQYWdlRGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RGb3JGcmFtZUNhbGxi YWNrICAgICAgICAgICAgICAgICBkaWRDYW5jZWxDbGllbnRSZWRpcmVjdEZvckZyYW1lOwogICAg IFdLQnVuZGxlUGFnZVdpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFtZUNhbGxiYWNrICAg ICAgICAgICAgICAgd2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdEZvckZyYW1lOwogICAgIFdLQnVu ZGxlUGFnZURpZEhhbmRsZU9ubG9hZEV2ZW50c0ZvckZyYW1lQ2FsbGJhY2sgICAgICAgICAgICAg ICAgICAgZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWU7Ci0gICAgV0tCdW5kbGVQYWdlU2hv dWxkTG9hZFJlc291cmNlRm9yRnJhbWVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICBzaG91 bGRMb2FkUmVzb3VyY2VGb3JGcmFtZTsKKyAgICBXS0J1bmRsZVBhZ2VXaWxsU2VuZFJlcXVlc3RG b3JGcmFtZUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgIHdpbGxTZW5kUmVxdWVzdEZv ckZyYW1lOwogfTsKIHR5cGVkZWYgc3RydWN0IFdLQnVuZGxlUGFnZUxvYWRlckNsaWVudCBXS0J1 bmRsZVBhZ2VMb2FkZXJDbGllbnQ7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll bnQuY3BwCShyZXZpc2lvbiA3NzUyOCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x NTgsOCArMTU4LDkgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxsUwog ICAgIGlmICghd2ViUGFnZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKCF3ZWJQYWdlLT5p bmplY3RlZEJ1bmRsZUxvYWRlckNsaWVudCgpLnNob3VsZExvYWRSZXNvdXJjZUZvckZyYW1lKHdl YlBhZ2UsIG1fZnJhbWUsIHJlcXVlc3QudXJsKCkuc3RyaW5nKCkpKSB7Ci0gICAgICAgIHJlcXVl c3QgPSBSZXNvdXJjZVJlcXVlc3QoKTsKKyAgICB3ZWJQYWdlLT5pbmplY3RlZEJ1bmRsZUxvYWRl ckNsaWVudCgpLndpbGxTZW5kUmVxdWVzdEZvckZyYW1lKHdlYlBhZ2UsIG1fZnJhbWUsIGlkZW50 aWZpZXIsIHJlcXVlc3QsIHJlZGlyZWN0UmVzcG9uc2UpOworCisgICAgaWYgKHJlcXVlc3QuaXNO dWxsKCkpIHsKICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBwcm9iYWJseSBzZW5kIGEgbWVz c2FnZSBzYXlpbmcgd2UgY2FuY2VsbGVkIHRoZSByZXF1ZXN0IGZvciB0aGUgcmVzb3VyY2UuCiAg ICAgICAgIHJldHVybjsKICAgICB9CkluZGV4OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA3NzYwNikKKysrIFRvb2xzL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDExLTAyLTAzICBNYWNpZWogU3RhY2hv d2lhayAgPG1qc0BhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2ViS2l0MjogTmVlZCBXZWJLaXQyIGVxdWl2YWxlbnQgb2YgV2ViUmVz b3VyY2VMb2FkRGVsZWdhdGU6OndpbGxTZW5kUmVxdWVzdCBpbiB0aGUgQnVuZGxlCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Mjg5NworICAgICAgICA8 cmRhcjovL3Byb2JsZW0vODg5ODI5ND4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvSW5q ZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcDoKKyAgICAgICAgKFdUUjo6SW5qZWN0 ZWRCdW5kbGVQYWdlOjpJbmplY3RlZEJ1bmRsZVBhZ2UpOgorICAgICAgICAoV1RSOjpJbmplY3Rl ZEJ1bmRsZVBhZ2U6OndpbGxTZW5kUmVxdWVzdEZvckZyYW1lKToKKyAgICAgICAgKiBXZWJLaXRU ZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5oOgorCiAyMDExLTAy LTAzICBIYXlhdG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRC dW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XZWJLaXRU ZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAJKHJldmlzaW9u IDc3NTI4KQorKysgVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3Rl ZEJ1bmRsZVBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTAsNyArMTkwLDcgQEAgSW5qZWN0 ZWRCdW5kbGVQYWdlOjpJbmplY3RlZEJ1bmRsZVBhZ2UoVwogICAgICAgICBkaWRDYW5jZWxDbGll bnRSZWRpcmVjdEZvckZyYW1lLAogICAgICAgICB3aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0Rm9y RnJhbWUsCiAgICAgICAgIGRpZEhhbmRsZU9ubG9hZEV2ZW50c0ZvckZyYW1lLAotICAgICAgICBz aG91bGRMb2FkUmVzb3VyY2VGb3JGcmFtZQorICAgICAgICB3aWxsU2VuZFJlcXVlc3RGb3JGcmFt ZQogICAgIH07CiAgICAgV0tCdW5kbGVQYWdlU2V0TG9hZGVyQ2xpZW50KG1fcGFnZSwgJmxvYWRl ckNsaWVudCk7CiAKQEAgLTMyMiwxMiArMzIyLDExIEBAIHZvaWQgSW5qZWN0ZWRCdW5kbGVQYWdl OjpkaWRSdW5JbnNlY3VyZUMKICAgICBzdGF0aWNfY2FzdDxJbmplY3RlZEJ1bmRsZVBhZ2UqPihj b25zdF9jYXN0PHZvaWQqPihjbGllbnRJbmZvKSktPmRpZFJ1bkluc2VjdXJlQ29udGVudEZvckZy YW1lKGZyYW1lKTsKIH0KIAotYm9vbCBJbmplY3RlZEJ1bmRsZVBhZ2U6OnNob3VsZExvYWRSZXNv dXJjZUZvckZyYW1lKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS0J1bmRsZUZyYW1lUmVmIGZyYW1l LCBXS1N0cmluZ1JlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK1dLVVJMUmVxdWVzdFJlZiBJ bmplY3RlZEJ1bmRsZVBhZ2U6OndpbGxTZW5kUmVxdWVzdEZvckZyYW1lKFdLQnVuZGxlUGFnZVJl ZiBwYWdlLCBXS0J1bmRsZUZyYW1lUmVmIGZyYW1lLCB1aW50NjRfdCBpZGVudGlmaWVyLCBXS1VS TFJlcXVlc3RSZWYgcmVxdWVzdCwgV0tVUkxSZXNwb25zZVJlZiByZWRpcmVjdFJlc3BvbnNlLCBj b25zdCB2b2lkKiBjbGllbnRJbmZvKQogewotICAgIHJldHVybiBzdGF0aWNfY2FzdDxJbmplY3Rl ZEJ1bmRsZVBhZ2UqPihjb25zdF9jYXN0PHZvaWQqPihjbGllbnRJbmZvKSktPnNob3VsZExvYWRS ZXNvdXJjZUZvckZyYW1lKGZyYW1lKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8SW5qZWN0ZWRC dW5kbGVQYWdlKj4oY29uc3RfY2FzdDx2b2lkKj4oY2xpZW50SW5mbykpLT53aWxsU2VuZFJlcXVl c3RGb3JGcmFtZShwYWdlLCBmcmFtZSwgaWRlbnRpZmllciwgcmVxdWVzdCwgcmVkaXJlY3RSZXNw b25zZSk7CiB9CiAKLQogdm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2U6OmRpZFN0YXJ0UHJvdmlzaW9u YWxMb2FkRm9yRnJhbWUoV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSkKIHsKICAgICBpZiAoIUluamVj dGVkQnVuZGxlOjpzaGFyZWQoKS5pc1Rlc3RSdW5uaW5nKCkpCkBAIC01NzUsOSArNTc0LDkgQEAg dm9pZCBJbmplY3RlZEJ1bmRsZVBhZ2U6OmRpZFJ1bkluc2VjdXJlQwogewogfQogCi1ib29sIElu amVjdGVkQnVuZGxlUGFnZTo6c2hvdWxkTG9hZFJlc291cmNlRm9yRnJhbWUoV0tCdW5kbGVGcmFt ZVJlZiBmcmFtZSkKK1dLVVJMUmVxdWVzdFJlZiBJbmplY3RlZEJ1bmRsZVBhZ2U6OndpbGxTZW5k UmVxdWVzdEZvckZyYW1lKFdLQnVuZGxlUGFnZVJlZiwgV0tCdW5kbGVGcmFtZVJlZiwgdWludDY0 X3QsIFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0LCBXS1VSTFJlc3BvbnNlUmVmKQogewotICAgIHJl dHVybiB0cnVlOworICAgIHJldHVybiByZXF1ZXN0OwogfQogCiAvLyBVSSBDbGllbnQgQ2FsbGJh Y2tzCkluZGV4OiBUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVk QnVuZGxlUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0 ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmgJKHJldmlzaW9uIDc3NTI4KQorKysgVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuaAkod29y a2luZyBjb3B5KQpAQCAtNjMsNyArNjMsNyBAQCBwcml2YXRlOgogICAgIHN0YXRpYyB2b2lkIGRp ZEhhbmRsZU9ubG9hZEV2ZW50c0ZvckZyYW1lKFdLQnVuZGxlUGFnZVJlZiwgV0tCdW5kbGVGcmFt ZVJlZiwgY29uc3Qgdm9pZCopOwogICAgIHN0YXRpYyB2b2lkIGRpZERpc3BsYXlJbnNlY3VyZUNv bnRlbnRGb3JGcmFtZShXS0J1bmRsZVBhZ2VSZWYsIFdLQnVuZGxlRnJhbWVSZWYsIFdLVHlwZVJl ZiosIGNvbnN0IHZvaWQqKTsKICAgICBzdGF0aWMgdm9pZCBkaWRSdW5JbnNlY3VyZUNvbnRlbnRG b3JGcmFtZShXS0J1bmRsZVBhZ2VSZWYsIFdLQnVuZGxlRnJhbWVSZWYsIFdLVHlwZVJlZiosIGNv bnN0IHZvaWQqKTsKLSAgICBzdGF0aWMgYm9vbCBzaG91bGRMb2FkUmVzb3VyY2VGb3JGcmFtZShX S0J1bmRsZVBhZ2VSZWYsIFdLQnVuZGxlRnJhbWVSZWYsIFdLU3RyaW5nUmVmLCBjb25zdCB2b2lk Kik7CisgICAgc3RhdGljIFdLVVJMUmVxdWVzdFJlZiB3aWxsU2VuZFJlcXVlc3RGb3JGcmFtZShX S0J1bmRsZVBhZ2VSZWYsIFdLQnVuZGxlRnJhbWVSZWYsIHVpbnQ2NF90IGlkZW50aWZpZXIsIFdL VVJMUmVxdWVzdFJlZiwgV0tVUkxSZXNwb25zZVJlZiwgY29uc3Qgdm9pZCopOwogICAgIHZvaWQg ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZShXS0J1bmRsZUZyYW1lUmVmKTsKICAgICB2 b2lkIGRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdL QnVuZGxlRnJhbWVSZWYpOwogICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJv ckZvckZyYW1lKFdLQnVuZGxlRnJhbWVSZWYsIFdLRXJyb3JSZWYpOwpAQCAtNzksNyArNzksNyBA QCBwcml2YXRlOgogICAgIHZvaWQgZGlkSGFuZGxlT25sb2FkRXZlbnRzRm9yRnJhbWUoV0tCdW5k bGVGcmFtZVJlZik7CiAgICAgdm9pZCBkaWREaXNwbGF5SW5zZWN1cmVDb250ZW50Rm9yRnJhbWUo V0tCdW5kbGVGcmFtZVJlZik7CiAgICAgdm9pZCBkaWRSdW5JbnNlY3VyZUNvbnRlbnRGb3JGcmFt ZShXS0J1bmRsZUZyYW1lUmVmKTsKLSAgICBib29sIHNob3VsZExvYWRSZXNvdXJjZUZvckZyYW1l KFdLQnVuZGxlRnJhbWVSZWYpOworICAgIFdLVVJMUmVxdWVzdFJlZiB3aWxsU2VuZFJlcXVlc3RG b3JGcmFtZShXS0J1bmRsZVBhZ2VSZWYsIFdLQnVuZGxlRnJhbWVSZWYsIHVpbnQ2NF90IGlkZW50 aWZpZXIsIFdLVVJMUmVxdWVzdFJlZiwgV0tVUkxSZXNwb25zZVJlZik7CiAKICAgICAvLyBVSSBD bGllbnQKICAgICBzdGF0aWMgdm9pZCB3aWxsQWRkTWVzc2FnZVRvQ29uc29sZShXS0J1bmRsZVBh Z2VSZWYsIFdLU3RyaW5nUmVmIG1lc3NhZ2UsIHVpbnQzMl90IGxpbmVOdW1iZXIsIGNvbnN0IHZv aWQqIGNsaWVudEluZm8pOwo=