139728 2014-12-17 06:04:02 -0800 [GTK] Allow to build with ENABLE_NETWORK_CACHE 2014-12-18 06:41:56 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned commit-queue gustavo koivisto svillar oldest_to_newest 1056317 0 cgarcia 2014-12-17 06:04:02 -0800 Just make it build for now 1056318 1 243434 cgarcia 2014-12-17 06:08:17 -0800 Created attachment 243434 Patch 1056320 2 243434 cgarcia 2014-12-17 06:08:59 -0800 Comment on attachment 243434 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243434&action=review > Source/WebKit2/config.h:98 > +#define ENABLE_NETWORK_CACHE 1 Enabled this just for EWS, I'll disable it again before landing. 1056321 3 commit-queue 2014-12-17 06:09:16 -0800 Attachment 243434 did not pass style-queue: ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageSoup.cpp:108: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageSoup.cpp:115: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 1056771 4 243434 koivisto 2014-12-18 06:09:08 -0800 Comment on attachment 243434 Patch r=me 1056772 5 koivisto 2014-12-18 06:09:56 -0800 Note that the feature is work-in-progress so build breakages with it enabled are likely. 1056773 6 cgarcia 2014-12-18 06:41:56 -0800 Committed r177495: <http://trac.webkit.org/changeset/177495> 243434 2014-12-17 06:08:17 -0800 2014-12-18 06:09:08 -0800 Patch wk2-disk-cache-gtk.diff text/plain 13016 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL1dlYktp dDIvQ01ha2VMaXN0cy50eHQKaW5kZXggNzk2NzllMC4uMTczZTgzYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvQ01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dlYktpdDIvQ01ha2VMaXN0 cy50eHQKQEAgLTE1Nyw2ICsxNTcsMTIgQEAgc2V0KFdlYktpdDJfU09VUkNFUwogCiAgICAgTmV0 d29ya1Byb2Nlc3MvRmlsZUFQSS9OZXR3b3JrQmxvYlJlZ2lzdHJ5LmNwcAogCisgICAgTmV0d29y a1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAorICAgIE5ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZUNvZGVycy5jcHAKKyAgICBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3Jr Q2FjaGVFbmNvZGVyLmNwcAorICAgIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZURl Y29kZXIuY3BwCisgICAgTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlS2V5LmNwcAor CiAgICAgUGxhdGZvcm0vTG9nZ2luZy5jcHAKICAgICBQbGF0Zm9ybS9Nb2R1bGUuY3BwCiAgICAg UGxhdGZvcm0vV29ya1F1ZXVlLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDI4ZDdhODAuLjE5ZGY0NDUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKQEAgLTEsNSArMSw0NCBAQAogMjAxNC0xMi0xNyAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gQWxsb3cgdG8gYnVpbGQg d2l0aCBFTkFCTEVfTkVUV09SS19DQUNIRQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NzI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSnVzdCBtYWtlIGl0IGJ1aWxkIGZvciBub3cuCisKKyAgICAgICAg KiBDTWFrZUxpc3RzLnR4dDogQWRkIG5ldyBmaWxlcyB0byBjb21waWxhdGlvbi4KKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZFJldHJpZXZlQ2FjaGVFbnRyeSk6IFVzZQor ICAgICAgICBFTkFCTEUoU0hBUkVBQkxFX1JFU09VUkNFKSB3aGVuIFNoYXJlYWJsZVJlc291cmNl IGlzIHVzZWQuCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNw cDoKKyAgICAgICAgKFdlYktpdDo6ZGVjb2RlU3RvcmFnZUVudHJ5KTogRGl0dG8uCisgICAgICAg IChXZWJLaXQ6Om1ha2VDYWNoZUtleSk6IFVzZSBFTkFCTEUoQ0FDSEVfUEFSVElUSU9OSU5HKSBm b3IgUmVzb3VyY2VSZXF1ZXN0OjpjYWNoZVBhcnRpdGlvbigpLgorICAgICAgICAqIE5ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2Nh Y2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hl U3RvcmFnZTo6RGF0YTo6aXNOdWxsKTogTW92ZSBpbXBsZW1lbnRhdGlvbgorICAgICAgICB0byBw bGF0Zm9ybSBzcGVjaWZpYyBmaWxlcy4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGVTdG9yYWdlQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNo ZVN0b3JhZ2U6OkRhdGE6OmlzTnVsbCk6IE1vdmVkIGZyb20gdGhlIGhlYWRlci4KKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlU291cC5jcHA6IEFkZGVk LgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGVTdG9yYWdlOjpEYXRhOjpEYXRhKToKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlU3RvcmFnZTo6RGF0YTo6ZGF0YSk6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtDYWNoZVN0b3JhZ2U6OkRhdGE6OmlzTnVsbCk6CisgICAgICAgIChX ZWJLaXQ6Ok5ldHdvcmtDYWNoZVN0b3JhZ2U6Om9wZW4pOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrQ2FjaGVTdG9yYWdlOjpOZXR3b3JrQ2FjaGVTdG9yYWdlKToKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya0NhY2hlU3RvcmFnZTo6aW5pdGlhbGl6ZUtleUZpbHRlcik6CisgICAgICAgIChXZWJL aXQ6Ok5ldHdvcmtDYWNoZVN0b3JhZ2U6OnJlbW92ZUVudHJ5KToKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya0NhY2hlU3RvcmFnZTo6ZGlzcGF0Y2hSZXRyaWV2ZU9wZXJhdGlvbik6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtDYWNoZVN0b3JhZ2U6OmRpc3BhdGNoUGVuZGluZ1JldHJpZXZlT3Bl cmF0aW9ucyk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZVN0b3JhZ2U6OnJldHJpZXZl KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlU3RvcmFnZTo6c3RvcmUpOgorICAgICAg ICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGVTdG9yYWdlOjpzZXRNYXhpbXVtU2l6ZSk6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtDYWNoZVN0b3JhZ2U6OmNsZWFyKToKKyAgICAgICAgKiBQbGF0Zm9y bUdUSy5jbWFrZTogQWRkIE5ldHdvcmtDYWNoZVN0b3JhZ2VTb3VwLmNwcC4KKyAgICAgICAgKiBj b25maWcuaDoKKworMjAxNC0xMi0xNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IEdUSysgYnVpbGQgYWZ0ZXIgcjE3 NzQyNy4KIAogICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcDoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJj ZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3Vy Y2VMb2FkZXIuY3BwCmluZGV4IDMwMzQ4M2EuLjFhZGRhZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApAQCAt NTQ1LDE0ICs1NDUsMTggQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmRpZFJldHJpZXZl Q2FjaGVFbnRyeShzdGQ6OnVuaXF1ZV9wdHI8TmV0d29ya0NhY2hlOjoKICAgICB9IGVsc2Ugewog ICAgICAgICBzZW5kQWJvcnRpbmdPbkZhaWx1cmUoTWVzc2FnZXM6OldlYlJlc291cmNlTG9hZGVy OjpEaWRSZWNlaXZlUmVzcG9uc2UoZW50cnktPnJlc3BvbnNlLCBtX3BhcmFtZXRlcnMuaXNNYWlu UmVzb3VyY2UpKTsKIAorI2lmIEVOQUJMRShTSEFSRUFCTEVfUkVTT1VSQ0UpCiAgICAgICAgIGlm ICghZW50cnktPnNoYXJlYWJsZVJlc291cmNlSGFuZGxlLmlzTnVsbCgpKQogICAgICAgICAgICAg c2VuZChNZXNzYWdlczo6V2ViUmVzb3VyY2VMb2FkZXI6OkRpZFJlY2VpdmVSZXNvdXJjZShlbnRy eS0+c2hhcmVhYmxlUmVzb3VyY2VIYW5kbGUsIGN1cnJlbnRUaW1lKCkpKTsKICAgICAgICAgZWxz ZSB7CisjZW5kaWYKICAgICAgICAgICAgIGJvb2wgc2hvdWxkQ29udGludWUgPSBzZW5kQnVmZmVy TWF5YmVBYm9ydGluZygqZW50cnktPmJ1ZmZlciwgZW50cnktPmJ1ZmZlci0+c2l6ZSgpKTsKICAg ICAgICAgICAgIGlmICghc2hvdWxkQ29udGludWUpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICAgICAgc2VuZChNZXNzYWdlczo6V2ViUmVzb3VyY2VMb2FkZXI6OkRpZEZpbmlzaFJl c291cmNlTG9hZChjdXJyZW50VGltZSgpKSk7CisjaWYgRU5BQkxFKFNIQVJFQUJMRV9SRVNPVVJD RSkKICAgICAgICAgfQorI2VuZGlmCiAgICAgfQogCiAgICAgY2xlYW51cCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcCBi L1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHAKaW5k ZXggMzhlN2MzYi4uMjcyMDIwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3Jr UHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCkBAIC0xNzYsMTIgKzE3NiwxNCBAQCBzdGF0 aWMgc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtDYWNoZTo6RW50cnk+IGRlY29kZVN0b3JhZ2VFbnRy eShjb25zdCBOZXR3b3JrQ2FjaAogICAgIGNhY2hlZFJlc3BvbnNlLnNldFNvdXJjZShuZWVkc1Jl dmFsaWRhdGlvbiA/IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OlNvdXJjZTo6RGlza0NhY2hl QWZ0ZXJWYWxpZGF0aW9uIDogV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTo6U291cmNlOjpEaXNr Q2FjaGUpOwogICAgIGVudHJ5LT5yZXNwb25zZSA9IGNhY2hlZFJlc3BvbnNlOwogCisjaWYgRU5B QkxFKFNIQVJFQUJMRV9SRVNPVVJDRSkKICAgICBSZWZQdHI8U2hhcmVkTWVtb3J5PiBzaGFyZWRN ZW1vcnkgPSBzdG9yYWdlRW50cnkuYm9keS5zaXplKCkgPyBTaGFyZWRNZW1vcnk6OmNyZWF0ZUZy b21WTUJ1ZmZlcihjb25zdF9jYXN0PHVpbnQ4X3QqPihzdG9yYWdlRW50cnkuYm9keS5kYXRhKCkp LCBzdG9yYWdlRW50cnkuYm9keS5zaXplKCkpIDogbnVsbHB0cjsKICAgICBSZWZQdHI8U2hhcmVh YmxlUmVzb3VyY2U+IHNoYXJlYWJsZVJlc291cmNlID0gc2hhcmVkTWVtb3J5ID8gU2hhcmVhYmxl UmVzb3VyY2U6OmNyZWF0ZShzaGFyZWRNZW1vcnkucmVsZWFzZSgpLCAwLCBzdG9yYWdlRW50cnku Ym9keS5zaXplKCkpIDogbnVsbHB0cjsKIAogICAgIGlmIChzaGFyZWFibGVSZXNvdXJjZSAmJiBz aGFyZWFibGVSZXNvdXJjZS0+Y3JlYXRlSGFuZGxlKGVudHJ5LT5zaGFyZWFibGVSZXNvdXJjZUhh bmRsZSkpCiAgICAgICAgIGVudHJ5LT5idWZmZXIgPSBlbnRyeS0+c2hhcmVhYmxlUmVzb3VyY2VI YW5kbGUudHJ5V3JhcEluU2hhcmVkQnVmZmVyKCk7CiAgICAgZWxzZQorI2VuZGlmCiAgICAgICAg IGVudHJ5LT5idWZmZXIgPSBXZWJDb3JlOjpTaGFyZWRCdWZmZXI6OmNyZWF0ZShzdG9yYWdlRW50 cnkuYm9keS5kYXRhKCksIHN0b3JhZ2VFbnRyeS5ib2R5LnNpemUoKSk7CiAKICAgICByZXR1cm4g ZW50cnk7CkBAIC0yMDUsNyArMjA3LDExIEBAIHN0YXRpYyBib29sIGNhblJldHJpZXZlKGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIAogc3RhdGljIE5ldHdvcmtDYWNo ZUtleSBtYWtlQ2FjaGVLZXkoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0 KQogeworI2lmIEVOQUJMRShDQUNIRV9QQVJUSVRJT05JTkcpCiAgICAgU3RyaW5nIHBhcnRpdGlv biA9IHJlcXVlc3QuY2FjaGVQYXJ0aXRpb24oKTsKKyNlbHNlCisgICAgU3RyaW5nIHBhcnRpdGlv bjsKKyNlbmRpZgogICAgIGlmIChwYXJ0aXRpb24uaXNFbXB0eSgpKQogICAgICAgICBwYXJ0aXRp b24gPSBBU0NJSUxpdGVyYWwoIk5vIHBhcnRpdGlvbiIpOwogICAgIHJldHVybiBOZXR3b3JrQ2Fj aGVLZXkocmVxdWVzdC5odHRwTWV0aG9kKCksIHBhcnRpdGlvbiwgcmVxdWVzdC51cmwoKS5zdHJp bmcoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGUuaCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZS5oCmluZGV4IDkwMzY3NTAuLjU3ZGE1NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oCkBAIC0zMCw3ICszMCw3IEBA CiAKICNpbmNsdWRlICJOZXR3b3JrQ2FjaGVTdG9yYWdlLmgiCiAjaW5jbHVkZSAiU2hhcmVhYmxl UmVzb3VyY2UuaCIKLSNpbmNsdWRlIDxXZWJjb3JlL1Jlc291cmNlUmVzcG9uc2UuaD4KKyNpbmNs dWRlIDxXZWJDb3JlL1Jlc291cmNlUmVzcG9uc2UuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZT dHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNTYsNyArNTYsOSBAQCBwdWJsaWM6 CiAgICAgc3RydWN0IEVudHJ5IHsKICAgICAgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSBy ZXNwb25zZTsKICAgICAgICAgUmVmUHRyPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4gYnVmZmVyOwor I2lmIEVOQUJMRShTSEFSRUFCTEVfUkVTT1VSQ0UpCiAgICAgICAgIFNoYXJlYWJsZVJlc291cmNl OjpIYW5kbGUgc2hhcmVhYmxlUmVzb3VyY2VIYW5kbGU7CisjZW5kaWYKICAgICAgICAgYm9vbCBu ZWVkc1JldmFsaWRhdGlvbjsKICAgICB9OwogICAgIC8vIENvbXBsZXRpb24gaGFuZGxlciBtYXkg Z2V0IGNhbGxlZCBiYWNrIHN5bmNocm9ub3VzbHkgb24gZmFpbHVyZS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaCBi L1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2Uu aAppbmRleCAxZDk2Zjc5Li4yMTc1Y2RmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmgKKysrIGIvU291cmNlL1dlYktp dDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5oCkBAIC02Myw3ICs2 Myw3IEBAIHB1YmxpYzoKICNpZiBQTEFURk9STShDT0NPQSkKICAgICAgICAgZXhwbGljaXQgRGF0 YShPU09iamVjdFB0cjxkaXNwYXRjaF9kYXRhX3Q+KTsKICNlbmRpZgotICAgICAgICBib29sIGlz TnVsbCgpIGNvbnN0IHsgcmV0dXJuICFtX2Rpc3BhdGNoRGF0YTsgfQorICAgICAgICBib29sIGlz TnVsbCgpIGNvbnN0OwogCiAgICAgICAgIGNvbnN0IHVpbnQ4X3QqIGRhdGEoKSBjb25zdDsKICAg ICAgICAgc2l6ZV90IHNpemUoKSBjb25zdCB7IHJldHVybiBtX3NpemU7IH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2VD b2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNo ZVN0b3JhZ2VDb2NvYS5tbQppbmRleCAwNzBkZDgwLi42OGY4MmZkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlQ29jb2Eu bW0KKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl U3RvcmFnZUNvY29hLm1tCkBAIC0xMDUsNiArMTA1LDExIEBAIGNvbnN0IHVpbnQ4X3QqIE5ldHdv cmtDYWNoZVN0b3JhZ2U6OkRhdGE6OmRhdGEoKSBjb25zdAogICAgIHJldHVybiBtX2RhdGE7CiB9 CiAKK2Jvb2wgTmV0d29ya0NhY2hlU3RvcmFnZTo6RGF0YTo6aXNOdWxsKCkgY29uc3QKK3sKKyAg ICByZXR1cm4gIW1fZGlzcGF0Y2hEYXRhOworfQorCiBzdGQ6OnVuaXF1ZV9wdHI8TmV0d29ya0Nh Y2hlU3RvcmFnZT4gTmV0d29ya0NhY2hlU3RvcmFnZTo6b3Blbihjb25zdCBTdHJpbmcmIGNhY2hl UGF0aCkKIHsKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZVNvdXAu Y3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3Rv cmFnZVNvdXAuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmNjODM3ZDkK LS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGVTdG9yYWdlU291cC5jcHAKQEAgLTAsMCArMSwxMzkgQEAKKy8qCisgKiBDb3B5 cmlnaHQgKEMpIDIwMTQgSWdhbGlhIFMuTC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0 IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1 dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJp YWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycn CisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwor ICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lB TCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1Ig U0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICog SU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJ VFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkg T1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5o IgorI2luY2x1ZGUgIk5ldHdvcmtDYWNoZVN0b3JhZ2UuaCIKKworI2lmIEVOQUJMRShORVRXT1JL X0NBQ0hFKQorCisjaW5jbHVkZSAiTG9nZ2luZy5oIgorI2luY2x1ZGUgIk5ldHdvcmtDYWNoZUNv ZGVycy5oIgorI2luY2x1ZGUgPFdlYkNvcmUvRmlsZVN5c3RlbS5oPgorI2luY2x1ZGUgPFdlYkNv cmUvTm90SW1wbGVtZW50ZWQuaD4KKyNpbmNsdWRlIDx3dGYvUnVuTG9vcC5oPgorCituYW1lc3Bh Y2UgV2ViS2l0IHsKKworc3RhdGljIGNvbnN0IGNoYXIqIG5ldHdvcmtDYWNoZVN1YmRpcmVjdG9y eSA9ICJXZWJLaXRDYWNoZSI7CisKK05ldHdvcmtDYWNoZVN0b3JhZ2U6OkRhdGE6OkRhdGEoKQor ICAgIDogbV9kYXRhKG51bGxwdHIpCisgICAgLCBtX3NpemUoMCkKK3sKKyAgICBub3RJbXBsZW1l bnRlZCgpOworfQorCitOZXR3b3JrQ2FjaGVTdG9yYWdlOjpEYXRhOjpEYXRhKGNvbnN0IHVpbnQ4 X3QqIGRhdGEsIHNpemVfdCBzaXplKQorICAgIDogbV9kYXRhKGRhdGEpCisgICAgLCBtX3NpemUo c2l6ZSkKK3sKKyAgICBub3RJbXBsZW1lbnRlZCgpOworfQorCitjb25zdCB1aW50OF90KiBOZXR3 b3JrQ2FjaGVTdG9yYWdlOjpEYXRhOjpkYXRhKCkgY29uc3QKK3sKKyAgICBub3RJbXBsZW1lbnRl ZCgpOworICAgIHJldHVybiBudWxscHRyOworfQorCitib29sIE5ldHdvcmtDYWNoZVN0b3JhZ2U6 OkRhdGE6OmlzTnVsbCgpIGNvbnN0Cit7CisgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICByZXR1 cm4gdHJ1ZTsKK30KKworc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtDYWNoZVN0b3JhZ2U+IE5ldHdv cmtDYWNoZVN0b3JhZ2U6Om9wZW4oY29uc3QgU3RyaW5nJiBhcHBsaWNhdGlvbkNhY2hlUGF0aCkK K3sKKyAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOworICAgIFN0cmluZyBuZXR3b3JrQ2Fj aGVQYXRoID0gV2ViQ29yZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KGFwcGxpY2F0aW9uQ2Fj aGVQYXRoLCBuZXR3b3JrQ2FjaGVTdWJkaXJlY3RvcnkpOworICAgIGlmICghV2ViQ29yZTo6bWFr ZUFsbERpcmVjdG9yaWVzKG5ldHdvcmtDYWNoZVBhdGgpKQorICAgICAgICByZXR1cm4gbnVsbHB0 cjsKKyAgICByZXR1cm4gc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtDYWNoZVN0b3JhZ2U+KG5ldyBO ZXR3b3JrQ2FjaGVTdG9yYWdlKG5ldHdvcmtDYWNoZVBhdGgpKTsKK30KKworTmV0d29ya0NhY2hl U3RvcmFnZTo6TmV0d29ya0NhY2hlU3RvcmFnZShjb25zdCBTdHJpbmcmIGRpcmVjdG9yeVBhdGgp CisgICAgOiBtX2RpcmVjdG9yeVBhdGgoZGlyZWN0b3J5UGF0aCkKKyAgICAsIG1fbWF4aW11bVNp emUoc3RkOjpudW1lcmljX2xpbWl0czxzaXplX3Q+OjptYXgoKSkKKyAgICAsIG1fYWN0aXZlUmV0 cmlldmVPcGVyYXRpb25Db3VudCgwKQoreworICAgIGluaXRpYWxpemVLZXlGaWx0ZXIoKTsKK30K Kwordm9pZCBOZXR3b3JrQ2FjaGVTdG9yYWdlOjppbml0aWFsaXplS2V5RmlsdGVyKCkKK3sKKyAg ICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOworICAgIG5vdEltcGxlbWVudGVkKCk7Cit9CisK K3ZvaWQgTmV0d29ya0NhY2hlU3RvcmFnZTo6cmVtb3ZlRW50cnkoY29uc3QgTmV0d29ya0NhY2hl S2V5JikKK3sKKyAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOworICAgIG5vdEltcGxlbWVu dGVkKCk7Cit9CisKK3ZvaWQgTmV0d29ya0NhY2hlU3RvcmFnZTo6ZGlzcGF0Y2hSZXRyaWV2ZU9w ZXJhdGlvbihjb25zdCBSZXRyaWV2ZU9wZXJhdGlvbiYpCit7CisgICAgQVNTRVJUKFJ1bkxvb3A6 OmlzTWFpbigpKTsKKyAgICBub3RJbXBsZW1lbnRlZCgpOworfQorCit2b2lkIE5ldHdvcmtDYWNo ZVN0b3JhZ2U6OmRpc3BhdGNoUGVuZGluZ1JldHJpZXZlT3BlcmF0aW9ucygpCit7CisgICAgQVNT RVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKKyAgICBub3RJbXBsZW1lbnRlZCgpOworfQorCit2b2lk IE5ldHdvcmtDYWNoZVN0b3JhZ2U6OnJldHJpZXZlKGNvbnN0IE5ldHdvcmtDYWNoZUtleSYsIHVu c2lnbmVkIC8qIHByaW9yaXR5ICovLCBzdGQ6OmZ1bmN0aW9uPGJvb2wgKHN0ZDo6dW5pcXVlX3B0 cjxFbnRyeT4pPiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAgICBBU1NFUlQoUnVuTG9vcDo6aXNN YWluKCkpOworICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgY29tcGxldGlvbkhhbmRsZXIobnVs bHB0cik7Cit9CisKK3ZvaWQgTmV0d29ya0NhY2hlU3RvcmFnZTo6c3RvcmUoY29uc3QgTmV0d29y a0NhY2hlS2V5JiwgY29uc3QgRW50cnkmLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKGJvb2wgc3VjY2Vz cyk+IGNvbXBsZXRpb25IYW5kbGVyKQoreworICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7 CisgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBjb21wbGV0aW9uSGFuZGxlcihmYWxzZSk7Cit9 CisKK3ZvaWQgTmV0d29ya0NhY2hlU3RvcmFnZTo6c2V0TWF4aW11bVNpemUoc2l6ZV90IHNpemUp Cit7CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKKyAgICBub3RJbXBsZW1lbnRlZCgp OworICAgIG1fbWF4aW11bVNpemUgPSBzaXplOworfQorCit2b2lkIE5ldHdvcmtDYWNoZVN0b3Jh Z2U6OmNsZWFyKCkKK3sKKyAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOworICAgIExPRyhO ZXR3b3JrQ2FjaGVTdG9yYWdlLCAiKE5ldHdvcmtQcm9jZXNzKSBjbGVhcmluZyBjYWNoZSIpOwor ICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgbV9rZXlGaWx0ZXIuY2xlYXIoKTsKK30KKworfSAv LyBuYW1lc3BhY2UgV2ViS2l0CisKKyNlbmRpZiAvLyBFTkFCTEUoTkVUV09SS19DQUNIRSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1dlYktp dDIvUGxhdGZvcm1HVEsuY21ha2UKaW5kZXggOThhMWM5Ni4uZWRjYzhlNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvU291cmNlL1dlYktpdDIvUGxh dGZvcm1HVEsuY21ha2UKQEAgLTE1LDYgKzE1LDggQEAgYWRkX2RlZmluaXRpb25zKC1ETElCRElS PSIke0xJQl9JTlNUQUxMX0RJUn0iKQogc2V0KFdlYktpdDJfVVNFX1BSRUZJWF9IRUFERVIgT04p CiAKIGxpc3QoQVBQRU5EIFdlYktpdDJfU09VUkNFUworICAgIE5ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZVN0b3JhZ2VTb3VwLmNwcAorCiAgICAgTmV0d29ya1Byb2Nlc3MvZ3RrL05l dHdvcmtQcm9jZXNzTWFpbkd0ay5jcHAKIAogICAgIE5ldHdvcmtQcm9jZXNzL3NvdXAvTmV0d29y a1Byb2Nlc3NTb3VwLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvY29uZmlnLmggYi9T b3VyY2UvV2ViS2l0Mi9jb25maWcuaAppbmRleCBmZjRmOGMyLi5lMjE1MDk1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9jb25maWcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9jb25maWcuaApA QCAtOTQsNyArOTQsNyBAQAogI2VuZGlmCiAKICNpZm5kZWYgRU5BQkxFX05FVFdPUktfQ0FDSEUK LSNpZiBQTEFURk9STShNQUMpICYmIEVOQUJMRShORVRXT1JLX1BST0NFU1MpCi0jZGVmaW5lIEVO QUJMRV9ORVRXT1JLX0NBQ0hFIDAKKyNpZiAoUExBVEZPUk0oTUFDKSB8fCBQTEFURk9STShHVEsp KSAmJiBFTkFCTEUoTkVUV09SS19QUk9DRVNTKQorI2RlZmluZSBFTkFCTEVfTkVUV09SS19DQUNI RSAxCiAjZW5kaWYKICNlbmRpZgo=