119247 2013-07-30 05:21:18 -0700 [WIN] Remove dependency on CoreFoundation from DownloadBundle 2013-07-30 11:59:57 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 paroga paroga bfulgham commit-queue galpeter oldest_to_newest 912786 0 paroga 2013-07-30 05:21:18 -0700 [WIN] Remove dependecy on CoreFoundation from DownloadBundle 912789 1 207723 paroga 2013-07-30 05:28:09 -0700 Created attachment 207723 Patch 912792 2 commit-queue 2013-07-30 05:30:12 -0700 Attachment 207723 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/network/cf/DownloadBundle.h', u'Source/WebCore/platform/network/curl/DownloadBundle.h', u'Source/WebCore/platform/network/win/DownloadBundleWin.cpp', u'Source/WebKit/win/WebDownloadCFNet.cpp']" exit_code: 1 Source/WebKit/win/WebDownloadCFNet.cpp:174: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 912797 3 207726 paroga 2013-07-30 05:35:59 -0700 Created attachment 207726 Patch 912965 4 207726 commit-queue 2013-07-30 11:59:55 -0700 Comment on attachment 207726 Patch Clearing flags on attachment: 207726 Committed r153485: <http://trac.webkit.org/changeset/153485> 912966 5 commit-queue 2013-07-30 11:59:57 -0700 All reviewed patches have been landed. Closing bug. 207723 2013-07-30 05:28:09 -0700 2013-07-30 05:35:59 -0700 Patch bug-119247.patch text/plain 9041 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzZGU2ZmY2Li5jNWM3NTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTMtMDctMzAgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgW1dJTl0gUmVtb3ZlIGRlcGVuZGVuY3kgb24gQ29yZUZvdW5kYXRpb24gZnJvbSBE b3dubG9hZEJ1bmRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTE5MjQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL0Rvd25sb2FkQnVuZGxlLmg6CisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9jdXJsL0Rvd25sb2FkQnVuZGxlLmg6CisgICAgICAgICogcGxhdGZv cm0vbmV0d29yay93aW4vRG93bmxvYWRCdW5kbGVXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RG93bmxvYWRCdW5kbGU6Om1hZ2ljTnVtYmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkRvd25sb2Fk QnVuZGxlOjphcHBlbmRSZXN1bWVEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkRvd25sb2FkQnVu ZGxlOjpleHRyYWN0UmVzdW1lRGF0YSk6CisKIDIwMTMtMDctMjggIEFuZHJlYXMgS2xpbmcgIDxh a2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIERvbid0IHVwZGF0ZSB0aGUgdGV4dCB0cmFjayBv dmVycmlkZSBDU1MgZXZlcnkgdGltZSBhIG1lZGlhIGVsZW1lbnQgaXMgY3JlYXRlZC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvRG93bmxvYWRCdW5kbGUu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvRG93bmxvYWRCdW5kbGUuaApp bmRleCBjZjkwOTA4Li40YzgxYzQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2NmL0Rvd25sb2FkQnVuZGxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jZi9Eb3dubG9hZEJ1bmRsZS5oCkBAIC0yNywxNCArMjcsMTMgQEAKICNkZWZp bmUgRG93bmxvYWRCdW5kbGVfaAogCiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KLQotdHlwZWRl ZiBjb25zdCBzdHJ1Y3QgX19DRkRhdGEqIENGRGF0YVJlZjsKKyNpbmNsdWRlIDx3dGYvVmVjdG9y Lmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBEb3dubG9hZEJ1bmRsZSB7CiAK LWJvb2wgYXBwZW5kUmVzdW1lRGF0YShDRkRhdGFSZWYgcmVzdW1lRGF0YSwgY29uc3QgU3RyaW5n JiBidW5kbGVQYXRoKTsKLUNGRGF0YVJlZiBleHRyYWN0UmVzdW1lRGF0YShjb25zdCBTdHJpbmcm IGJ1bmRsZVBhdGgpOworYm9vbCBhcHBlbmRSZXN1bWVEYXRhKGNvbnN0IGNoYXIqLCB1aW50MzJf dCwgY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoKTsKK2Jvb2wgZXh0cmFjdFJlc3VtZURhdGEoY29u c3QgU3RyaW5nJiBidW5kbGVQYXRoLCBWZWN0b3I8Y2hhcj4mIHJlc3VtZURhdGEpOwogY29uc3Qg U3RyaW5nJiBmaWxlRXh0ZW5zaW9uKCk7CiAKIH0gLy8gbmFtZXNwYWNlIERvd25sb2FkQnVuZGxl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvRG93bmxv YWRCdW5kbGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9Eb3dubG9h ZEJ1bmRsZS5oCmluZGV4IGNmOTA5MDguLjRjODFjNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9Eb3dubG9hZEJ1bmRsZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9Eb3dubG9hZEJ1bmRsZS5oCkBAIC0yNywxNCAr MjcsMTMgQEAKICNkZWZpbmUgRG93bmxvYWRCdW5kbGVfaAogCiAjaW5jbHVkZSA8d3RmL0Zvcndh cmQuaD4KLQotdHlwZWRlZiBjb25zdCBzdHJ1Y3QgX19DRkRhdGEqIENGRGF0YVJlZjsKKyNpbmNs dWRlIDx3dGYvVmVjdG9yLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBEb3du bG9hZEJ1bmRsZSB7CiAKLWJvb2wgYXBwZW5kUmVzdW1lRGF0YShDRkRhdGFSZWYgcmVzdW1lRGF0 YSwgY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoKTsKLUNGRGF0YVJlZiBleHRyYWN0UmVzdW1lRGF0 YShjb25zdCBTdHJpbmcmIGJ1bmRsZVBhdGgpOworYm9vbCBhcHBlbmRSZXN1bWVEYXRhKGNvbnN0 IGNoYXIqLCB1aW50MzJfdCwgY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoKTsKK2Jvb2wgZXh0cmFj dFJlc3VtZURhdGEoY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoLCBWZWN0b3I8Y2hhcj4mIHJlc3Vt ZURhdGEpOwogY29uc3QgU3RyaW5nJiBmaWxlRXh0ZW5zaW9uKCk7CiAKIH0gLy8gbmFtZXNwYWNl IERvd25sb2FkQnVuZGxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3dpbi9Eb3dubG9hZEJ1bmRsZVdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3dpbi9Eb3dubG9hZEJ1bmRsZVdpbi5jcHAKaW5kZXggMzQ3NjU0Yy4uMjgwZThjMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay93aW4vRG93bmxvYWRC dW5kbGVXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL0Rv d25sb2FkQnVuZGxlV2luLmNwcApAQCAtMjYsNyArMjYsNiBAQAogI2luY2x1ZGUgImNvbmZpZy5o IgogI2luY2x1ZGUgIkRvd25sb2FkQnVuZGxlLmgiCiAKLSNpbmNsdWRlIDxDb3JlRm91bmRhdGlv bi9Db3JlRm91bmRhdGlvbi5oPgogI2luY2x1ZGUgPGlvLmg+CiAjaW5jbHVkZSA8c3lzL3N0YXQu aD4KICNpbmNsdWRlIDxzeXMvdHlwZXMuaD4KQEAgLTM3LDcgKzM2LDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogCiBuYW1lc3BhY2UgRG93bmxvYWRCdW5kbGUgewogCi1zdGF0aWMgVUludDMyIG1h Z2ljTnVtYmVyKCkKK3N0YXRpYyB1aW50MzJfdCBtYWdpY051bWJlcigpCiB7CiAgICAgcmV0dXJu IDB4REVDQUY0RUE7CiB9CkBAIC00OCw5ICs0Nyw5IEBAIGNvbnN0IFN0cmluZyYgZmlsZUV4dGVu c2lvbigpCiAgICAgcmV0dXJuIGV4dGVuc2lvbjsKIH0KIAotYm9vbCBhcHBlbmRSZXN1bWVEYXRh KENGRGF0YVJlZiByZXN1bWVEYXRhLCBjb25zdCBTdHJpbmcmIGJ1bmRsZVBhdGgpCitib29sIGFw cGVuZFJlc3VtZURhdGEoY29uc3QgY2hhciogcmVzdW1lQnl0ZXMsIHVpbnQzMl90IHJlc3VtZUxl bmd0aCwgY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoKQogewotICAgIGlmICghcmVzdW1lRGF0YSkg eworICAgIGlmICghcmVzdW1lQnl0ZXMgfHwgIXJlc3VtZUxlbmd0aCkgewogICAgICAgICBMT0df RVJST1IoIkludmFsaWQgcmVzdW1lIGRhdGEgdG8gd3JpdGUgdG8gYnVuZGxlIHBhdGgiKTsKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KQEAgLTY4LDE2ICs2Nyw2IEBAIGJvb2wgYXBwZW5k UmVzdW1lRGF0YShDRkRhdGFSZWYgcmVzdW1lRGF0YSwgY29uc3QgU3RyaW5nJiBidW5kbGVQYXRo KQogCiAgICAgYm9vbCByZXN1bHQgPSBmYWxzZTsKIAotICAgIGNvbnN0IFVJbnQ4KiByZXN1bWVC eXRlcyA9IENGRGF0YUdldEJ5dGVQdHIocmVzdW1lRGF0YSk7Ci0gICAgQVNTRVJUKHJlc3VtZUJ5 dGVzKTsKLSAgICBpZiAoIXJlc3VtZUJ5dGVzKQotICAgICAgICBnb3RvIGV4aXQ7Ci0KLSAgICBD RkluZGV4IHJlc3VtZUxlbmd0aCA9IENGRGF0YUdldExlbmd0aChyZXN1bWVEYXRhKTsKLSAgICBB U1NFUlQocmVzdW1lTGVuZ3RoID4gMCk7Ci0gICAgaWYgKHJlc3VtZUxlbmd0aCA8IDEpCi0gICAg ICAgIGdvdG8gZXhpdDsKLQogICAgIGlmIChmd3JpdGUocmVzdW1lQnl0ZXMsIDEsIHJlc3VtZUxl bmd0aCwgYnVuZGxlKSAhPSByZXN1bWVMZW5ndGgpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWls ZWQgdG8gd3JpdGUgcmVzdW1lIGRhdGEgdG8gdGhlIGJ1bmRsZSAtIGVycm5vKCVpKSIsIGVycm5v KTsKICAgICAgICAgZ290byBleGl0OwpAQCAtODgsNyArNzcsNyBAQCBib29sIGFwcGVuZFJlc3Vt ZURhdGEoQ0ZEYXRhUmVmIHJlc3VtZURhdGEsIGNvbnN0IFN0cmluZyYgYnVuZGxlUGF0aCkKICAg ICAgICAgZ290byBleGl0OwogICAgIH0KIAotICAgIGNvbnN0IFVJbnQzMiYgbWFnaWMgPSBtYWdp Y051bWJlcigpOworICAgIGNvbnN0IHVpbnQzMl90IG1hZ2ljID0gbWFnaWNOdW1iZXIoKTsKICAg ICBpZiAoZndyaXRlKCZtYWdpYywgNCwgMSwgYnVuZGxlKSAhPSAxKSB7CiAgICAgICAgIExPR19F UlJPUigiRmFpbGVkIHRvIHdyaXRlIGZvb3RlciBtYWdpYyBudW1iZXIgdG8gdGhlIGJ1bmRsZSAt IGVycm5vKCVpKSIsIGVycm5vKTsKICAgICAgICAgZ290byBleGl0OwpAQCAtMTAwLDExICs4OSwx MSBAQCBleGl0OgogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLUNGRGF0YVJlZiBleHRyYWN0UmVz dW1lRGF0YShjb25zdCBTdHJpbmcmIGJ1bmRsZVBhdGgpCitib29sIGV4dHJhY3RSZXN1bWVEYXRh KGNvbnN0IFN0cmluZyYgYnVuZGxlUGF0aCwgVmVjdG9yPGNoYXI+JiByZXN1bWVEYXRhKQogewog ICAgIGlmIChidW5kbGVQYXRoLmlzRW1wdHkoKSkgewogICAgICAgICBMT0dfRVJST1IoIkNhbm5v dCBjcmVhdGUgcmVzdW1lIGRhdGEgZnJvbSBlbXB0eSBkb3dubG9hZCBidW5kbGUgcGF0aCIpOwot ICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAogICAgIC8v IE9wZW4gYSBoYW5kbGUgdG8gdGhlIGJ1bmRsZSBmaWxlCkBAIC0xMTIsMTEgKzEwMSwxMCBAQCBD RkRhdGFSZWYgZXh0cmFjdFJlc3VtZURhdGEoY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoKQogICAg IEZJTEUqIGJ1bmRsZSA9IDA7CiAgICAgaWYgKF93Zm9wZW5fcygmYnVuZGxlLCBudWxsaWZpZWRQ YXRoLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCkuZGF0YSgpLCBURVhUKCJyK2IiKSkg fHwgIWJ1bmRsZSkgewogICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byBvcGVuIGZpbGUgJXMg dG8gZ2V0IHJlc3VtZSBkYXRhIiwgYnVuZGxlUGF0aC5hc2NpaSgpLmRhdGEoKSk7Ci0gICAgICAg IHJldHVybiAwOworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgQ0ZEYXRhUmVm IHJlc3VsdCA9IDA7Ci0gICAgVmVjdG9yPFVJbnQ4PiBmb290ZXJCdWZmZXI7CisgICAgYm9vbCBy ZXN1bHQgPSBmYWxzZTsKIAogICAgIC8vIFN0YXQgdGhlIGZpbGUgdG8gZ2V0IGl0cyBzaXplCiAg ICAgc3RydWN0IF9zdGF0NjQgZmlsZVN0YXQ7CkBAIC0xMzEsNyArMTE5LDcgQEAgQ0ZEYXRhUmVm IGV4dHJhY3RSZXN1bWVEYXRhKGNvbnN0IFN0cmluZyYgYnVuZGxlUGF0aCkKICAgICBpZiAoZnNl dHBvcyhidW5kbGUsICZmb290ZXJNYWdpY051bWJlclBvc2l0aW9uKSkKICAgICAgICAgZ290byBl eGl0OwogCi0gICAgVUludDMyIGZvb3Rlck1hZ2ljTnVtYmVyID0gMDsKKyAgICB1aW50MzJfdCBm b290ZXJNYWdpY051bWJlciA9IDA7CiAgICAgaWYgKGZyZWFkKCZmb290ZXJNYWdpY051bWJlciwg NCwgMSwgYnVuZGxlKSAhPSAxKSB7CiAgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIHJlYWQg Zm9vdGVyIG1hZ2ljIG51bWJlciBmcm9tIHRoZSBidW5kbGUgLSBlcnJubyglaSkiLCBlcnJubyk7 CiAgICAgICAgIGdvdG8gZXhpdDsKQEAgLTE1Miw3ICsxNDAsNyBAQCBDRkRhdGFSZWYgZXh0cmFj dFJlc3VtZURhdGEoY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoKQogICAgIGlmIChmc2V0cG9zKGJ1 bmRsZSwgJmZvb3Rlckxlbmd0aFBvc2l0aW9uKSkKICAgICAgICAgZ290byBleGl0OwogCi0gICAg VUludDMyIGZvb3Rlckxlbmd0aCA9IDA7CisgICAgdWludDMyX3QgZm9vdGVyTGVuZ3RoID0gMDsK ICAgICBpZiAoZnJlYWQoJmZvb3Rlckxlbmd0aCwgNCwgMSwgYnVuZGxlKSAhPSAxKSB7CiAgICAg ICAgIExPR19FUlJPUigiRmFpbGVkIHRvIHJlYWQgUmVzdW1lRGF0YSBsZW5ndGggZnJvbSB0aGUg YnVuZGxlIC0gZXJybm8oJWkpIiwgZXJybm8pOwogICAgICAgICBnb3RvIGV4aXQ7CkBAIC0xNjYs OCArMTU0LDggQEAgQ0ZEYXRhUmVmIGV4dHJhY3RSZXN1bWVEYXRhKGNvbnN0IFN0cmluZyYgYnVu ZGxlUGF0aCkKICAgICBpZiAoZnNldHBvcyhidW5kbGUsICZmb290ZXJTdGFydFBvc2l0aW9uKSkK ICAgICAgICAgZ290byBleGl0OwogCi0gICAgZm9vdGVyQnVmZmVyLnJlc2l6ZShmb290ZXJMZW5n dGgpOwotICAgIGlmIChmcmVhZChmb290ZXJCdWZmZXIuZGF0YSgpLCAxLCBmb290ZXJMZW5ndGgs IGJ1bmRsZSkgIT0gZm9vdGVyTGVuZ3RoKSB7CisgICAgcmVzdW1lRGF0YS5yZXNpemUoZm9vdGVy TGVuZ3RoKTsKKyAgICBpZiAoZnJlYWQocmVzdW1lRGF0YS5kYXRhKCksIDEsIGZvb3Rlckxlbmd0 aCwgYnVuZGxlKSAhPSBmb290ZXJMZW5ndGgpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQg dG8gcmVhZCBSZXN1bWVEYXRhIGZyb20gdGhlIGJ1bmRsZSAtIGVycm5vKCVpKSIsIGVycm5vKTsK ICAgICAgICAgZ290byBleGl0OwogICAgIH0KQEAgLTE4MSwxMSArMTY5LDcgQEAgQ0ZEYXRhUmVm IGV4dHJhY3RSZXN1bWVEYXRhKGNvbnN0IFN0cmluZyYgYnVuZGxlUGF0aCkKICAgICAgICAgZ290 byBleGl0OwogICAgIH0KIAotICAgIC8vIEZpbmFsbHksIG1ha2UgdGhlIHJlc3VtZSBkYXRhLiAg Tm93LCBpdCBpcyBwb3NzaWJsZSBieSBzb21lIHR3aXN0IG9mIGZhdGUgdGhlIGJ1bmRsZSBtYWdp YyBudW1iZXIKLSAgICAvLyB3YXMgbmF0dXJhbGx5IGF0IHRoZSBlbmQgb2YgdGhlIGZpbGUgYW5k IGl0cyBub3QgYWN0dWFsbHkgYSB2YWxpZCBidW5kbGUuICBUaGF0LCBvciBzb21lb25lIGVuZ2lu ZWVyZWQKLSAgICAvLyBpdCB0aGF0IHdheSB0byB0cnkgdG8gYXR0YWNrIHVzLiAgSW4gdGhhdCBj YXVzZSwgdGhpcyBDRkRhdGEgd2lsbCBzdWNjZXNzZnVsbHkgY3JlYXRlIGJ1dCB3aGVuIHdlIAot ICAgIC8vIGFjdHVhbGx5IHRyeSB0byBzdGFydCB0aGUgQ0ZVUkxEb3dubG9hZCB1c2luZyB0aGlz IGJvZ3VzIGRhdGEsIGl0IHdpbGwgZmFpbCBhbmQgd2Ugd2lsbCBoYW5kbGUgdGhhdCBncmFjZWZ1 bGx5Ci0gICAgcmVzdWx0ID0gQ0ZEYXRhQ3JlYXRlKDAsIGZvb3RlckJ1ZmZlci5kYXRhKCksIGZv b3Rlckxlbmd0aCk7CisgICAgcmVzdWx0ID0gdHJ1ZTsKIGV4aXQ6CiAgICAgZmNsb3NlKGJ1bmRs ZSk7CiAgICAgcmV0dXJuIHJlc3VsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dl YkRvd25sb2FkQ0ZOZXQuY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViRG93bmxvYWRDRk5ldC5j cHAKaW5kZXggYWRlZTM5YS4uMDE4MDE0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4v V2ViRG93bmxvYWRDRk5ldC5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViRG93bmxvYWRD Rk5ldC5jcHAKQEAgLTE2NiwxMSArMTY2LDE1IEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUg V2ViRG93bmxvYWQ6OmluaXRUb1Jlc3VtZVdpdGhCdW5kbGUoCiB7CiAgICAgTE9HKERvd25sb2Fk LCAiQXR0ZW1wdGluZyByZXN1bWUgb2YgZG93bmxvYWQgYnVuZGxlICVzIiwgU3RyaW5nKGJ1bmRs ZVBhdGgsIFN5c1N0cmluZ0xlbihidW5kbGVQYXRoKSkuYXNjaWkoKS5kYXRhKCkpOwogCi0gICAg UmV0YWluUHRyPENGRGF0YVJlZj4gcmVzdW1lRGF0YSA9IGFkb3B0Q0YoRG93bmxvYWRCdW5kbGU6 OmV4dHJhY3RSZXN1bWVEYXRhKFN0cmluZyhidW5kbGVQYXRoLCBTeXNTdHJpbmdMZW4oYnVuZGxl UGF0aCkpKSk7Ci0KLSAgICBpZiAoIXJlc3VtZURhdGEpCisgICAgVmVjdG9yPGNoYXI+IGJ1ZmZl cjsKKyAgICBpZiAoIURvd25sb2FkQnVuZGxlOjpleHRyYWN0UmVzdW1lRGF0YShTdHJpbmcoYnVu ZGxlUGF0aCwgU3lzU3RyaW5nTGVuKGJ1bmRsZVBhdGgpKSwgYnVmZmVyKSkKICAgICAgICAgcmV0 dXJuIEVfRkFJTDsKIAorICAgIC8vIEl0IGlzIHBvc3NpYmxlIGJ5IHNvbWUgdHdpc3Qgb2YgZmF0 ZSB0aGUgYnVuZGxlIG1hZ2ljIG51bWJlciB3YXMgbmF0dXJhbGx5IGF0IHRoZSBlbmQgb2YgdGhl IGZpbGUgYW5kIGl0cyBub3QgYWN0dWFsbHkgYSB2YWxpZCBidW5kbGUuCisgICAgLy8gVGhhdCwg b3Igc29tZW9uZSBlbmdpbmVlcmVkIGl0IHRoYXQgd2F5IHRvIHRyeSB0byBhdHRhY2sgdXMuICBJ biB0aGF0IGNhdXNlLCB0aGlzIENGRGF0YSB3aWxsIHN1Y2Nlc3NmdWxseSBjcmVhdGUgYnV0IHdo ZW4gd2UgYWN0dWFsbHkKKyAgICAvLyB0cnkgdG8gc3RhcnQgdGhlIENGVVJMRG93bmxvYWQgdXNp bmcgdGhpcyBib2d1cyBkYXRhLCBpdCB3aWxsIGZhaWwgYW5kIHdlIHdpbGwgaGFuZGxlIHRoYXQg Z3JhY2VmdWxseS4KKyAgICBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiByZXN1bWVEYXRhID0gYWRvcHRD RihDRkRhdGFDcmVhdGUoMCwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBVSW50OCo+KGJ1ZmZlci5k YXRhKCkpLCBidWZmZXIuc2l6ZSgpKSk7CisKICAgICBpZiAoIWRlbGVnYXRlKQogICAgICAgICBy ZXR1cm4gRV9GQUlMOwogICAgIG1fZGVsZWdhdGUgPSBkZWxlZ2F0ZTsKQEAgLTI1NCw3ICsyNTgs OSBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYkRvd25sb2FkOjpjYW5jZWxGb3JSZXN1 bWUoKQogICAgICAgICBnb3RvIGV4aXQ7CiAgICAgfQogCi0gICAgRG93bmxvYWRCdW5kbGU6OmFw cGVuZFJlc3VtZURhdGEocmVzdW1lRGF0YS5nZXQoKSwgbV9idW5kbGVQYXRoKTsKKyAgICBjb25z dCBjaGFyKiByZXN1bWVCeXRlcyA9IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KENGRGF0 YUdldEJ5dGVQdHIocmVzdW1lRGF0YS5nZXQoKSkpOworICAgIHVpbnQzMl90IHJlc3VtZUxlbmd0 aCA9IENGRGF0YUdldExlbmd0aChyZXN1bWVEYXRhLmdldCgpKTsKKyAgICBEb3dubG9hZEJ1bmRs ZTo6YXBwZW5kUmVzdW1lRGF0YShyZXN1bWVCeXRlcywgcmVzdW1lTGVuZ3RoLCBtX2J1bmRsZVBh dGgpOwogCiBleGl0OgogICAgIG1fZG93bmxvYWQgPSAwOwo= 207726 2013-07-30 05:35:59 -0700 2013-07-30 11:59:55 -0700 Patch bug-119247.patch text/plain 9040 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzZGU2ZmY2Li5jNWM3NTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTMtMDctMzAgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgW1dJTl0gUmVtb3ZlIGRlcGVuZGVuY3kgb24gQ29yZUZvdW5kYXRpb24gZnJvbSBE b3dubG9hZEJ1bmRsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTE5MjQ3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL0Rvd25sb2FkQnVuZGxlLmg6CisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9jdXJsL0Rvd25sb2FkQnVuZGxlLmg6CisgICAgICAgICogcGxhdGZv cm0vbmV0d29yay93aW4vRG93bmxvYWRCdW5kbGVXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RG93bmxvYWRCdW5kbGU6Om1hZ2ljTnVtYmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkRvd25sb2Fk QnVuZGxlOjphcHBlbmRSZXN1bWVEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkRvd25sb2FkQnVu ZGxlOjpleHRyYWN0UmVzdW1lRGF0YSk6CisKIDIwMTMtMDctMjggIEFuZHJlYXMgS2xpbmcgIDxh a2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIERvbid0IHVwZGF0ZSB0aGUgdGV4dCB0cmFjayBv dmVycmlkZSBDU1MgZXZlcnkgdGltZSBhIG1lZGlhIGVsZW1lbnQgaXMgY3JlYXRlZC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvRG93bmxvYWRCdW5kbGUu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvRG93bmxvYWRCdW5kbGUuaApp bmRleCBjZjkwOTA4Li40YzgxYzQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2NmL0Rvd25sb2FkQnVuZGxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jZi9Eb3dubG9hZEJ1bmRsZS5oCkBAIC0yNywxNCArMjcsMTMgQEAKICNkZWZp bmUgRG93bmxvYWRCdW5kbGVfaAogCiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KLQotdHlwZWRl ZiBjb25zdCBzdHJ1Y3QgX19DRkRhdGEqIENGRGF0YVJlZjsKKyNpbmNsdWRlIDx3dGYvVmVjdG9y Lmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBEb3dubG9hZEJ1bmRsZSB7CiAK LWJvb2wgYXBwZW5kUmVzdW1lRGF0YShDRkRhdGFSZWYgcmVzdW1lRGF0YSwgY29uc3QgU3RyaW5n JiBidW5kbGVQYXRoKTsKLUNGRGF0YVJlZiBleHRyYWN0UmVzdW1lRGF0YShjb25zdCBTdHJpbmcm IGJ1bmRsZVBhdGgpOworYm9vbCBhcHBlbmRSZXN1bWVEYXRhKGNvbnN0IGNoYXIqLCB1aW50MzJf dCwgY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoKTsKK2Jvb2wgZXh0cmFjdFJlc3VtZURhdGEoY29u c3QgU3RyaW5nJiBidW5kbGVQYXRoLCBWZWN0b3I8Y2hhcj4mIHJlc3VtZURhdGEpOwogY29uc3Qg U3RyaW5nJiBmaWxlRXh0ZW5zaW9uKCk7CiAKIH0gLy8gbmFtZXNwYWNlIERvd25sb2FkQnVuZGxl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvRG93bmxv YWRCdW5kbGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9Eb3dubG9h ZEJ1bmRsZS5oCmluZGV4IGNmOTA5MDguLjRjODFjNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9Eb3dubG9hZEJ1bmRsZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9Eb3dubG9hZEJ1bmRsZS5oCkBAIC0yNywxNCAr MjcsMTMgQEAKICNkZWZpbmUgRG93bmxvYWRCdW5kbGVfaAogCiAjaW5jbHVkZSA8d3RmL0Zvcndh cmQuaD4KLQotdHlwZWRlZiBjb25zdCBzdHJ1Y3QgX19DRkRhdGEqIENGRGF0YVJlZjsKKyNpbmNs dWRlIDx3dGYvVmVjdG9yLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBEb3du bG9hZEJ1bmRsZSB7CiAKLWJvb2wgYXBwZW5kUmVzdW1lRGF0YShDRkRhdGFSZWYgcmVzdW1lRGF0 YSwgY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoKTsKLUNGRGF0YVJlZiBleHRyYWN0UmVzdW1lRGF0 YShjb25zdCBTdHJpbmcmIGJ1bmRsZVBhdGgpOworYm9vbCBhcHBlbmRSZXN1bWVEYXRhKGNvbnN0 IGNoYXIqLCB1aW50MzJfdCwgY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoKTsKK2Jvb2wgZXh0cmFj dFJlc3VtZURhdGEoY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoLCBWZWN0b3I8Y2hhcj4mIHJlc3Vt ZURhdGEpOwogY29uc3QgU3RyaW5nJiBmaWxlRXh0ZW5zaW9uKCk7CiAKIH0gLy8gbmFtZXNwYWNl IERvd25sb2FkQnVuZGxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3dpbi9Eb3dubG9hZEJ1bmRsZVdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3dpbi9Eb3dubG9hZEJ1bmRsZVdpbi5jcHAKaW5kZXggMzQ3NjU0Yy4uMjgwZThjMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay93aW4vRG93bmxvYWRC dW5kbGVXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL0Rv d25sb2FkQnVuZGxlV2luLmNwcApAQCAtMjYsNyArMjYsNiBAQAogI2luY2x1ZGUgImNvbmZpZy5o IgogI2luY2x1ZGUgIkRvd25sb2FkQnVuZGxlLmgiCiAKLSNpbmNsdWRlIDxDb3JlRm91bmRhdGlv bi9Db3JlRm91bmRhdGlvbi5oPgogI2luY2x1ZGUgPGlvLmg+CiAjaW5jbHVkZSA8c3lzL3N0YXQu aD4KICNpbmNsdWRlIDxzeXMvdHlwZXMuaD4KQEAgLTM3LDcgKzM2LDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogCiBuYW1lc3BhY2UgRG93bmxvYWRCdW5kbGUgewogCi1zdGF0aWMgVUludDMyIG1h Z2ljTnVtYmVyKCkKK3N0YXRpYyB1aW50MzJfdCBtYWdpY051bWJlcigpCiB7CiAgICAgcmV0dXJu IDB4REVDQUY0RUE7CiB9CkBAIC00OCw5ICs0Nyw5IEBAIGNvbnN0IFN0cmluZyYgZmlsZUV4dGVu c2lvbigpCiAgICAgcmV0dXJuIGV4dGVuc2lvbjsKIH0KIAotYm9vbCBhcHBlbmRSZXN1bWVEYXRh KENGRGF0YVJlZiByZXN1bWVEYXRhLCBjb25zdCBTdHJpbmcmIGJ1bmRsZVBhdGgpCitib29sIGFw cGVuZFJlc3VtZURhdGEoY29uc3QgY2hhciogcmVzdW1lQnl0ZXMsIHVpbnQzMl90IHJlc3VtZUxl bmd0aCwgY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoKQogewotICAgIGlmICghcmVzdW1lRGF0YSkg eworICAgIGlmICghcmVzdW1lQnl0ZXMgfHwgIXJlc3VtZUxlbmd0aCkgewogICAgICAgICBMT0df RVJST1IoIkludmFsaWQgcmVzdW1lIGRhdGEgdG8gd3JpdGUgdG8gYnVuZGxlIHBhdGgiKTsKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KQEAgLTY4LDE2ICs2Nyw2IEBAIGJvb2wgYXBwZW5k UmVzdW1lRGF0YShDRkRhdGFSZWYgcmVzdW1lRGF0YSwgY29uc3QgU3RyaW5nJiBidW5kbGVQYXRo KQogCiAgICAgYm9vbCByZXN1bHQgPSBmYWxzZTsKIAotICAgIGNvbnN0IFVJbnQ4KiByZXN1bWVC eXRlcyA9IENGRGF0YUdldEJ5dGVQdHIocmVzdW1lRGF0YSk7Ci0gICAgQVNTRVJUKHJlc3VtZUJ5 dGVzKTsKLSAgICBpZiAoIXJlc3VtZUJ5dGVzKQotICAgICAgICBnb3RvIGV4aXQ7Ci0KLSAgICBD RkluZGV4IHJlc3VtZUxlbmd0aCA9IENGRGF0YUdldExlbmd0aChyZXN1bWVEYXRhKTsKLSAgICBB U1NFUlQocmVzdW1lTGVuZ3RoID4gMCk7Ci0gICAgaWYgKHJlc3VtZUxlbmd0aCA8IDEpCi0gICAg ICAgIGdvdG8gZXhpdDsKLQogICAgIGlmIChmd3JpdGUocmVzdW1lQnl0ZXMsIDEsIHJlc3VtZUxl bmd0aCwgYnVuZGxlKSAhPSByZXN1bWVMZW5ndGgpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWls ZWQgdG8gd3JpdGUgcmVzdW1lIGRhdGEgdG8gdGhlIGJ1bmRsZSAtIGVycm5vKCVpKSIsIGVycm5v KTsKICAgICAgICAgZ290byBleGl0OwpAQCAtODgsNyArNzcsNyBAQCBib29sIGFwcGVuZFJlc3Vt ZURhdGEoQ0ZEYXRhUmVmIHJlc3VtZURhdGEsIGNvbnN0IFN0cmluZyYgYnVuZGxlUGF0aCkKICAg ICAgICAgZ290byBleGl0OwogICAgIH0KIAotICAgIGNvbnN0IFVJbnQzMiYgbWFnaWMgPSBtYWdp Y051bWJlcigpOworICAgIGNvbnN0IHVpbnQzMl90IG1hZ2ljID0gbWFnaWNOdW1iZXIoKTsKICAg ICBpZiAoZndyaXRlKCZtYWdpYywgNCwgMSwgYnVuZGxlKSAhPSAxKSB7CiAgICAgICAgIExPR19F UlJPUigiRmFpbGVkIHRvIHdyaXRlIGZvb3RlciBtYWdpYyBudW1iZXIgdG8gdGhlIGJ1bmRsZSAt IGVycm5vKCVpKSIsIGVycm5vKTsKICAgICAgICAgZ290byBleGl0OwpAQCAtMTAwLDExICs4OSwx MSBAQCBleGl0OgogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLUNGRGF0YVJlZiBleHRyYWN0UmVz dW1lRGF0YShjb25zdCBTdHJpbmcmIGJ1bmRsZVBhdGgpCitib29sIGV4dHJhY3RSZXN1bWVEYXRh KGNvbnN0IFN0cmluZyYgYnVuZGxlUGF0aCwgVmVjdG9yPGNoYXI+JiByZXN1bWVEYXRhKQogewog ICAgIGlmIChidW5kbGVQYXRoLmlzRW1wdHkoKSkgewogICAgICAgICBMT0dfRVJST1IoIkNhbm5v dCBjcmVhdGUgcmVzdW1lIGRhdGEgZnJvbSBlbXB0eSBkb3dubG9hZCBidW5kbGUgcGF0aCIpOwot ICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAogICAgIC8v IE9wZW4gYSBoYW5kbGUgdG8gdGhlIGJ1bmRsZSBmaWxlCkBAIC0xMTIsMTEgKzEwMSwxMCBAQCBD RkRhdGFSZWYgZXh0cmFjdFJlc3VtZURhdGEoY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoKQogICAg IEZJTEUqIGJ1bmRsZSA9IDA7CiAgICAgaWYgKF93Zm9wZW5fcygmYnVuZGxlLCBudWxsaWZpZWRQ YXRoLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCkuZGF0YSgpLCBURVhUKCJyK2IiKSkg fHwgIWJ1bmRsZSkgewogICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byBvcGVuIGZpbGUgJXMg dG8gZ2V0IHJlc3VtZSBkYXRhIiwgYnVuZGxlUGF0aC5hc2NpaSgpLmRhdGEoKSk7Ci0gICAgICAg IHJldHVybiAwOworICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgQ0ZEYXRhUmVm IHJlc3VsdCA9IDA7Ci0gICAgVmVjdG9yPFVJbnQ4PiBmb290ZXJCdWZmZXI7CisgICAgYm9vbCBy ZXN1bHQgPSBmYWxzZTsKIAogICAgIC8vIFN0YXQgdGhlIGZpbGUgdG8gZ2V0IGl0cyBzaXplCiAg ICAgc3RydWN0IF9zdGF0NjQgZmlsZVN0YXQ7CkBAIC0xMzEsNyArMTE5LDcgQEAgQ0ZEYXRhUmVm IGV4dHJhY3RSZXN1bWVEYXRhKGNvbnN0IFN0cmluZyYgYnVuZGxlUGF0aCkKICAgICBpZiAoZnNl dHBvcyhidW5kbGUsICZmb290ZXJNYWdpY051bWJlclBvc2l0aW9uKSkKICAgICAgICAgZ290byBl eGl0OwogCi0gICAgVUludDMyIGZvb3Rlck1hZ2ljTnVtYmVyID0gMDsKKyAgICB1aW50MzJfdCBm b290ZXJNYWdpY051bWJlciA9IDA7CiAgICAgaWYgKGZyZWFkKCZmb290ZXJNYWdpY051bWJlciwg NCwgMSwgYnVuZGxlKSAhPSAxKSB7CiAgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIHJlYWQg Zm9vdGVyIG1hZ2ljIG51bWJlciBmcm9tIHRoZSBidW5kbGUgLSBlcnJubyglaSkiLCBlcnJubyk7 CiAgICAgICAgIGdvdG8gZXhpdDsKQEAgLTE1Miw3ICsxNDAsNyBAQCBDRkRhdGFSZWYgZXh0cmFj dFJlc3VtZURhdGEoY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoKQogICAgIGlmIChmc2V0cG9zKGJ1 bmRsZSwgJmZvb3Rlckxlbmd0aFBvc2l0aW9uKSkKICAgICAgICAgZ290byBleGl0OwogCi0gICAg VUludDMyIGZvb3Rlckxlbmd0aCA9IDA7CisgICAgdWludDMyX3QgZm9vdGVyTGVuZ3RoID0gMDsK ICAgICBpZiAoZnJlYWQoJmZvb3Rlckxlbmd0aCwgNCwgMSwgYnVuZGxlKSAhPSAxKSB7CiAgICAg ICAgIExPR19FUlJPUigiRmFpbGVkIHRvIHJlYWQgUmVzdW1lRGF0YSBsZW5ndGggZnJvbSB0aGUg YnVuZGxlIC0gZXJybm8oJWkpIiwgZXJybm8pOwogICAgICAgICBnb3RvIGV4aXQ7CkBAIC0xNjYs OCArMTU0LDggQEAgQ0ZEYXRhUmVmIGV4dHJhY3RSZXN1bWVEYXRhKGNvbnN0IFN0cmluZyYgYnVu ZGxlUGF0aCkKICAgICBpZiAoZnNldHBvcyhidW5kbGUsICZmb290ZXJTdGFydFBvc2l0aW9uKSkK ICAgICAgICAgZ290byBleGl0OwogCi0gICAgZm9vdGVyQnVmZmVyLnJlc2l6ZShmb290ZXJMZW5n dGgpOwotICAgIGlmIChmcmVhZChmb290ZXJCdWZmZXIuZGF0YSgpLCAxLCBmb290ZXJMZW5ndGgs IGJ1bmRsZSkgIT0gZm9vdGVyTGVuZ3RoKSB7CisgICAgcmVzdW1lRGF0YS5yZXNpemUoZm9vdGVy TGVuZ3RoKTsKKyAgICBpZiAoZnJlYWQocmVzdW1lRGF0YS5kYXRhKCksIDEsIGZvb3Rlckxlbmd0 aCwgYnVuZGxlKSAhPSBmb290ZXJMZW5ndGgpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQg dG8gcmVhZCBSZXN1bWVEYXRhIGZyb20gdGhlIGJ1bmRsZSAtIGVycm5vKCVpKSIsIGVycm5vKTsK ICAgICAgICAgZ290byBleGl0OwogICAgIH0KQEAgLTE4MSwxMSArMTY5LDcgQEAgQ0ZEYXRhUmVm IGV4dHJhY3RSZXN1bWVEYXRhKGNvbnN0IFN0cmluZyYgYnVuZGxlUGF0aCkKICAgICAgICAgZ290 byBleGl0OwogICAgIH0KIAotICAgIC8vIEZpbmFsbHksIG1ha2UgdGhlIHJlc3VtZSBkYXRhLiAg Tm93LCBpdCBpcyBwb3NzaWJsZSBieSBzb21lIHR3aXN0IG9mIGZhdGUgdGhlIGJ1bmRsZSBtYWdp YyBudW1iZXIKLSAgICAvLyB3YXMgbmF0dXJhbGx5IGF0IHRoZSBlbmQgb2YgdGhlIGZpbGUgYW5k IGl0cyBub3QgYWN0dWFsbHkgYSB2YWxpZCBidW5kbGUuICBUaGF0LCBvciBzb21lb25lIGVuZ2lu ZWVyZWQKLSAgICAvLyBpdCB0aGF0IHdheSB0byB0cnkgdG8gYXR0YWNrIHVzLiAgSW4gdGhhdCBj YXVzZSwgdGhpcyBDRkRhdGEgd2lsbCBzdWNjZXNzZnVsbHkgY3JlYXRlIGJ1dCB3aGVuIHdlIAot ICAgIC8vIGFjdHVhbGx5IHRyeSB0byBzdGFydCB0aGUgQ0ZVUkxEb3dubG9hZCB1c2luZyB0aGlz IGJvZ3VzIGRhdGEsIGl0IHdpbGwgZmFpbCBhbmQgd2Ugd2lsbCBoYW5kbGUgdGhhdCBncmFjZWZ1 bGx5Ci0gICAgcmVzdWx0ID0gQ0ZEYXRhQ3JlYXRlKDAsIGZvb3RlckJ1ZmZlci5kYXRhKCksIGZv b3Rlckxlbmd0aCk7CisgICAgcmVzdWx0ID0gdHJ1ZTsKIGV4aXQ6CiAgICAgZmNsb3NlKGJ1bmRs ZSk7CiAgICAgcmV0dXJuIHJlc3VsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL1dl YkRvd25sb2FkQ0ZOZXQuY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViRG93bmxvYWRDRk5ldC5j cHAKaW5kZXggYWRlZTM5YS4uMDE4MDE0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4v V2ViRG93bmxvYWRDRk5ldC5jcHAKKysrIGIvU291cmNlL1dlYktpdC93aW4vV2ViRG93bmxvYWRD Rk5ldC5jcHAKQEAgLTE2NiwxMSArMTY2LDE1IEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUg V2ViRG93bmxvYWQ6OmluaXRUb1Jlc3VtZVdpdGhCdW5kbGUoCiB7CiAgICAgTE9HKERvd25sb2Fk LCAiQXR0ZW1wdGluZyByZXN1bWUgb2YgZG93bmxvYWQgYnVuZGxlICVzIiwgU3RyaW5nKGJ1bmRs ZVBhdGgsIFN5c1N0cmluZ0xlbihidW5kbGVQYXRoKSkuYXNjaWkoKS5kYXRhKCkpOwogCi0gICAg UmV0YWluUHRyPENGRGF0YVJlZj4gcmVzdW1lRGF0YSA9IGFkb3B0Q0YoRG93bmxvYWRCdW5kbGU6 OmV4dHJhY3RSZXN1bWVEYXRhKFN0cmluZyhidW5kbGVQYXRoLCBTeXNTdHJpbmdMZW4oYnVuZGxl UGF0aCkpKSk7Ci0KLSAgICBpZiAoIXJlc3VtZURhdGEpCisgICAgVmVjdG9yPGNoYXI+IGJ1ZmZl cjsKKyAgICBpZiAoIURvd25sb2FkQnVuZGxlOjpleHRyYWN0UmVzdW1lRGF0YShTdHJpbmcoYnVu ZGxlUGF0aCwgU3lzU3RyaW5nTGVuKGJ1bmRsZVBhdGgpKSwgYnVmZmVyKSkKICAgICAgICAgcmV0 dXJuIEVfRkFJTDsKIAorICAgIC8vIEl0IGlzIHBvc3NpYmxlIGJ5IHNvbWUgdHdpc3Qgb2YgZmF0 ZSB0aGUgYnVuZGxlIG1hZ2ljIG51bWJlciB3YXMgbmF0dXJhbGx5IGF0IHRoZSBlbmQgb2YgdGhl IGZpbGUgYW5kIGl0cyBub3QgYWN0dWFsbHkgYSB2YWxpZCBidW5kbGUuCisgICAgLy8gVGhhdCwg b3Igc29tZW9uZSBlbmdpbmVlcmVkIGl0IHRoYXQgd2F5IHRvIHRyeSB0byBhdHRhY2sgdXMuIElu IHRoYXQgY2F1c2UsIHRoaXMgQ0ZEYXRhIHdpbGwgc3VjY2Vzc2Z1bGx5IGNyZWF0ZSBidXQgd2hl biB3ZSBhY3R1YWxseQorICAgIC8vIHRyeSB0byBzdGFydCB0aGUgQ0ZVUkxEb3dubG9hZCB1c2lu ZyB0aGlzIGJvZ3VzIGRhdGEsIGl0IHdpbGwgZmFpbCBhbmQgd2Ugd2lsbCBoYW5kbGUgdGhhdCBn cmFjZWZ1bGx5LgorICAgIFJldGFpblB0cjxDRkRhdGFSZWY+IHJlc3VtZURhdGEgPSBhZG9wdENG KENGRGF0YUNyZWF0ZSgwLCByZWludGVycHJldF9jYXN0PGNvbnN0IFVJbnQ4Kj4oYnVmZmVyLmRh dGEoKSksIGJ1ZmZlci5zaXplKCkpKTsKKwogICAgIGlmICghZGVsZWdhdGUpCiAgICAgICAgIHJl dHVybiBFX0ZBSUw7CiAgICAgbV9kZWxlZ2F0ZSA9IGRlbGVnYXRlOwpAQCAtMjU0LDcgKzI1OCw5 IEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgV2ViRG93bmxvYWQ6OmNhbmNlbEZvclJlc3Vt ZSgpCiAgICAgICAgIGdvdG8gZXhpdDsKICAgICB9CiAKLSAgICBEb3dubG9hZEJ1bmRsZTo6YXBw ZW5kUmVzdW1lRGF0YShyZXN1bWVEYXRhLmdldCgpLCBtX2J1bmRsZVBhdGgpOworICAgIGNvbnN0 IGNoYXIqIHJlc3VtZUJ5dGVzID0gcmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oQ0ZEYXRh R2V0Qnl0ZVB0cihyZXN1bWVEYXRhLmdldCgpKSk7CisgICAgdWludDMyX3QgcmVzdW1lTGVuZ3Ro ID0gQ0ZEYXRhR2V0TGVuZ3RoKHJlc3VtZURhdGEuZ2V0KCkpOworICAgIERvd25sb2FkQnVuZGxl OjphcHBlbmRSZXN1bWVEYXRhKHJlc3VtZUJ5dGVzLCByZXN1bWVMZW5ndGgsIG1fYnVuZGxlUGF0 aCk7CiAKIGV4aXQ6CiAgICAgbV9kb3dubG9hZCA9IDA7Cg==