118050 2013-06-26 00:29:39 -0700 [curl] Fix unused variable/parameter warnings 2013-06-27 03:28:45 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 117300 0 galpeter webkit-unassigned bfulgham cdumez commit-queue oldest_to_newest 903589 0 galpeter 2013-06-26 00:29:39 -0700 During the build there are a few warning reporting unused variable/parameter in the curl parts. 903591 1 205459 galpeter 2013-06-26 00:36:25 -0700 Created attachment 205459 patch This should get rid of the warnings. 903592 2 commit-queue 2013-06-26 00:39:07 -0700 Attachment 205459 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/network/curl/CredentialStorageCurl.cpp', u'Source/WebCore/platform/network/curl/DNSCurl.cpp', u'Source/WebCore/platform/network/curl/ResourceHandleManager.cpp']" exit_code: 1 Source/WebCore/platform/network/curl/ResourceHandleManager.cpp:118: curl_lock_callback is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/WebCore/platform/network/curl/ResourceHandleManager.cpp:124: curl_unlock_callback is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 903593 3 galpeter 2013-06-26 00:43:10 -0700 (In reply to comment #2) > Attachment 205459 [details] did not pass style-queue: > > Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/network/curl/CredentialStorageCurl.cpp', u'Source/WebCore/platform/network/curl/DNSCurl.cpp', u'Source/WebCore/platform/network/curl/ResourceHandleManager.cpp']" exit_code: 1 > Source/WebCore/platform/network/curl/ResourceHandleManager.cpp:118: curl_lock_callback is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] > Source/WebCore/platform/network/curl/ResourceHandleManager.cpp:124: curl_unlock_callback is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] > Total errors found: 2 in 4 files > > > If any of these errors are false positives, please file a bug against check-webkit-style. I don't think we should address this in this patch. 903806 4 205459 cdumez 2013-06-26 10:49:35 -0700 Comment on attachment 205459 patch View in context: https://bugs.webkit.org/attachment.cgi?id=205459&action=review > Source/WebCore/ChangeLog:7 > + Missing changelog. 904120 5 205580 galpeter 2013-06-27 02:26:36 -0700 Created attachment 205580 patch v2 now with "pretty changelog" 904121 6 commit-queue 2013-06-27 02:29:08 -0700 Attachment 205580 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/network/curl/CredentialStorageCurl.cpp', u'Source/WebCore/platform/network/curl/DNSCurl.cpp', u'Source/WebCore/platform/network/curl/ResourceHandleManager.cpp']" exit_code: 1 Source/WebCore/platform/network/curl/ResourceHandleManager.cpp:118: curl_lock_callback is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Source/WebCore/platform/network/curl/ResourceHandleManager.cpp:124: curl_unlock_callback is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 904128 7 205580 cdumez 2013-06-27 02:45:55 -0700 Comment on attachment 205580 patch v2 ok, r=me. 904142 8 205580 commit-queue 2013-06-27 03:28:42 -0700 Comment on attachment 205580 patch v2 Clearing flags on attachment: 205580 Committed r152087: <http://trac.webkit.org/changeset/152087> 904143 9 commit-queue 2013-06-27 03:28:45 -0700 All reviewed patches have been landed. Closing bug. 205459 2013-06-26 00:36:25 -0700 2013-06-27 02:26:36 -0700 patch curl_warning_fix.patch text/plain 4616 galpeter ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhMjk0NzNjLi44M2ZkNmRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTMtMDYtMjYgIFBldGVyIEdhbCAgPGdhbHBldGVyQGluZi51LXN6ZWdlZC5odT4KKwor ICAgICAgICBbY3VybF0gRml4IHVudXNlZCB2YXJpYWJsZS9wYXJhbWV0ZXIgd2FybmluZ3MKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExODA1MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIHRlc3RzIHJl cXVpcmVkLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL0NyZWRlbnRpYWxTdG9y YWdlQ3VybC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDcmVkZW50aWFsU3RvcmFnZTo6Z2V0RnJv bVBlcnNpc3RlbnRTdG9yYWdlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvRE5T Q3VybC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwcmVmZXRjaEROUyk6CisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpjdXJsX2xvY2tfY2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6Y3VybF91bmxv Y2tfY2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6aGVhZGVyQ2FsbGJhY2spOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpkb3dubG9hZFRpbWVyQ2FsbGJhY2sp OgorCiAyMDEzLTA2LTI1ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAg ICAgIEpTU3RyaW5nIHNob3VsZCByZW1lbWJlciBBdG9taWNTdHJpbmcKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DcmVkZW50aWFsU3RvcmFnZUN1cmwu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0NyZWRlbnRpYWxTdG9y YWdlQ3VybC5jcHAKaW5kZXggY2QxZmNlZi4uZjM4MWM5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0NyZWRlbnRpYWxTdG9yYWdlQ3VybC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0NyZWRlbnRpYWxTdG9yYWdl Q3VybC5jcHAKQEAgLTMxLDcgKzMxLDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1DcmVk ZW50aWFsIENyZWRlbnRpYWxTdG9yYWdlOjpnZXRGcm9tUGVyc2lzdGVudFN0b3JhZ2UoY29uc3Qg UHJvdGVjdGlvblNwYWNlJiBwcm90ZWN0aW9uU3BhY2UpCitDcmVkZW50aWFsIENyZWRlbnRpYWxT dG9yYWdlOjpnZXRGcm9tUGVyc2lzdGVudFN0b3JhZ2UoY29uc3QgUHJvdGVjdGlvblNwYWNlJiAv KiBwcm90ZWN0aW9uU3BhY2UgKi8pCiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKICAgICByZXR1 cm4gQ3JlZGVudGlhbCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jdXJsL0ROU0N1cmwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9j dXJsL0ROU0N1cmwuY3BwCmluZGV4IDFmZmUxYTAuLmIwZDhiM2IgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9ETlNDdXJsLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvRE5TQ3VybC5jcHAKQEAgLTMwLDcgKzMwLDcg QEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi12b2lkIHByZWZldGNoRE5TKGNvbnN0IFN0cmlu ZyYgaG9zdG5hbWUpCit2b2lkIHByZWZldGNoRE5TKGNvbnN0IFN0cmluZyYgLyogaG9zdG5hbWUg Ki8pCiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5j cHAKaW5kZXggZWEzMDBjYi4uMjkwNWI0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAK QEAgLTExNSwxMyArMTE1LDEzIEBAIHN0YXRpYyBNdXRleCogc2hhcmVkUmVzb3VyY2VNdXRleChj dXJsX2xvY2tfZGF0YSBkYXRhKSB7CiAvLyBsaWJjdXJsIGRvZXMgbm90IGltcGxlbWVudCBpdHMg b3duIHRocmVhZCBzeW5jaHJvbml6YXRpb24gcHJpbWl0aXZlcy4KIC8vIHRoZXNlIHR3byBmdW5j dGlvbnMgcHJvdmlkZSBtdXRleGVzIGZvciBjb29raWVzLCBhbmQgZm9yIHRoZSBnbG9iYWwgRE5T CiAvLyBjYWNoZS4KLXN0YXRpYyB2b2lkIGN1cmxfbG9ja19jYWxsYmFjayhDVVJMKiBoYW5kbGUs IGN1cmxfbG9ja19kYXRhIGRhdGEsIGN1cmxfbG9ja19hY2Nlc3MgYWNjZXNzLCB2b2lkKiB1c2Vy UHRyKQorc3RhdGljIHZvaWQgY3VybF9sb2NrX2NhbGxiYWNrKENVUkwqIC8qIGhhbmRsZSAqLywg Y3VybF9sb2NrX2RhdGEgZGF0YSwgY3VybF9sb2NrX2FjY2VzcyAvKiBhY2Nlc3MgKi8sIHZvaWQq IC8qIHVzZXJQdHIgKi8pCiB7CiAgICAgaWYgKE11dGV4KiBtdXRleCA9IHNoYXJlZFJlc291cmNl TXV0ZXgoZGF0YSkpCiAgICAgICAgIG11dGV4LT5sb2NrKCk7CiB9CiAKLXN0YXRpYyB2b2lkIGN1 cmxfdW5sb2NrX2NhbGxiYWNrKENVUkwqIGhhbmRsZSwgY3VybF9sb2NrX2RhdGEgZGF0YSwgdm9p ZCogdXNlclB0cikKK3N0YXRpYyB2b2lkIGN1cmxfdW5sb2NrX2NhbGxiYWNrKENVUkwqIC8qIGhh bmRsZSAqLywgY3VybF9sb2NrX2RhdGEgZGF0YSwgdm9pZCogLyogdXNlclB0ciAqLykKIHsKICAg ICBpZiAoTXV0ZXgqIG11dGV4ID0gc2hhcmVkUmVzb3VyY2VNdXRleChkYXRhKSkKICAgICAgICAg bXV0ZXgtPnVubG9jaygpOwpAQCAtMzExLDEwICszMTEsOSBAQCBzdGF0aWMgc2l6ZV90IGhlYWRl ckNhbGxiYWNrKGNoYXIqIHB0ciwgc2l6ZV90IHNpemUsIHNpemVfdCBubWVtYiwgdm9pZCogZGF0 YSkKICAgICAgKi8KICAgICBpZiAoaGVhZGVyID09IFN0cmluZygiXHJcbiIpIHx8IGhlYWRlciA9 PSBTdHJpbmcoIlxuIikpIHsKICAgICAgICAgQ1VSTCogaCA9IGQtPm1faGFuZGxlOwotICAgICAg ICBDVVJMY29kZSBlcnI7CiAKICAgICAgICAgbG9uZyBodHRwQ29kZSA9IDA7Ci0gICAgICAgIGVy ciA9IGN1cmxfZWFzeV9nZXRpbmZvKGgsIENVUkxJTkZPX1JFU1BPTlNFX0NPREUsICZodHRwQ29k ZSk7CisgICAgICAgIGN1cmxfZWFzeV9nZXRpbmZvKGgsIENVUkxJTkZPX1JFU1BPTlNFX0NPREUs ICZodHRwQ29kZSk7CiAKICAgICAgICAgaWYgKGlzSHR0cEluZm8oaHR0cENvZGUpKSB7CiAgICAg ICAgICAgICAvLyBKdXN0IHJldHVybiB3aGVuIHJlY2VpdmluZyBodHRwIGluZm8sIGUuZy4gSFRU UC8xLjEgMTAwIENvbnRpbnVlLgpAQCAtMzIzLDExICszMjIsMTEgQEAgc3RhdGljIHNpemVfdCBo ZWFkZXJDYWxsYmFjayhjaGFyKiBwdHIsIHNpemVfdCBzaXplLCBzaXplX3Qgbm1lbWIsIHZvaWQq IGRhdGEpCiAgICAgICAgIH0KIAogICAgICAgICBkb3VibGUgY29udGVudExlbmd0aCA9IDA7Ci0g ICAgICAgIGVyciA9IGN1cmxfZWFzeV9nZXRpbmZvKGgsIENVUkxJTkZPX0NPTlRFTlRfTEVOR1RI X0RPV05MT0FELCAmY29udGVudExlbmd0aCk7CisgICAgICAgIGN1cmxfZWFzeV9nZXRpbmZvKGgs IENVUkxJTkZPX0NPTlRFTlRfTEVOR1RIX0RPV05MT0FELCAmY29udGVudExlbmd0aCk7CiAgICAg ICAgIGQtPm1fcmVzcG9uc2Uuc2V0RXhwZWN0ZWRDb250ZW50TGVuZ3RoKHN0YXRpY19jYXN0PGxv bmcgbG9uZyBpbnQ+KGNvbnRlbnRMZW5ndGgpKTsKIAogICAgICAgICBjb25zdCBjaGFyKiBoZHI7 Ci0gICAgICAgIGVyciA9IGN1cmxfZWFzeV9nZXRpbmZvKGgsIENVUkxJTkZPX0VGRkVDVElWRV9V UkwsICZoZHIpOworICAgICAgICBjdXJsX2Vhc3lfZ2V0aW5mbyhoLCBDVVJMSU5GT19FRkZFQ1RJ VkVfVVJMLCAmaGRyKTsKICAgICAgICAgZC0+bV9yZXNwb25zZS5zZXRVUkwoS1VSTChQYXJzZWRV UkxTdHJpbmcsIGhkcikpOwogCiAgICAgICAgIGQtPm1fcmVzcG9uc2Uuc2V0SFRUUFN0YXR1c0Nv ZGUoaHR0cENvZGUpOwpAQCAtNDIxLDcgKzQyMCw3IEBAIHNpemVfdCByZWFkQ2FsbGJhY2sodm9p ZCogcHRyLCBzaXplX3Qgc2l6ZSwgc2l6ZV90IG5tZW1iLCB2b2lkKiBkYXRhKQogICAgIHJldHVy biBzZW50OwogfQogCi12b2lkIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6ZG93bmxvYWRUaW1lckNh bGxiYWNrKFRpbWVyPFJlc291cmNlSGFuZGxlTWFuYWdlcj4qIHRpbWVyKQordm9pZCBSZXNvdXJj ZUhhbmRsZU1hbmFnZXI6OmRvd25sb2FkVGltZXJDYWxsYmFjayhUaW1lcjxSZXNvdXJjZUhhbmRs ZU1hbmFnZXI+KiAvKiB0aW1lciAqLykKIHsKICAgICBzdGFydFNjaGVkdWxlZEpvYnMoKTsKIAo= 205580 2013-06-27 02:26:36 -0700 2013-06-27 03:28:42 -0700 patch v2 curl_warning_fix.patch text/plain 4860 galpeter ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5NTQ5MzdlLi4wYjljNTYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTMtMDYtMjcgIFBldGVyIEdhbCAgPGdhbHBldGVyQGluZi51LXN6ZWdlZC5odT4KKwor ICAgICAgICBbY3VybF0gRml4IHVudXNlZCB2YXJpYWJsZS9wYXJhbWV0ZXIgd2FybmluZ3MKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExODA1MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbW1lbnRlZCBv dXQgdW51c2VkIHBhcmFtZXRlcnMgYW5kIHJlbW92ZWQgYW4gdW51c2VkIHZhcmlhYmxlIGluIHRo ZSBjdXJsIGJhY2tlbmQuCisKKyAgICAgICAgTm8gdGVzdHMgcmVxdWlyZWQuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3JlZGVudGlhbFN0b3JhZ2VDdXJsLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNyZWRlbnRpYWxTdG9yYWdlOjpnZXRGcm9tUGVyc2lzdGVudFN0b3JhZ2Up OgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9ETlNDdXJsLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OnByZWZldGNoRE5TKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwv UmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmN1cmxfbG9ja19j YWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpjdXJsX3VubG9ja19jYWxsYmFjayk6CisgICAg ICAgIChXZWJDb3JlOjpoZWFkZXJDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJj ZUhhbmRsZU1hbmFnZXI6OmRvd25sb2FkVGltZXJDYWxsYmFjayk6CisKIDIwMTMtMDYtMjcgIEhv cmlhIElvc2lmIE9sYXJ1ICA8b2xhcnVAYWRvYmUuY29tPgogCiAgICAgICAgIFJlbW92ZSBFTkFC TEVfQ1NTX0NPTVBPU0lUSU5HIGd1YXJkcyBhcm91bmQgLXdlYmtpdC1iYWNrZ3JvdW5kLWJsZW5k IG1vZGUgcmVsYXRlZCBjb2RlLiBUaGUgc2FtZSBmbGFnIGd1YXJkcyAtd2Via2l0LWJsZW5kLW1v ZGUgY29kZSwgYnV0IHRob3NlIGd1YXJkcyBhcmUgbm90IHRvdWNoZWQgYnkgdGhpcyBjaGFuZ2Uu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3JlZGVu dGlhbFN0b3JhZ2VDdXJsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3Vy bC9DcmVkZW50aWFsU3RvcmFnZUN1cmwuY3BwCmluZGV4IGNkMWZjZWYuLmYzODFjOWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DcmVkZW50aWFsU3Rv cmFnZUN1cmwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9D cmVkZW50aWFsU3RvcmFnZUN1cmwuY3BwCkBAIC0zMSw3ICszMSw3IEBACiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAotQ3JlZGVudGlhbCBDcmVkZW50aWFsU3RvcmFnZTo6Z2V0RnJvbVBlcnNpc3Rl bnRTdG9yYWdlKGNvbnN0IFByb3RlY3Rpb25TcGFjZSYgcHJvdGVjdGlvblNwYWNlKQorQ3JlZGVu dGlhbCBDcmVkZW50aWFsU3RvcmFnZTo6Z2V0RnJvbVBlcnNpc3RlbnRTdG9yYWdlKGNvbnN0IFBy b3RlY3Rpb25TcGFjZSYgLyogcHJvdGVjdGlvblNwYWNlICovKQogewogICAgIG5vdEltcGxlbWVu dGVkKCk7CiAgICAgcmV0dXJuIENyZWRlbnRpYWwoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9ETlNDdXJsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvY3VybC9ETlNDdXJsLmNwcAppbmRleCAxZmZlMWEwLi5iMGQ4YjNiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvRE5TQ3VybC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0ROU0N1cmwuY3Bw CkBAIC0zMCw3ICszMCw3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotdm9pZCBwcmVmZXRj aEROUyhjb25zdCBTdHJpbmcmIGhvc3RuYW1lKQordm9pZCBwcmVmZXRjaEROUyhjb25zdCBTdHJp bmcmIC8qIGhvc3RuYW1lICovKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVN YW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJj ZUhhbmRsZU1hbmFnZXIuY3BwCmluZGV4IGVhMzAwY2IuLjI5MDViNGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZU1hbmFnZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhh bmRsZU1hbmFnZXIuY3BwCkBAIC0xMTUsMTMgKzExNSwxMyBAQCBzdGF0aWMgTXV0ZXgqIHNoYXJl ZFJlc291cmNlTXV0ZXgoY3VybF9sb2NrX2RhdGEgZGF0YSkgewogLy8gbGliY3VybCBkb2VzIG5v dCBpbXBsZW1lbnQgaXRzIG93biB0aHJlYWQgc3luY2hyb25pemF0aW9uIHByaW1pdGl2ZXMuCiAv LyB0aGVzZSB0d28gZnVuY3Rpb25zIHByb3ZpZGUgbXV0ZXhlcyBmb3IgY29va2llcywgYW5kIGZv ciB0aGUgZ2xvYmFsIEROUwogLy8gY2FjaGUuCi1zdGF0aWMgdm9pZCBjdXJsX2xvY2tfY2FsbGJh Y2soQ1VSTCogaGFuZGxlLCBjdXJsX2xvY2tfZGF0YSBkYXRhLCBjdXJsX2xvY2tfYWNjZXNzIGFj Y2Vzcywgdm9pZCogdXNlclB0cikKK3N0YXRpYyB2b2lkIGN1cmxfbG9ja19jYWxsYmFjayhDVVJM KiAvKiBoYW5kbGUgKi8sIGN1cmxfbG9ja19kYXRhIGRhdGEsIGN1cmxfbG9ja19hY2Nlc3MgLyog YWNjZXNzICovLCB2b2lkKiAvKiB1c2VyUHRyICovKQogewogICAgIGlmIChNdXRleCogbXV0ZXgg PSBzaGFyZWRSZXNvdXJjZU11dGV4KGRhdGEpKQogICAgICAgICBtdXRleC0+bG9jaygpOwogfQog Ci1zdGF0aWMgdm9pZCBjdXJsX3VubG9ja19jYWxsYmFjayhDVVJMKiBoYW5kbGUsIGN1cmxfbG9j a19kYXRhIGRhdGEsIHZvaWQqIHVzZXJQdHIpCitzdGF0aWMgdm9pZCBjdXJsX3VubG9ja19jYWxs YmFjayhDVVJMKiAvKiBoYW5kbGUgKi8sIGN1cmxfbG9ja19kYXRhIGRhdGEsIHZvaWQqIC8qIHVz ZXJQdHIgKi8pCiB7CiAgICAgaWYgKE11dGV4KiBtdXRleCA9IHNoYXJlZFJlc291cmNlTXV0ZXgo ZGF0YSkpCiAgICAgICAgIG11dGV4LT51bmxvY2soKTsKQEAgLTMxMSwxMCArMzExLDkgQEAgc3Rh dGljIHNpemVfdCBoZWFkZXJDYWxsYmFjayhjaGFyKiBwdHIsIHNpemVfdCBzaXplLCBzaXplX3Qg bm1lbWIsIHZvaWQqIGRhdGEpCiAgICAgICovCiAgICAgaWYgKGhlYWRlciA9PSBTdHJpbmcoIlxy XG4iKSB8fCBoZWFkZXIgPT0gU3RyaW5nKCJcbiIpKSB7CiAgICAgICAgIENVUkwqIGggPSBkLT5t X2hhbmRsZTsKLSAgICAgICAgQ1VSTGNvZGUgZXJyOwogCiAgICAgICAgIGxvbmcgaHR0cENvZGUg PSAwOwotICAgICAgICBlcnIgPSBjdXJsX2Vhc3lfZ2V0aW5mbyhoLCBDVVJMSU5GT19SRVNQT05T RV9DT0RFLCAmaHR0cENvZGUpOworICAgICAgICBjdXJsX2Vhc3lfZ2V0aW5mbyhoLCBDVVJMSU5G T19SRVNQT05TRV9DT0RFLCAmaHR0cENvZGUpOwogCiAgICAgICAgIGlmIChpc0h0dHBJbmZvKGh0 dHBDb2RlKSkgewogICAgICAgICAgICAgLy8gSnVzdCByZXR1cm4gd2hlbiByZWNlaXZpbmcgaHR0 cCBpbmZvLCBlLmcuIEhUVFAvMS4xIDEwMCBDb250aW51ZS4KQEAgLTMyMywxMSArMzIyLDExIEBA IHN0YXRpYyBzaXplX3QgaGVhZGVyQ2FsbGJhY2soY2hhciogcHRyLCBzaXplX3Qgc2l6ZSwgc2l6 ZV90IG5tZW1iLCB2b2lkKiBkYXRhKQogICAgICAgICB9CiAKICAgICAgICAgZG91YmxlIGNvbnRl bnRMZW5ndGggPSAwOwotICAgICAgICBlcnIgPSBjdXJsX2Vhc3lfZ2V0aW5mbyhoLCBDVVJMSU5G T19DT05URU5UX0xFTkdUSF9ET1dOTE9BRCwgJmNvbnRlbnRMZW5ndGgpOworICAgICAgICBjdXJs X2Vhc3lfZ2V0aW5mbyhoLCBDVVJMSU5GT19DT05URU5UX0xFTkdUSF9ET1dOTE9BRCwgJmNvbnRl bnRMZW5ndGgpOwogICAgICAgICBkLT5tX3Jlc3BvbnNlLnNldEV4cGVjdGVkQ29udGVudExlbmd0 aChzdGF0aWNfY2FzdDxsb25nIGxvbmcgaW50Pihjb250ZW50TGVuZ3RoKSk7CiAKICAgICAgICAg Y29uc3QgY2hhciogaGRyOwotICAgICAgICBlcnIgPSBjdXJsX2Vhc3lfZ2V0aW5mbyhoLCBDVVJM SU5GT19FRkZFQ1RJVkVfVVJMLCAmaGRyKTsKKyAgICAgICAgY3VybF9lYXN5X2dldGluZm8oaCwg Q1VSTElORk9fRUZGRUNUSVZFX1VSTCwgJmhkcik7CiAgICAgICAgIGQtPm1fcmVzcG9uc2Uuc2V0 VVJMKEtVUkwoUGFyc2VkVVJMU3RyaW5nLCBoZHIpKTsKIAogICAgICAgICBkLT5tX3Jlc3BvbnNl LnNldEhUVFBTdGF0dXNDb2RlKGh0dHBDb2RlKTsKQEAgLTQyMSw3ICs0MjAsNyBAQCBzaXplX3Qg cmVhZENhbGxiYWNrKHZvaWQqIHB0ciwgc2l6ZV90IHNpemUsIHNpemVfdCBubWVtYiwgdm9pZCog ZGF0YSkKICAgICByZXR1cm4gc2VudDsKIH0KIAotdm9pZCBSZXNvdXJjZUhhbmRsZU1hbmFnZXI6 OmRvd25sb2FkVGltZXJDYWxsYmFjayhUaW1lcjxSZXNvdXJjZUhhbmRsZU1hbmFnZXI+KiB0aW1l cikKK3ZvaWQgUmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpkb3dubG9hZFRpbWVyQ2FsbGJhY2soVGlt ZXI8UmVzb3VyY2VIYW5kbGVNYW5hZ2VyPiogLyogdGltZXIgKi8pCiB7CiAgICAgc3RhcnRTY2hl ZHVsZWRKb2JzKCk7CiAK