133732 2014-06-11 04:48:01 -0700 Wrap NSURLRequest in bundle API 2014-06-11 10:13:38 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned ap commit-queue mitz oldest_to_newest 1014713 0 koivisto 2014-06-11 04:48:01 -0700 We don't want to construct actual NSURLRequests in web process side unless really needed. 1014714 1 koivisto 2014-06-11 04:52:52 -0700 <rdar://problem/17267217> 1014715 2 232861 koivisto 2014-06-11 04:55:50 -0700 Created attachment 232861 patch 1014718 3 commit-queue 2014-06-11 04:57:09 -0700 Attachment 232861 did not pass style-queue: ERROR: Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:230: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1014755 4 232861 kling 2014-06-11 08:27:20 -0700 Comment on attachment 232861 patch This patch makes me happy! 1014791 5 ap 2014-06-11 10:13:38 -0700 Antti landed this in <http://trac.webkit.org/changeset/169807>. 232861 2014-06-11 04:55:50 -0700 2014-06-11 08:27:20 -0700 patch resourcerequest-wrap.patch text/plain 13213 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTgwMCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE0LTA2LTExICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBXcmFwIE5TVVJMUmVxdWVzdCBp biBidW5kbGUgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzM3MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAg ICAgCisgICAgICAgIFdlIGRvbid0IHdhbnQgdG8gY29uc3RydWN0IGFjdHVhbCBOU1VSTFJlcXVl c3RzIGluIHRoZSB3ZWIgcHJvY2VzcyBzaWRlIHVubGVzcyByZWFsbHkgbmVlZGVkIGFzIGl0IGlz IHNsb3cuCisgICAgICAgIAorICAgICAgICBQYXRjaCBieSBEYW4gQmVybnN0ZWluLgorCisgICAg ICAgICogU2hhcmVkL0NvY29hL0FQSU9iamVjdC5tbToKKyAgICAgICAgKEFQSTo6T2JqZWN0Ojpu ZXdPYmplY3QpOgorICAgICAgICAqIFNoYXJlZC9Db2NvYS9XS05TVVJMUmVxdWVzdC5oOiBBZGRl ZC4KKyAgICAgICAgKFdlYktpdDo6d3JhcHBlcik6CisgICAgICAgICogU2hhcmVkL0NvY29hL1dL TlNVUkxSZXF1ZXN0Lm1tOiBBZGRlZC4KKyAgICAgICAgCisgICAgICAgICAgICBBZGQgYSB3cmFw cGVyIG9iamVjdCB0aGF0IGluaXRpYWxpemVzIHRoZSB1bmRlcmx5aW5nIE5TVVJMUmVxdWVzdCBv bi1kZW1hbmQuCisKKyAgICAgICAgKC1bV0tOU1VSTFJlcXVlc3QgX3dlYl9jcmVhdGVUYXJnZXRd KToKKyAgICAgICAgKC1bV0tOU1VSTFJlcXVlc3QgVVJMXSk6CisgICAgICAgICgtW1dLTlNVUkxS ZXF1ZXN0IGNvcHlXaXRoWm9uZTpdKToKKyAgICAgICAgKiBXZWJLaXQyLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2o6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFj L1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlci5tbToKKyAgICAgICAg KHdpbGxTZW5kUmVxdWVzdEZvckZyYW1lKToKKyAgICAgICAgKGRpZEluaXRpYXRlTG9hZEZvclJl c291cmNlKToKKwogMjAxNC0wNi0xMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gVXNlIGEgZGlmZmVyZW50IHVzZXIgYWdlbnQgc3Ry aW5nIGRlcGVuZGluZyBvbiB0aGUgc2l0ZQpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL0Nv Y29hL0FQSU9iamVjdC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29j b2EvQVBJT2JqZWN0Lm1tCShyZXZpc2lvbiAxNjk3MDYpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvQ29jb2EvQVBJT2JqZWN0Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC00MSw2ICs0MSw3IEBACiAj aW1wb3J0ICJXS05TVVJMLmgiCiAjaW1wb3J0ICJXS05TVVJMQXV0aGVudGljYXRpb25DaGFsbGVu Z2UuaCIKICNpbXBvcnQgIldLTlNVUkxQcm90ZWN0aW9uU3BhY2UuaCIKKyNpbXBvcnQgIldLTlNV UkxSZXF1ZXN0LmgiCiAjaW1wb3J0ICJXS05hdmlnYXRpb25EYXRhSW50ZXJuYWwuaCIKICNpbXBv cnQgIldLUHJvY2Vzc1Bvb2xJbnRlcm5hbC5oIgogI2ltcG9ydCAiV0tXZWJQcm9jZXNzUGx1Z0lu QnJvd3NlckNvbnRleHRDb250cm9sbGVySW50ZXJuYWwuaCIKQEAgLTE1MSw2ICsxNTIsMTAgQEAg dm9pZCogT2JqZWN0OjpuZXdPYmplY3Qoc2l6ZV90IHNpemUsIFR5cAogICAgICAgICB3cmFwcGVy ID0gTlNBbGxvY2F0ZU9iamVjdChbV0tOU1VSTCBjbGFzc10sIHNpemUsIG51bGxwdHIpOwogICAg ICAgICBicmVhazsKIAorICAgIGNhc2UgVHlwZTo6VVJMUmVxdWVzdDoKKyAgICAgICAgd3JhcHBl ciA9IE5TQWxsb2NhdGVPYmplY3QoW1dLTlNVUkxSZXF1ZXN0IGNsYXNzXSwgc2l6ZSwgbnVsbHB0 cik7CisgICAgICAgIGJyZWFrOworCiAgICAgY2FzZSBUeXBlOjpCdW5kbGVGcmFtZToKICAgICAg ICAgd3JhcHBlciA9IFtXS1dlYlByb2Nlc3NQbHVnSW5GcmFtZSBhbGxvY107CiAgICAgICAgIGJy ZWFrOwpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL0NvY29hL1dLTlNVUkxSZXF1ZXN0LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL0NvY29hL1dLTlNVUkxSZXF1ZXN0 LmgJKHJldmlzaW9uIDApCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29jb2EvV0tOU1VSTFJl cXVlc3QuaAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDQ1IEBACisvKgorICogQ29weXJpZ2h0 IChDKSAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBz b3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisg KiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFi b3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisg KiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklC VVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVT LCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJ RVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBV UlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRT IENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VT IChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNU SVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBP UiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRI RU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklM SVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBB RFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2lt cG9ydCAiV0tGb3VuZGF0aW9uLmgiCisKKyNpZiBXS19BUElfRU5BQkxFRAorCisjaW1wb3J0ICJB UElVUkxSZXF1ZXN0LmgiCisjaW1wb3J0ICJXS09iamVjdC5oIgorCituYW1lc3BhY2UgV2ViS2l0 IHsKKworaW5saW5lIE5TVVJMUmVxdWVzdCAqd3JhcHBlcihBUEk6OlVSTFJlcXVlc3QmIHJlcXVl c3QpCit7CisgICAgcmV0dXJuIChOU1VSTFJlcXVlc3QgKilyZXF1ZXN0LndyYXBwZXIoKTsKK30K KworfQorCitAaW50ZXJmYWNlIFdLTlNVUkxSZXF1ZXN0IDogV0tPYmplY3QgPE5TQ29weWluZz4K K0BlbmQKKworI2VuZGlmIC8vIFdLX0FQSV9FTkFCTEVECkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9T aGFyZWQvQ29jb2EvV0tOU1VSTFJlcXVlc3QubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvU2hhcmVkL0NvY29hL1dLTlNVUkxSZXF1ZXN0Lm1tCShyZXZpc2lvbiAwKQorKysgU291cmNl L1dlYktpdDIvU2hhcmVkL0NvY29hL1dLTlNVUkxSZXF1ZXN0Lm1tCSh3b3JraW5nIGNvcHkpCkBA IC0wLDAgKzEsNTQgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTQgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUg bWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBi aW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIg aW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlk ZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklE RUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBB TlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4g Tk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFC TEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExB UlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsg TE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJ T04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhF UiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBO RUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhF IFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW1wb3J0ICJjb25maWcuaCIKKyNpbXBvcnQg IldLTlNVUkxSZXF1ZXN0LmgiCisKKyNpZiBXS19BUElfRU5BQkxFRAorCisjaW1wb3J0ICJXS05T VVJMRXh0cmFzLmgiCisKK0BpbXBsZW1lbnRhdGlvbiBXS05TVVJMUmVxdWVzdAorCistIChOU09i amVjdCAqKV93ZWJfY3JlYXRlVGFyZ2V0Cit7CisgICAgcmV0dXJuIFtzdGF0aWNfY2FzdDxBUEk6 OlVSTFJlcXVlc3QqPigmc2VsZi5fYXBpT2JqZWN0KS0+cmVzb3VyY2VSZXF1ZXN0KCkubnNVUkxS ZXF1ZXN0KFdlYkNvcmU6OkRvTm90VXBkYXRlSFRUUEJvZHkpIGNvcHldOworfQorCistIChOU1VS TCAqKVVSTAoreworICAgIHJldHVybiBbTlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOnN0YXRp Y19jYXN0PEFQSTo6VVJMUmVxdWVzdCo+KCZzZWxmLl9hcGlPYmplY3QpLT5yZXNvdXJjZVJlcXVl c3QoKS51cmwoKS5zdHJpbmcoKV07Cit9CisKKyNwcmFnbWEgbWFyayBOU0NvcHlpbmcgcHJvdG9j b2wgaW1wbGVtZW50YXRpb24KKworLSAoaWQpY29weVdpdGhab25lOihOU1pvbmUgKil6b25lCit7 CisgICAgcmV0dXJuIFtzZWxmIHJldGFpbl07Cit9CisKK0BlbmQKKworI2VuZGlmIC8vIFdLX0FQ SV9FTkFCTEVECkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiAxNjk3MDYpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJL aXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTcyMiw2ICs3 MjIsOCBAQAogCQkzN0E1RTAxNDE4QkJGOTNGMDAwQTA4MUUgLyogX1dLQWN0aXZhdGVkRWxlbWVu dEluZm8uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDM3 QTVFMDEyMThCQkY5MzcwMDBBMDgxRSAvKiBfV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5oICovOyBz ZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTM3QTY0RTU1MThG MzhFM0MwMEVCMzBGMSAvKiBfV0tGb3JtRGVsZWdhdGUuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDM3QTY0RTU0MThGMzhFM0MwMEVCMzBGMSAvKiBfV0tG b3JtRGVsZWdhdGUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9 OyB9OwogCQkzN0E2NEU1NzE4RjM4RjQ2MDBFQjMwRjEgLyogX1dLRm9ybUlucHV0U2Vzc2lvbi5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMzdBNjRFNTYx OEYzOEY0NjAwRUIzMEYxIC8qIF9XS0Zvcm1JbnB1dFNlc3Npb24uaCAqLzsgc2V0dGluZ3MgPSB7 QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OworCQkzN0JGMkYwNjE5NDdERUI0MDA3MjND NDggLyogV0tOU1VSTFJlcXVlc3QuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDM3QkYyRjA0MTk0N0RFQjQwMDcyM0M0OCAvKiBXS05TVVJMUmVxdWVzdC5o ICovOyB9OworCQkzN0JGMkYwNzE5NDdERUI0MDA3MjNDNDggLyogV0tOU1VSTFJlcXVlc3QubW0g aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAzN0JGMkYwNTE5 NDdERUI0MDA3MjNDNDggLyogV0tOU1VSTFJlcXVlc3QubW0gKi87IH07CiAJCTM3QzRDMDg2MTgx NDlDNUIwMDM2ODhCOSAvKiBXS0JhY2tGb3J3YXJkTGlzdEl0ZW0ubW0gaW4gU291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAzN0M0QzA4NDE4MTQ5QzVCMDAzNjg4Qjkg LyogV0tCYWNrRm9yd2FyZExpc3RJdGVtLm1tICovOyB9OwogCQkzN0M0QzA4NzE4MTQ5QzVCMDAz Njg4QjkgLyogV0tCYWNrRm9yd2FyZExpc3RJdGVtLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAzN0M0QzA4NTE4MTQ5QzVCMDAzNjg4QjkgLyogV0tCYWNr Rm9yd2FyZExpc3RJdGVtLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHVibGljLCAp OyB9OyB9OwogCQkzN0M0QzA4OTE4MTQ5RjIzMDAzNjg4QjkgLyogV0tCYWNrRm9yd2FyZExpc3RJ dGVtSW50ZXJuYWwuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDM3QzRDMDg4MTgxNDlGMjMwMDM2ODhCOSAvKiBXS0JhY2tGb3J3YXJkTGlzdEl0ZW1JbnRl cm5hbC5oICovOyB9OwpAQCAtMjY5OCw2ICsyNzAwLDggQEAKIAkJMzdBNUUwMTIxOEJCRjkzNzAw MEEwODFFIC8qIF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvLmggKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvLmg7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CiAJCTM3QTY0RTU0MThGMzhFM0MwMEVCMzBGMSAvKiBfV0tGb3JtRGVsZWdhdGUu aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gX1dLRm9ybURlbGVnYXRlLmg7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTM3QTY0RTU2MThGMzhGNDYwMEVCMzBGMSAvKiBf V0tGb3JtSW5wdXRTZXNzaW9uLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IF9X S0Zvcm1JbnB1dFNlc3Npb24uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMzdCRjJG MDQxOTQ3REVCNDAwNzIzQzQ4IC8qIFdLTlNVUkxSZXF1ZXN0LmggKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmMuaDsgcGF0aCA9IFdLTlNVUkxSZXF1ZXN0Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CisJCTM3QkYyRjA1MTk0N0RFQjQwMDcyM0M0OCAvKiBXS05TVVJMUmVxdWVzdC5tbSAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFdLTlNVUkxSZXF1ZXN0Lm1tOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkzN0M0QzA4NDE4MTQ5QzVCMDAzNjg4QjkgLyog V0tCYWNrRm9yd2FyZExpc3RJdGVtLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3Bw OyBwYXRoID0gV0tCYWNrRm9yd2FyZExpc3RJdGVtLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQkzN0M0QzA4NTE4MTQ5QzVCMDAzNjg4QjkgLyogV0tCYWNrRm9yd2FyZExpc3RJdGVt LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdLQmFja0ZvcndhcmRMaXN0SXRl bS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkzN0M0QzA4ODE4MTQ5RjIzMDAzNjg4 QjkgLyogV0tCYWNrRm9yd2FyZExpc3RJdGVtSW50ZXJuYWwuaCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5oOyBwYXRoID0gV0tCYWNrRm9yd2FyZExpc3RJdGVtSW50ZXJuYWwuaDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTUwMjEsNiArNTAyNSw4IEBACiAJCQkJMzcxODNENTQxODJG NEU3MDAwODBDODExIC8qIFdLTlNVUkxFeHRyYXMubW0gKi8sCiAJCQkJMzcxQjMyREMxODRENjc0 OTAwMTNFMkIyIC8qIFdLTlNVUkxQcm90ZWN0aW9uU3BhY2UuaCAqLywKIAkJCQkzNzFCMzJEQjE4 NEQ2NzQ4MDAxM0UyQjIgLyogV0tOU1VSTFByb3RlY3Rpb25TcGFjZS5tbSAqLywKKwkJCQkzN0JG MkYwNDE5NDdERUI0MDA3MjNDNDggLyogV0tOU1VSTFJlcXVlc3QuaCAqLywKKwkJCQkzN0JGMkYw NTE5NDdERUI0MDA3MjNDNDggLyogV0tOU1VSTFJlcXVlc3QubW0gKi8sCiAJCQkJMzc4RTFBM0Yx ODFFREEwMTAwMzEwMDdBIC8qIFdLT2JqZWN0LmggKi8sCiAJCQkJMzc0NDM2ODcxODIwRTcyNDAw NDk1NzlGIC8qIFdLT2JqZWN0Lm1tICovLAogCQkJKTsKQEAgLTczMDgsNiArNzMxNCw3IEBACiAJ CQkJQ0VEQTEyRTMxNTJDRDFCMzAwRDlFMDhEIC8qIFdlYkFsdGVybmF0aXZlVGV4dENsaWVudC5o IGluIEhlYWRlcnMgKi8sCiAJCQkJNTEyRTM1MkYxMzBCNTVBRjAwQUJEMTlBIC8qIFdlYkFwcGxp Y2F0aW9uQ2FjaGVNYW5hZ2VyLmggaW4gSGVhZGVycyAqLywKIAkJCQkxQTI1NkUzQTE4QTFBN0RG MDA2RkI5MjIgLyogV0tOYXZpZ2F0aW9uQWN0aW9uSW50ZXJuYWwuaCBpbiBIZWFkZXJzICovLAor CQkJCTM3QkYyRjA2MTk0N0RFQjQwMDcyM0M0OCAvKiBXS05TVVJMUmVxdWVzdC5oIGluIEhlYWRl cnMgKi8sCiAJCQkJNTEyRTM1NkIxMzBCNTdGMDAwQUJEMTlBIC8qIFdlYkFwcGxpY2F0aW9uQ2Fj aGVNYW5hZ2VyTWVzc2FnZXMuaCBpbiBIZWFkZXJzICovLAogCQkJCTUxMkUzNTI1MTMwQjU1MDYw MEFCRDE5QSAvKiBXZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclByb3h5LmggaW4gSGVhZGVycyAq LywKIAkJCQk1MTJFMzVGOTEzMEI2NDJFMDBBQkQxOUEgLyogV2ViQXBwbGljYXRpb25DYWNoZU1h bmFnZXJQcm94eU1lc3NhZ2VzLmggaW4gSGVhZGVycyAqLywKQEAgLTkxOTMsNiArOTIwMCw3IEBA CiAJCQkJQkM2NDZDMUExMUREMzk5RjAwNjQ1NUIwIC8qIFdLQmFja0ZvcndhcmRMaXN0UmVmLmNw cCBpbiBTb3VyY2VzICovLAogCQkJCUJDNjQ2QzFDMTFERDM5OUYwMDY0NTVCMCAvKiBXS0JhY2tG b3J3YXJkTGlzdEl0ZW1SZWYuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJMUEyNTZFMzcxOEExQTc4 ODAwNkZCOTIyIC8qIFdLTmF2aWdhdGlvbkFjdGlvbi5tbSBpbiBTb3VyY2VzICovLAorCQkJCTM3 QkYyRjA3MTk0N0RFQjQwMDcyM0M0OCAvKiBXS05TVVJMUmVxdWVzdC5tbSBpbiBTb3VyY2VzICov LAogCQkJCUJDQkFBQzcyMTQ0RTYxOTkwMDUzRjgyRiAvKiBXS0Jyb3dzaW5nQ29udGV4dENvbnRy b2xsZXIubW0gaW4gU291cmNlcyAqLywKIAkJCQlCQ0JBQUNGNTE0NTIzMjRGMDA1M0Y4MkYgLyog V0tCcm93c2luZ0NvbnRleHRHcm91cC5tbSBpbiBTb3VyY2VzICovLAogCQkJCTUxMjkwOTkyMTgz QUNFQUYwMDU1MjJBNiAvKiBXZWJJREJTZXJ2ZXJDb25uZWN0aW9uLmNwcCBpbiBTb3VyY2VzICov LApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFj L1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlci5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tX ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyLm1tCShyZXZpc2lvbiAxNjk3 MDYpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMv V0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyLm1tCSh3b3JraW5nIGNv cHkpCkBAIC0zOCw2ICszOCw3IEBACiAjaW1wb3J0ICJXS0RPTUludGVybmFscy5oIgogI2ltcG9y dCAiV0tOU0RpY3Rpb25hcnkuaCIKICNpbXBvcnQgIldLTlNFcnJvci5oIgorI2ltcG9ydCAiV0tO U1VSTFJlcXVlc3QuaCIKICNpbXBvcnQgIldLUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudHNJbnRlcm5h bC5oIgogI2ltcG9ydCAiV0tSZXRhaW5QdHIuaCIKICNpbXBvcnQgIldLVVJMUmVxdWVzdE5TLmgi CkBAIC0yMDUsNyArMjA2LDcgQEAgc3RhdGljIFdLVVJMUmVxdWVzdFJlZiB3aWxsU2VuZFJlcXVl c3RGbwogICAgIGF1dG8gbG9hZERlbGVnYXRlID0gcGx1Z2luQ29udGV4dENvbnRyb2xsZXItPl9s b2FkRGVsZWdhdGUuZ2V0KCk7CiAKICAgICBpZiAoW2xvYWREZWxlZ2F0ZSByZXNwb25kc1RvU2Vs ZWN0b3I6QHNlbGVjdG9yKHdlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXI6 ZnJhbWU6d2lsbFNlbmRSZXF1ZXN0OnJlZGlyZWN0UmVzcG9uc2U6KV0pIHsKLSAgICAgICAgTlNV UkxSZXF1ZXN0ICpvcmlnaW5hbFJlcXVlc3QgPSB0b0ltcGwocmVxdWVzdCktPnJlc291cmNlUmVx dWVzdCgpLm5zVVJMUmVxdWVzdChEb05vdFVwZGF0ZUhUVFBCb2R5KTsKKyAgICAgICAgTlNVUkxS ZXF1ZXN0ICpvcmlnaW5hbFJlcXVlc3QgPSB3cmFwcGVyKCp0b0ltcGwocmVxdWVzdCkpOwogICAg ICAgICBSZXRhaW5QdHI8TlNVUkxSZXF1ZXN0PiBzdWJzdGl0dXRlUmVxdWVzdCA9IFtsb2FkRGVs ZWdhdGUgd2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlcjpwbHVnaW5Db250 ZXh0Q29udHJvbGxlciBmcmFtZTp3cmFwcGVyKCp0b0ltcGwoZnJhbWUpKSB3aWxsU2VuZFJlcXVl c3Q6b3JpZ2luYWxSZXF1ZXN0CiAgICAgICAgICAgICByZWRpcmVjdFJlc3BvbnNlOnRvSW1wbChy ZWRpcmVjdFJlc3BvbnNlKS0+cmVzb3VyY2VSZXNwb25zZSgpLm5zVVJMUmVzcG9uc2UoKV07CiAK QEAgLTIyNiw3ICsyMjcsNyBAQCBzdGF0aWMgdm9pZCBkaWRJbml0aWF0ZUxvYWRGb3JSZXNvdXJj ZShXCiAgICAgICAgIFtsb2FkRGVsZWdhdGUgd2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0 Q29udHJvbGxlcjpwbHVnaW5Db250ZXh0Q29udHJvbGxlcgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZnJhbWU6d3JhcHBlcigqdG9JbXBs KGZyYW1lKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZEluaXRpYXRl TG9hZEZvclJlc291cmNlOnJlc291cmNlSWRlbnRpZmllcgotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlcXVlc3Q6dG9JbXBsKHJlcXVlc3Qp LT5yZXNvdXJjZVJlcXVlc3QoKS5uc1VSTFJlcXVlc3QoRG9Ob3RVcGRhdGVIVFRQQm9keSldOwor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJl cXVlc3Q6d3JhcHBlcigqdG9JbXBsKHJlcXVlc3QpKV07CiAgICAgfQogfQogCg==