101111 2012-11-02 15:14:52 -0700 [Mac] ResourceHandle changes for network process 2012-11-05 15:13:05 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap beidson jberlin oldest_to_newest 757655 0 ap 2012-11-02 15:14:52 -0700 Patch forthcoming. 757673 1 172159 ap 2012-11-02 15:27:28 -0700 Created attachment 172159 proposed patch 757701 2 172159 jberlin 2012-11-02 16:00:32 -0700 Comment on attachment 172159 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=172159&action=review > Source/WebCore/ChangeLog:7 > + It would be good to give a short summary of why we want to use an NSOperationQueue here over scheduling with the run loop. > Source/WebCore/ChangeLog:11 > + Add an ability to schedul on an NSOperationQueue. Now that scheduling on run loop Typo: "schedul" > Source/WebCore/platform/network/NetworkingContext.h:27 > #include "SchedulePair.h" Nit pick: Don't we always put forward declarations after #includes? 757721 3 ap 2012-11-02 16:11:56 -0700 Committed <http://trac.webkit.org/changeset/133366>. 758946 4 ap 2012-11-05 15:13:05 -0800 > Nit pick: Don't we always put forward declarations after #includes? I meant to change the header accordingly, but committed without saving this file. Will fix later. 172159 2012-11-02 15:27:28 -0700 2012-11-02 16:00:32 -0700 proposed patch OperationQueue.txt text/plain 9490 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMzM1NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEyLTExLTAyICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIFJlc291cmNlSGFu ZGxlIGNoYW5nZXMgZm9yIG5ldHdvcmsgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMTExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtpbmdDb250 ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JraW5nQ29udGV4dDo6c2NoZWR1bGVkUnVu TG9vcFBhaXJzKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtpbmdDb250ZXh0OjpzY2hlZHVs ZWRPcGVyYXRpb25RdWV1ZSk6CisgICAgICAgIEFkZCBhbiBhYmlsaXR5IHRvIHNjaGVkdWwgb24g YW4gTlNPcGVyYXRpb25RdWV1ZS4gTm93IHRoYXQgc2NoZWR1bGluZyBvbiBydW4gbG9vcAorICAg ICAgICBpcyBub3QgYSBtdXN0LCBnaXZlIHNjaGVkdWxlZFJ1bkxvb3BQYWlycygpIGEgZGVmYXVs dCBpbXBsZW1lbnRhdGlvbi4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvbWFjL1Jlc291 cmNlSGFuZGxlTWFjLm1tOiBSZW1vdmVkIGlzSW5pdGlhbGl6aW5nQ29ubmVjdGlvbgorICAgICAg ICBzdGF0aWMuIEl0IHdhcyBvbmx5IHVzZWQgdG8gY2F0Y2ggYSBsb25nIG9ic29sZXRlIGJ1ZyB3 aXRoIGRlYnVnIGxvZ2dpbmcsIGFuZAorICAgICAgICBjYW5ub3Qgd29yayB3aXRoIG11bHRpcGxl IHRocmVhZHMuCisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6c3RhcnQpOiBTY2Vk dWxlIG9uIGEgb3BlcmF0aW9uIHF1ZXVlIGlmIGFwcGxpY2FibGUuCisgICAgICAgICgtW1dlYkNv cmVSZXNvdXJjZUhhbmRsZUFzRGVsZWdhdGUgY29ubmVjdGlvbjp3aWxsQ2FjaGVSZXNwb25zZTpd KTogUmVtb3ZlZCBhCisgICAgICAgIGNoZWNrIHRoYXQgdXNlZCBpc0luaXRpYWxpemluZ0Nvbm5l Y3Rpb24uCisKIDIwMTItMTEtMDIgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAog ICAgICAgICBtZW1vcnktaW5zdHJ1bWVudGF0aW9uLWNhY2hlZC1pbWFnZXMuaHRtbCBpcyBjcmFz aGluZwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JraW5nQ29u dGV4dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0 d29ya2luZ0NvbnRleHQuaAkocmV2aXNpb24gMTMzMzI0KQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9OZXR3b3JraW5nQ29udGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMyw2 ICsyMyw3IEBACiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KIAogI2lmIFBMQVRGT1JNKE1B QykKK09CSkNfQ0xBU1MgTlNPcGVyYXRpb25RdWV1ZTsKICNpbmNsdWRlICJTY2hlZHVsZVBhaXIu aCIKICNlbmRpZgogCkBAIC01Myw3ICs1NCw4IEBAIHB1YmxpYzoKICNpZiBQTEFURk9STShNQUMp CiAgICAgdmlydHVhbCBib29sIG5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzKCkgY29uc3QgPSAwOwog ICAgIHZpcnR1YWwgYm9vbCBsb2NhbEZpbGVDb250ZW50U25pZmZpbmdFbmFibGVkKCkgY29uc3Qg PSAwOwotICAgIHZpcnR1YWwgU2NoZWR1bGVQYWlySGFzaFNldCogc2NoZWR1bGVkUnVuTG9vcFBh aXJzKCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgU2NoZWR1bGVQYWlySGFzaFNldCogc2NoZWR1 bGVkUnVuTG9vcFBhaXJzKCkgY29uc3QgeyByZXR1cm4gMDsgfQorICAgIHZpcnR1YWwgTlNPcGVy YXRpb25RdWV1ZSAqc2NoZWR1bGVkT3BlcmF0aW9uUXVldWUoKSBjb25zdCB7IHJldHVybiAwOyB9 CiAgICAgdmlydHVhbCBSZXNvdXJjZUVycm9yIGJsb2NrZWRFcnJvcihjb25zdCBSZXNvdXJjZVJl cXVlc3QmKSBjb25zdCA9IDA7CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9tYWMvUmVzb3VyY2VIYW5kbGVNYWMubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VIYW5kbGVNYWMubW0JKHJldmlz aW9uIDEzMzMyNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL1Jlc291 cmNlSGFuZGxlTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENv cHlyaWdodCAoQykgMjAwNCwgMjAwNiwgMjAwNywgMjAwOCwgMjAwOSwgMjAxMCwgMjAxMSBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDQsIDIwMDYs IDIwMDcsIDIwMDgsIDIwMDksIDIwMTAsIDIwMTEsIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0xMjQsMTAgKzEy NCw2IEBAIHByaXZhdGU6CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotI2lmbmRlZiBOREVCVUcK LXN0YXRpYyBib29sIGlzSW5pdGlhbGl6aW5nQ29ubmVjdGlvbjsKLSNlbmRpZgotICAgIAogc3Rh dGljIHZvaWQgYXBwbHlCYXNpY0F1dGhvcml6YXRpb25IZWFkZXIoUmVzb3VyY2VSZXF1ZXN0JiBy ZXF1ZXN0LCBjb25zdCBDcmVkZW50aWFsJiBjcmVkZW50aWFsKQogewogICAgIFN0cmluZyBhdXRo ZW50aWNhdGlvbkhlYWRlciA9ICJCYXNpYyAiICsgYmFzZTY0RW5jb2RlKFN0cmluZyhjcmVkZW50 aWFsLnVzZXIoKSArICI6IiArIGNyZWRlbnRpYWwucGFzc3dvcmQoKSkudXRmOCgpKTsKQEAgLTI1 MCwxMCArMjQ2LDYgQEAgYm9vbCBSZXNvdXJjZUhhbmRsZTo6c3RhcnQoTmV0d29ya2luZ0Nvbgog ICAgIGlmICghY29udGV4dC0+aXNWYWxpZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSNp Zm5kZWYgTkRFQlVHCi0gICAgaXNJbml0aWFsaXppbmdDb25uZWN0aW9uID0gWUVTOwotI2VuZGlm Ci0KICAgICBBU1NFUlQoIWQtPm1fcHJveHkpOwogICAgIGQtPm1fcHJveHkuYWRvcHROUyh3a0Ny ZWF0ZU5TVVJMQ29ubmVjdGlvbkRlbGVnYXRlUHJveHkoKSk7CiAgICAgW3N0YXRpY19jYXN0PFdl YkNvcmVOU1VSTENvbm5lY3Rpb25EZWxlZ2F0ZVByb3h5Kj4oZC0+bV9wcm94eS5nZXQoKSkgc2V0 RGVsZWdhdGU6UmVzb3VyY2VIYW5kbGU6OmRlbGVnYXRlKCldOwpAQCAtMjc4LDYgKzI3MCwxMiBA QCBib29sIFJlc291cmNlSGFuZGxlOjpzdGFydChOZXR3b3JraW5nQ29uCiAgICAgICAgIH0KICAg ICB9CiAKKyAgICBpZiAoTlNPcGVyYXRpb25RdWV1ZSAqb3BlcmF0aW9uUXVldWUgPSBjb250ZXh0 LT5zY2hlZHVsZWRPcGVyYXRpb25RdWV1ZSgpKSB7CisgICAgICAgIEFTU0VSVCghc2NoZWR1bGVk KTsKKyAgICAgICAgW2Nvbm5lY3Rpb24oKSBzZXREZWxlZ2F0ZVF1ZXVlOm9wZXJhdGlvblF1ZXVl XTsKKyAgICAgICAgc2NoZWR1bGVkID0gdHJ1ZTsKKyAgICB9CisKICAgICAvLyBTdGFydCB0aGUg Y29ubmVjdGlvbiBpZiB3ZSBkaWQgc2NoZWR1bGUgd2l0aCBhdCBsZWFzdCBvbmUgcnVubG9vcC4K ICAgICAvLyBXZSBjYW4ndCBzdGFydCB0aGUgY29ubmVjdGlvbiB1bnRpbCB3ZSBoYXZlIG9uZSBy dW5sb29wIHNjaGVkdWxlZC4KICAgICBpZiAoc2NoZWR1bGVkKQpAQCAtMjg1LDEwICsyODMsNiBA QCBib29sIFJlc291cmNlSGFuZGxlOjpzdGFydChOZXR3b3JraW5nQ29uCiAgICAgZWxzZQogICAg ICAgICBkLT5tX3N0YXJ0V2hlblNjaGVkdWxlZCA9IHRydWU7CiAKLSNpZm5kZWYgTkRFQlVHCi0g ICAgaXNJbml0aWFsaXppbmdDb25uZWN0aW9uID0gTk87Ci0jZW5kaWYKLQogICAgIExPRyhOZXR3 b3JrLCAiSGFuZGxlICVwIHN0YXJ0aW5nIGNvbm5lY3Rpb24gJXAgZm9yICVAIiwgdGhpcywgY29u bmVjdGlvbigpLCBmaXJzdFJlcXVlc3QoKS5uc1VSTFJlcXVlc3QoKSk7CiAgICAgCiAgICAgaWYg KGQtPm1fY29ubmVjdGlvbikgewpAQCAtODc5LDExICs4NzMsNiBAQCAtIChOU0NhY2hlZFVSTFJl c3BvbnNlICopY29ubmVjdGlvbjooTlNVCiAKICAgICBVTlVTRURfUEFSQU0oY29ubmVjdGlvbik7 CiAKLSNpZm5kZWYgTkRFQlVHCi0gICAgaWYgKGlzSW5pdGlhbGl6aW5nQ29ubmVjdGlvbikKLSAg ICAgICAgTE9HX0VSUk9SKCJjb25uZWN0aW9uOndpbGxDYWNoZVJlc3BvbnNlOiB3YXMgY2FsbGVk IGluc2lkZSBvZiBbTlNVUkxDb25uZWN0aW9uIGluaXRXaXRoUmVxdWVzdDpkZWxlZ2F0ZTpdICg0 MDY3NjI1KSIpOwotI2VuZGlmCi0KICAgICBpZiAoIW1faGFuZGxlIHx8ICFtX2hhbmRsZS0+Y2xp ZW50KCkpCiAgICAgICAgIHJldHVybiBuaWw7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEz MzM1NykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDEyLTExLTAyICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIFtNYWNdIFJlc291cmNlSGFuZGxlIGNoYW5nZXMgZm9yIG5ldHdvcmsgcHJv Y2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAx MTExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBO ZXR3b3JrUHJvY2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NNYWluTWFjLm1tOiAoV2ViS2l0OjpOZXR3 b3JrUHJvY2Vzc01haW4pOgorICAgICAgICBXZSB3YW50IHRvIHVzZSBXZWJLaXRTeXN0ZW1JbnRl cmZhY2UgaW4gbmV0d29yayBwcm9jZXNzLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL21hYy9S ZW1vdGVOZXR3b3JraW5nQ29udGV4dC5oOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVOZXR3b3Jr aW5nQ29udGV4dDo6Y3JlYXRlKTogQWRkZWQgYSBjb25zdHJ1Y3RvciBhbmQgYSBjcmVhdGUgZnVu Y3Rpb24uCisgICAgICAgIFN3aXRjaGVkIGZyb20gc2NoZWR1bGVkUnVuTG9vcFBhaXJzKCkgdG8g dGhlIG5ldyBzY2hlZHVsZWRPcGVyYXRpb25RdWV1ZSgpLgorCisgICAgICAgICogTmV0d29ya1By b2Nlc3MvbWFjL1JlbW90ZU5ldHdvcmtpbmdDb250ZXh0Lm1tOgorICAgICAgICAoV2ViS2l0OjpS ZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6UmVtb3RlTmV0d29ya2luZ0NvbnRleHQpOgorICAgICAg ICAoV2ViS2l0OjpSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6c2NoZWR1bGVkT3BlcmF0aW9uUXVl dWUpOgorICAgICAgICBEaXR0by4KKwogMjAxMi0xMS0wMiAgU2ltb24gRnJhc2VyICA8c2ltb24u ZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBFbmFibGUgU1VCUElYRUxfTEFZT1VUIG9uIE1h YwpJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvbWFjL05ldHdvcmtQcm9jZXNz TWFpbk1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9t YWMvTmV0d29ya1Byb2Nlc3NNYWluTWFjLm1tCShyZXZpc2lvbiAxMzMzMjQpCisrKyBTb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9tYWMvTmV0d29ya1Byb2Nlc3NNYWluTWFjLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAjaW1wb3J0ICJOZXR3b3JrUHJvY2Vzcy5oIgog I2ltcG9ydCA8V2ViQ29yZS9SdW5Mb29wLmg+CiAjaW1wb3J0IDxXZWJLaXRTeXN0ZW1JbnRlcmZh Y2UuaD4KKyNpbXBvcnQgPFdlYlN5c3RlbUludGVyZmFjZS5oPgogI2ltcG9ydCA8bWFjaC9tYWNo X2Vycm9yLmg+CiAjaW1wb3J0IDxydW50aW1lL0luaXRpYWxpemVUaHJlYWRpbmcuaD4KICNpbXBv cnQgPHNlcnZlcnMvYm9vdHN0cmFwLmg+CkBAIC03OCw3ICs3OSw3IEBAIGludCBOZXR3b3JrUHJv Y2Vzc01haW4oY29uc3QgQ29tbWFuZExpbmUKICAgICBzaWduYWwoU0lHU0VHViwgX2V4aXQpOwog I2VuZGlmCiAKLQorICAgIEluaXRXZWJDb3JlU3lzdGVtSW50ZXJmYWNlKCk7CiAgICAgSlNDOjpp bml0aWFsaXplVGhyZWFkaW5nKCk7CiAgICAgV1RGOjppbml0aWFsaXplTWFpblRocmVhZCgpOwog ICAgIFJ1bkxvb3A6OmluaXRpYWxpemVNYWluUnVuTG9vcCgpOwpJbmRleDogU291cmNlL1dlYktp dDIvTmV0d29ya1Byb2Nlc3MvbWFjL1JlbW90ZU5ldHdvcmtpbmdDb250ZXh0LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvbWFjL1JlbW90ZU5ldHdvcmtpbmdD b250ZXh0LmgJKHJldmlzaW9uIDEzMzMyNCkKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9j ZXNzL21hYy9SZW1vdGVOZXR3b3JraW5nQ29udGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMiwx NCArMzIsMjAgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFJlbW90ZU5ldHdvcmtpbmdD b250ZXh0IDogcHVibGljIFdlYkNvcmU6Ok5ldHdvcmtpbmdDb250ZXh0IHsKIHB1YmxpYzoKKyAg ICBzdGF0aWMgUGFzc1JlZlB0cjxSZW1vdGVOZXR3b3JraW5nQ29udGV4dD4gY3JlYXRlKGJvb2wg bmVlZHNTaXRlU3BlY2lmaWNRdWlya3MsIGJvb2wgbG9jYWxGaWxlQ29udGVudFNuaWZmaW5nRW5h YmxlZCkKKyAgICB7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgUmVtb3RlTmV0d29ya2lu Z0NvbnRleHQobmVlZHNTaXRlU3BlY2lmaWNRdWlya3MsIGxvY2FsRmlsZUNvbnRlbnRTbmlmZmlu Z0VuYWJsZWQpKTsKKyAgICB9CiAgICAgdmlydHVhbCB+UmVtb3RlTmV0d29ya2luZ0NvbnRleHQo KTsKIAogcHJpdmF0ZToKKyAgICBSZW1vdGVOZXR3b3JraW5nQ29udGV4dChib29sIG5lZWRzU2l0 ZVNwZWNpZmljUXVpcmtzLCBib29sIGxvY2FsRmlsZUNvbnRlbnRTbmlmZmluZ0VuYWJsZWQpOwor CiAgICAgdmlydHVhbCBib29sIGlzVmFsaWQoKSBjb25zdCBPVkVSUklERTsKIAogICAgIHZpcnR1 YWwgYm9vbCBuZWVkc1NpdGVTcGVjaWZpY1F1aXJrcygpIGNvbnN0IE9WRVJSSURFOwogICAgIHZp cnR1YWwgYm9vbCBsb2NhbEZpbGVDb250ZW50U25pZmZpbmdFbmFibGVkKCkgY29uc3QgT1ZFUlJJ REU7Ci0gICAgdmlydHVhbCBXZWJDb3JlOjpTY2hlZHVsZVBhaXJIYXNoU2V0KiBzY2hlZHVsZWRS dW5Mb29wUGFpcnMoKSBjb25zdCBPVkVSUklERTsKKyAgICB2aXJ0dWFsIE5TT3BlcmF0aW9uUXVl dWUgKnNjaGVkdWxlZE9wZXJhdGlvblF1ZXVlKCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVh bCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yIGJsb2NrZWRFcnJvcihjb25zdCBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QmKSBjb25zdCBPVkVSUklERTsKIAogICAgIGJvb2wgbV9uZWVkc1NpdGVTcGVj aWZpY1F1aXJrczsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL21hYy9SZW1v dGVOZXR3b3JraW5nQ29udGV4dC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9tYWMvUmVtb3RlTmV0d29ya2luZ0NvbnRleHQubW0JKHJldmlzaW9uIDEzMzMy NCkKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL21hYy9SZW1vdGVOZXR3b3JraW5n Q29udGV4dC5tbQkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMsMTIgQEAgdXNpbmcgbmFtZXNw YWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitSZW1vdGVOZXR3b3JraW5nQ29u dGV4dDo6UmVtb3RlTmV0d29ya2luZ0NvbnRleHQoYm9vbCBuZWVkc1NpdGVTcGVjaWZpY1F1aXJr cywgYm9vbCBsb2NhbEZpbGVDb250ZW50U25pZmZpbmdFbmFibGVkKQorICAgIDogbV9uZWVkc1Np dGVTcGVjaWZpY1F1aXJrcyhuZWVkc1NpdGVTcGVjaWZpY1F1aXJrcykKKyAgICAsIG1fbG9jYWxG aWxlQ29udGVudFNuaWZmaW5nRW5hYmxlZChsb2NhbEZpbGVDb250ZW50U25pZmZpbmdFbmFibGVk KQoreworfQorCiBSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6flJlbW90ZU5ldHdvcmtpbmdDb250 ZXh0KCkKIHsKIH0KQEAgLTUyLDE0ICs1OCwxNSBAQCBib29sIFJlbW90ZU5ldHdvcmtpbmdDb250 ZXh0Ojpsb2NhbEZpbGVDCiAgICAgcmV0dXJuIG1fbG9jYWxGaWxlQ29udGVudFNuaWZmaW5nRW5h YmxlZDsKIH0KIAotU2NoZWR1bGVQYWlySGFzaFNldCogUmVtb3RlTmV0d29ya2luZ0NvbnRleHQ6 OnNjaGVkdWxlZFJ1bkxvb3BQYWlycygpIGNvbnN0CitOU09wZXJhdGlvblF1ZXVlICpSZW1vdGVO ZXR3b3JraW5nQ29udGV4dDo6c2NoZWR1bGVkT3BlcmF0aW9uUXVldWUoKSBjb25zdAogewotICAg IHN0YXRpYyBTY2hlZHVsZVBhaXJIYXNoU2V0KiBwYWlyczsKLSAgICBpZiAoIXBhaXJzKSB7Ci0g ICAgICAgIHBhaXJzID0gbmV3IFNjaGVkdWxlUGFpckhhc2hTZXQ7Ci0gICAgICAgIHBhaXJzLT5h ZGQoU2NoZWR1bGVQYWlyOjpjcmVhdGUoQ0ZSdW5Mb29wR2V0TWFpbigpLCBrQ0ZSdW5Mb29wQ29t bW9uTW9kZXMpKTsKKyAgICBzdGF0aWMgTlNPcGVyYXRpb25RdWV1ZSAqcXVldWU7CisgICAgaWYg KCFxdWV1ZSkgeworICAgICAgICBxdWV1ZSA9IFtbTlNPcGVyYXRpb25RdWV1ZSBhbGxvY10gaW5p dF07CisgICAgICAgIC8vIERlZmF1bHQgY29uY3VycmVudCBvcGVyYXRpb24gY291bnQgZGVwZW5k cyBvbiBjdXJyZW50IHN5c3RlbSB3b3JrbG9hZCwgYnV0IGRlbGVnYXRlIG1ldGhvZHMgYXJlIG1v c3RseSBpZGxpbmcgaW4gSVBDLCBzbyB3ZSBjYW4gcnVuIGFzIG1hbnkgYXMgbmVlZGVkLgorICAg ICAgICBbcXVldWUgc2V0TWF4Q29uY3VycmVudE9wZXJhdGlvbkNvdW50Ok5TSW50ZWdlck1heF07 CiAgICAgfQotICAgIHJldHVybiBwYWlyczsKKyAgICByZXR1cm4gcXVldWU7CiB9CiAKIFJlc291 cmNlRXJyb3IgUmVtb3RlTmV0d29ya2luZ0NvbnRleHQ6OmJsb2NrZWRFcnJvcihjb25zdCBSZXNv dXJjZVJlcXVlc3QmIHJlcXVlc3QpIGNvbnN0Cg==