23649 2009-01-30 10:29:54 -0800 Update SQLTransactionErrorCallback to not return a value 2009-05-26 12:37:46 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 1 dglazkov dglazkov oldest_to_newest 107726 0 dglazkov 2009-01-30 10:29:54 -0800 This change brings HTML5 Database implementation up to the latest spec, which was changed to always rollback the transaction after the error callback is called. 107727 1 27187 dglazkov 2009-01-30 10:36:00 -0800 Created attachment 27187 v1 submitted for review LayoutTests/ChangeLog | 11 ++ .../transaction-error-callback-expected.txt | 9 ++ .../storage/transaction-error-callback.html | 105 ++++++++++++++++++++ WebCore/ChangeLog | 20 ++++ .../js/JSCustomSQLTransactionErrorCallback.cpp | 11 +-- .../js/JSCustomSQLTransactionErrorCallback.h | 2 +- WebCore/storage/SQLTransaction.cpp | 29 ++---- WebCore/storage/SQLTransaction.h | 1 - WebCore/storage/SQLTransactionErrorCallback.h | 2 +- 9 files changed, 159 insertions(+), 31 deletions(-) 109393 2 dglazkov 2009-02-11 16:27:38 -0800 Ping? 122582 3 27187 mjs 2009-05-22 00:31:10 -0700 Comment on attachment 27187 v1 submitted for review r=me 123163 4 dglazkov 2009-05-26 12:37:46 -0700 Landed as http://trac.webkit.org/changeset/44155. 27187 2009-01-30 10:36:00 -0800 2009-05-22 00:31:10 -0700 v1 submitted for review v1-submitted-for-review.patch text/plain 13100 dglazkov MGUzYjE4MTQ4NmQ1OWM0MzYzMGVmM2I4MWI4ZDY1ODc4OTczNjU2NgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGUwN2JhNDEu LmU4YmVmMTcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAwOS0wMS0zMCAgRGltaXRyaSBHbGF6 a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzY0OQorICAgICAgICBBZGQgbGF5b3V0IHRlc3QgZm9yIHZhcmlvdXMgY2FzZXMgb2Yg U1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrCisgICAgICAgIGludm9jYXRpb24uCisKKyAgICAg ICAgKiBzdG9yYWdlL3RyYW5zYWN0aW9uLWVycm9yLWNhbGxiYWNrLWV4cGVjdGVkLnR4dDogQWRk ZWQuCisgICAgICAgICogc3RvcmFnZS90cmFuc2FjdGlvbi1lcnJvci1jYWxsYmFjay5odG1sOiBB ZGRlZC4KKwogMjAwOS0wMS0zMCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9zdG9yYWdlL3RyYW5zYWN0aW9uLWVycm9yLWNhbGxiYWNrLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL3N0b3JhZ2UvdHJhbnNhY3Rpb24tZXJyb3ItY2FsbGJhY2stZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjQ3YjllZTMKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9zdG9yYWdlL3RyYW5zYWN0aW9uLWVycm9yLWNhbGxiYWNrLWV4 cGVjdGVkLnR4dApAQCAtMCwwICsxLDkgQEAKK0NPTlNPTEUgTUVTU0FHRTogbGluZSA2MzogW29i amVjdCBPYmplY3RdCitDT05TT0xFIE1FU1NBR0U6IGxpbmUgNjM6IFtvYmplY3QgT2JqZWN0XQor VGhpcyB0ZXN0IGNvbmZpcm1zIHRoYXQgcmVnYXJkbGVzcyBvZiBTUUxUcmFuc2FjdGlvbkVycm9y Q2FsbGJhY2sgb3V0cHV0IG9yIHByZXNlbmNlLCB0aGUgdHJhbnNhY3Rpb24gaXMgYWx3YXlzIHJv bGxlZCBiYWNrIG9uIGZhaWx1cmUuCitUZXN0aW5nIHRyYW5zYWN0aW9uIGZhaWxpbmcgbWlkLXdh eSBhbmQgZXJyb3IgY2FsbGJhY2sgcmV0dXJuaW5nIHRydWUgOiBTVUNDRVNTCitUZXN0aW5nIHRy YW5zYWN0aW9uIGZhaWxpbmcgbWlkLXdheSBhbmQgZXJyb3IgY2FsbGJhY2sgcmV0dXJuIGZhbHNl IDogU1VDQ0VTUworVGVzdGluZyBzdGF0ZW1lbnQgY2FsbGJhY2sgdGhyb3dpbmcgZXhjZXB0aW9u IGFuZCBlcnJvciBjYWxsYmFjayByZXR1cm5pbmcgdHJ1ZSA6IFNVQ0NFU1MKK1Rlc3Rpbmcgc3Rh dGVtZW50IGNhbGxiYWNrIHRocm93aW5nIGV4Y2VwdGlvbiBhbmQgZXJyb3IgY2FsbGJhY2sgcmV0 dXJuaW5nIGZhbHNlIDogU1VDQ0VTUworQWxsIFRlc3RzIGFyZSBjb21wbGV0ZS4KKwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvc3RvcmFnZS90cmFuc2FjdGlvbi1lcnJvci1jYWxsYmFjay5odG1s IGIvTGF5b3V0VGVzdHMvc3RvcmFnZS90cmFuc2FjdGlvbi1lcnJvci1jYWxsYmFjay5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjkwYjJlZDAKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9zdG9yYWdlL3RyYW5zYWN0aW9uLWVycm9yLWNhbGxiYWNrLmh0bWwK QEAgLTAsMCArMSwxMDUgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0PgorCitmdW5jdGlvbiBs b2cobWVzc2FnZSkKK3sKKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29uc29sZSIpLmlu bmVySFRNTCArPSBtZXNzYWdlICsgIjxicj4iOworfQorCisvLyBzaWduYWwgdG8gbGF5b3V0VGVz dENvbnRyb2xsZXIgd2hlbiB0aGlzIHJlYWNoZXMgemVyby4KK3ZhciB0ZXN0Q291bnQgPSA0Owor Ly8gd2UgZmlyc3QgcmV0cmlldmUgYW5kIHN0b3JlIHRoZSBudW1iZXIgb2Ygcm93cyBhbHJlYWR5 IGluIG91ciB0ZXN0IGRhdGFiYXNlLgorLy8gb3VyIGdvYWwgaXMgdG8ga2VlcCB0aGUgbnVtYmVy IHVuY2hhbmdlZCB0aHJvdWdoIHRoZSB0ZXN0cy4KK3ZhciBpbml0aWFsUm93Q291bnQgPSAwOwor dmFyIGRhdGFiYXNlOwordmFyIHN1Y2Nlc3NDYWxsYmFja0NhbGxlZDsKKworZnVuY3Rpb24gZmlu aXNoVGVzdCgpCit7CisgICAgaWYgKC0tdGVzdENvdW50KQorICAgICAgICByZXR1cm47CisKKyAg ICBsb2coIkFsbCBUZXN0cyBhcmUgY29tcGxldGUuIik7CisKKyAgICBpZiAod2luZG93LmxheW91 dFRlc3RDb250cm9sbGVyKQorICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25l KCk7Cit9CisKK2Z1bmN0aW9uIHN1Y2Nlc3NDYWxsYmFjaygpCit7CisgICAgc3VjY2Vzc0NhbGxi YWNrQ2FsbGVkID0gdHJ1ZTsKK30KKworZnVuY3Rpb24gdmVyaWZ5U3VjY2Vzcyhtc2cpCit7Cisg ICAgZGF0YWJhc2UudHJhbnNhY3Rpb24oZnVuY3Rpb24odHgpCisgICAgeworICAgICAgICB0eC5l eGVjdXRlU3FsKCJTRUxFQ1QgY291bnQoKikgQVMgY291bnQgRlJPTSBFcnJvckNhbGxiYWNrVGVz dCIsIFtdLCBmdW5jdGlvbih0eCwgcnMpCisgICAgICAgIHsKKyAgICAgICAgICAgIGxvZyhtc2cg KyAiIDogIiArIChycy5yb3dzLml0ZW0oMCkuY291bnQgPT0gaW5pdGlhbFJvd0NvdW50ICYmICFz dWNjZXNzQ2FsbGJhY2tDYWxsZWQgPyAiU1VDQ0VTUyIgOiAiRkFJTFVSRSIpKTsKKyAgICAgICAg ICAgIGZpbmlzaFRlc3QoKTsKKyAgICAgICAgfSk7CisgICAgfSk7Cit9CisKK2Z1bmN0aW9uIGZh aWxNaWRXYXkoZXJyb3JDYWxsYmFjaykKK3sKKyAgICBzdWNjZXNzQ2FsbGJhY2tDYWxsZWQgPSBm YWxzZTsKKyAgICBkYXRhYmFzZS50cmFuc2FjdGlvbihmdW5jdGlvbih0eCkKKyAgICB7CisgICAg ICAgIHR4LmV4ZWN1dGVTcWwoIklOU0VSVCBJTlRPIEVycm9yQ2FsbGJhY2tUZXN0KHNvbWVWYWx1 ZSkgVkFMVUVTKD8pOyIsIFsgMSBdKTsKKyAgICAgICAgdHguZXhlY3V0ZVNxbCgiTVVUVEVSIFNP TUVUSElORyBJTExFR0lCTEUiKTsKKyAgICB9LCBlcnJvckNhbGxiYWNrLCBzdWNjZXNzQ2FsbGJh Y2spOworfQorCitmdW5jdGlvbiBzdGF0ZW1lbnRDYWxsYmFja1Rocm93c0V4Y2VwdGlvbihlcnJv ckNhbGxiYWNrKQoreworICAgIHN1Y2Nlc3NDYWxsYmFja0NhbGxlZCA9IGZhbHNlOworICAgIGRh dGFiYXNlLnRyYW5zYWN0aW9uKGZ1bmN0aW9uKHR4KQorICAgIHsKKyAgICAgICAgdHguZXhlY3V0 ZVNxbCgiSU5TRVJUIElOVE8gRXJyb3JDYWxsYmFja1Rlc3Qoc29tZVZhbHVlKSBWQUxVRVMoPyk7 IiwgWyAxIF0sIGZ1bmN0aW9uKCkKKyAgICAgICAgeworICAgICAgICAgICAgdGhyb3cge307Cisg ICAgICAgIH0pOworICAgIH0pOworfQorCitmdW5jdGlvbiBydW5UZXN0KCkKK3sKKyAgICBpZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgICAgIGxheW91dFRlc3RDb250cm9s bGVyLmNsZWFyQWxsRGF0YWJhc2VzKCk7CisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1 bXBBc1RleHQoKTsKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgp OworICAgIH0KKworICAgIGRhdGFiYXNlID0gb3BlbkRhdGFiYXNlKCJFcnJvckNhbGxiYWNrRGF0 YWJhc2UiLCAiMS4wIiwgIlRlc3QgZm9yIGVycm9yIGNhbGxiYWNrIiwgMSk7CisgICAgZGF0YWJh c2UudHJhbnNhY3Rpb24oZnVuY3Rpb24odHgpCisgICAgeworICAgICAgICB0eC5leGVjdXRlU3Fs KCJDUkVBVEUgVEFCTEUgSUYgTk9UIEVYSVNUUyBFcnJvckNhbGxiYWNrVGVzdCAoc29tZVZhbHVl KSIsIFtdKTsKKyAgICAgICAgdHguZXhlY3V0ZVNxbCgiU0VMRUNUIGNvdW50KCopIEFTIGNvdW50 IEZST00gRXJyb3JDYWxsYmFja1Rlc3QiLCBbXSwgZnVuY3Rpb24odHgsIHJzKQorICAgICAgICB7 CisgICAgICAgICAgICBpbml0aWFsUm93Q291bnQgPSBycy5yb3dzLml0ZW0oMCkuY291bnQ7Cisg ICAgICAgIH0pOworICAgIH0pOworCisgICAgZmFpbE1pZFdheShmdW5jdGlvbigpIHsgcmV0dXJu IHRydWU7IH0pOworICAgIHZlcmlmeVN1Y2Nlc3MoIlRlc3RpbmcgdHJhbnNhY3Rpb24gZmFpbGlu ZyBtaWQtd2F5IGFuZCBlcnJvciBjYWxsYmFjayByZXR1cm5pbmcgdHJ1ZSIpOworICAgIGZhaWxN aWRXYXkoZnVuY3Rpb24oKSB7IHJldHVybiBmYWxzZTsgfSk7CisgICAgdmVyaWZ5U3VjY2Vzcygi VGVzdGluZyB0cmFuc2FjdGlvbiBmYWlsaW5nIG1pZC13YXkgYW5kIGVycm9yIGNhbGxiYWNrIHJl dHVybiBmYWxzZSIpOworICAgIHN0YXRlbWVudENhbGxiYWNrVGhyb3dzRXhjZXB0aW9uKGZ1bmN0 aW9uKCkgeyByZXR1cm4gdHJ1ZTsgfSk7CisgICAgdmVyaWZ5U3VjY2VzcygiVGVzdGluZyBzdGF0 ZW1lbnQgY2FsbGJhY2sgdGhyb3dpbmcgZXhjZXB0aW9uIGFuZCBlcnJvciBjYWxsYmFjayByZXR1 cm5pbmcgdHJ1ZSIpOworICAgIHN0YXRlbWVudENhbGxiYWNrVGhyb3dzRXhjZXB0aW9uKGZ1bmN0 aW9uKCkgeyByZXR1cm4gZmFsc2U7IH0pOworICAgIHZlcmlmeVN1Y2Nlc3MoIlRlc3Rpbmcgc3Rh dGVtZW50IGNhbGxiYWNrIHRocm93aW5nIGV4Y2VwdGlvbiBhbmQgZXJyb3IgY2FsbGJhY2sgcmV0 dXJuaW5nIGZhbHNlIik7Cit9CisKKzwvc2NyaXB0PgorPC9oZWFkPgorCis8Ym9keSBvbmxvYWQ9 InJ1blRlc3QoKSI+CitUaGlzIHRlc3QgY29uZmlybXMgdGhhdCA8Y29kZT5TUUxUcmFuc2FjdGlv bkVycm9yQ2FsbGJhY2s8L2NvZGU+IGlzIGludm9rZWQgY29ycmVjdGx5IGFuZCByZWdhcmRsZXNz IG9mIGl0cyBvdXRwdXQsIHRoZSB0cmFuc2FjdGlvbiBpcyBhbHdheXMgcm9sbGVkIGJhY2sgb24g ZmFpbHVyZS4KKzxwcmUgaWQ9ImNvbnNvbGUiPgorPC9wcmU+Cis8L2JvZHk+CisKKzwvaHRtbD4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjY3NmNlZi4uYzFjZGQ4MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAwOS0wMS0zMCAgRGltaXRyaSBHbGF6 a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIHYxIHN1Ym1pdHRlZCBmb3IgcmV2aWV3CisKKyAgICAgICAg VGVzdDogc3RvcmFnZS90cmFuc2FjdGlvbi1lcnJvci1jYWxsYmFjay5odG1sCisKKyAgICAgICAg KiBiaW5kaW5ncy9qcy9KU0N1c3RvbVNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjay5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpKU0N1c3RvbVNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjazo6aGFu ZGxlRXZlbnQpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTQ3VzdG9tU1FMVHJhbnNhY3Rpb25F cnJvckNhbGxiYWNrLmg6CisgICAgICAgICogc3RvcmFnZS9TUUxUcmFuc2FjdGlvbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTUUxUcmFuc2FjdGlvbjo6U1FMVHJhbnNhY3Rpb24pOgorICAgICAg ICAoV2ViQ29yZTo6U1FMVHJhbnNhY3Rpb246OnBvc3RmbGlnaHRBbmRDb21taXQpOgorICAgICAg ICAoV2ViQ29yZTo6U1FMVHJhbnNhY3Rpb246OmhhbmRsZVRyYW5zYWN0aW9uRXJyb3IpOgorICAg ICAgICAoV2ViQ29yZTo6U1FMVHJhbnNhY3Rpb246OmRlbGl2ZXJUcmFuc2FjdGlvbkVycm9yQ2Fs bGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6U1FMVHJhbnNhY3Rpb246OmNsZWFudXBBZnRlclRy YW5zYWN0aW9uRXJyb3JDYWxsYmFjayk6CisgICAgICAgICogc3RvcmFnZS9TUUxUcmFuc2FjdGlv bi5oOgorICAgICAgICAqIHN0b3JhZ2UvU1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrLmg6CisK IDIwMDktMDEtMzAgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3Mv anMvSlNDdXN0b21TUUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2suY3BwIGIvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU0N1c3RvbVNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjay5jcHAKaW5kZXggNWM4 YjhkNC4uNWI0MmUxMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0N1c3RvbVNR TFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjay5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0N1c3RvbVNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjay5jcHAKQEAgLTQ2LDEzICs0NiwxMyBA QCBKU0N1c3RvbVNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjazo6SlNDdXN0b21TUUxUcmFuc2Fj dGlvbkVycm9yQ2FsbGJhY2soSlNPYmplYwogewogfQogICAgIAotYm9vbCBKU0N1c3RvbVNRTFRy YW5zYWN0aW9uRXJyb3JDYWxsYmFjazo6aGFuZGxlRXZlbnQoU1FMRXJyb3IqIGVycm9yKQordm9p ZCBKU0N1c3RvbVNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjazo6aGFuZGxlRXZlbnQoU1FMRXJy b3IqIGVycm9yKQogewogICAgIEFTU0VSVChtX2NhbGxiYWNrKTsKICAgICBBU1NFUlQobV9mcmFt ZSk7CiAgICAgICAgIAogICAgIGlmICghbV9mcmFtZS0+c2NyaXB0KCktPmlzRW5hYmxlZCgpKQot ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgcmV0dXJuOwogICAgICAgICAKICAgICBKU0ds b2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gbV9mcmFtZS0+c2NyaXB0KCktPmdsb2JhbE9iamVj dCgpOwogICAgIEV4ZWNTdGF0ZSogZXhlYyA9IGdsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpOwpA QCAtNjYsNyArNjYsNyBAQCBib29sIEpTQ3VzdG9tU1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNr OjpoYW5kbGVFdmVudChTUUxFcnJvciogZXJyb3IpCiAgICAgICAgIGNhbGxUeXBlID0gbV9jYWxs YmFjay0+Z2V0Q2FsbERhdGEoY2FsbERhdGEpOwogICAgICAgICBpZiAoY2FsbFR5cGUgPT0gQ2Fs bFR5cGVOb25lKSB7CiAgICAgICAgICAgICAvLyBGSVhNRTogU2hvdWxkIGFuIGV4Y2VwdGlvbiBi ZSB0aHJvd24gaGVyZT8KLSAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9CiAgICAgICAgIGZ1bmN0aW9uID0gbV9jYWxsYmFjazsKICAgICB9CkBA IC03NiwxNyArNzYsMTQgQEAgYm9vbCBKU0N1c3RvbVNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFj azo6aGFuZGxlRXZlbnQoU1FMRXJyb3IqIGVycm9yKQogICAgIEFyZ0xpc3QgYXJnczsKICAgICBh cmdzLmFwcGVuZCh0b0pTKGV4ZWMsIGVycm9yKSk7CiAKLSAgICBKU1ZhbHVlUHRyIHJlc3VsdDsK ICAgICBnbG9iYWxPYmplY3QtPnN0YXJ0VGltZW91dENoZWNrKCk7Ci0gICAgcmVzdWx0ID0gY2Fs bChleGVjLCBmdW5jdGlvbiwgY2FsbFR5cGUsIGNhbGxEYXRhLCBtX2NhbGxiYWNrLCBhcmdzKTsK KyAgICBjYWxsKGV4ZWMsIGZ1bmN0aW9uLCBjYWxsVHlwZSwgY2FsbERhdGEsIG1fY2FsbGJhY2ss IGFyZ3MpOwogICAgIGdsb2JhbE9iamVjdC0+c3RvcFRpbWVvdXRDaGVjaygpOwogICAgICAgICAK ICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJlcG9ydEN1cnJlbnRFeGNl cHRpb24oZXhlYyk7CiAgICAgICAgIAogICAgIERvY3VtZW50Ojp1cGRhdGVEb2N1bWVudHNSZW5k ZXJpbmcoKTsKLSAgICAKLSAgICByZXR1cm4gcmVzdWx0LnRvQm9vbGVhbihleGVjKTsKIH0KICAg ICAKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDdXN0b21TUUxUcmFuc2Fj dGlvbkVycm9yQ2FsbGJhY2suaCBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDdXN0b21TUUxUcmFu c2FjdGlvbkVycm9yQ2FsbGJhY2suaAppbmRleCAxMjIyMjRmLi5lMjM5MWZkIDEwMDY0NAotLS0g YS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3VzdG9tU1FMVHJhbnNhY3Rpb25FcnJvckNhbGxiYWNr LmgKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0N1c3RvbVNRTFRyYW5zYWN0aW9uRXJyb3JD YWxsYmFjay5oCkBAIC00OCw3ICs0OCw3IEBAIGNsYXNzIEpTQ3VzdG9tU1FMVHJhbnNhY3Rpb25F cnJvckNhbGxiYWNrIDogcHVibGljIFNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjayB7CiBwdWJs aWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8SlNDdXN0b21TUUxUcmFuc2FjdGlvbkVycm9yQ2Fs bGJhY2s+IGNyZWF0ZShKU0M6OkpTT2JqZWN0KiBjYWxsYmFjaywgRnJhbWUqIGZyYW1lKSB7IHJl dHVybiBhZG9wdFJlZihuZXcgSlNDdXN0b21TUUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2soY2Fs bGJhY2ssIGZyYW1lKSk7IH0KICAgICAKLSAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlRXZlbnQoU1FM RXJyb3IqKTsKKyAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlRXZlbnQoU1FMRXJyb3IqKTsKIAogcHJp dmF0ZToKICAgICBKU0N1c3RvbVNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjayhKU0M6OkpTT2Jq ZWN0KiBjYWxsYmFjaywgRnJhbWUqKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvc3RvcmFnZS9TUUxU cmFuc2FjdGlvbi5jcHAgYi9XZWJDb3JlL3N0b3JhZ2UvU1FMVHJhbnNhY3Rpb24uY3BwCmluZGV4 IDU4MjBkN2YuLmI5ZDVjYmQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvc3RvcmFnZS9TUUxUcmFuc2Fj dGlvbi5jcHAKKysrIGIvV2ViQ29yZS9zdG9yYWdlL1NRTFRyYW5zYWN0aW9uLmNwcApAQCAtNzIs NyArNzIsNiBAQCBTUUxUcmFuc2FjdGlvbjo6U1FMVHJhbnNhY3Rpb24oRGF0YWJhc2UqIGRiLCBQ YXNzUmVmUHRyPFNRTFRyYW5zYWN0aW9uQ2FsbGJhY2s+CiAgICAgLCBtX3N1Y2Nlc3NDYWxsYmFj ayhzdWNjZXNzQ2FsbGJhY2spCiAgICAgLCBtX2Vycm9yQ2FsbGJhY2soZXJyb3JDYWxsYmFjaykK ICAgICAsIG1fc2hvdWxkUmV0cnlDdXJyZW50U3RhdGVtZW50KGZhbHNlKQotICAgICwgbV9zaG91 bGRDb21taXRBZnRlckVycm9yQ2FsbGJhY2sodHJ1ZSkKICAgICAsIG1fbW9kaWZpZWREYXRhYmFz ZShmYWxzZSkKIHsKICAgICBBU1NFUlQobV9kYXRhYmFzZSk7CkBAIC00MjIsNyArNDIxLDYgQEAg dm9pZCBTUUxUcmFuc2FjdGlvbjo6cG9zdGZsaWdodEFuZENvbW1pdCgpCiAKICAgICAvLyBJZiB0 aGUgY29tbWl0IGZhaWxlZCwgdGhlIHRyYW5zYWN0aW9uIHdpbGwgc3RpbGwgYmUgbWFya2VkIGFz ICJpbiBwcm9ncmVzcyIKICAgICBpZiAobV9zcWxpdGVUcmFuc2FjdGlvbi0+aW5Qcm9ncmVzcygp KSB7Ci0gICAgICAgIG1fc2hvdWxkQ29tbWl0QWZ0ZXJFcnJvckNhbGxiYWNrID0gZmFsc2U7CiAg ICAgICAgIG1fdHJhbnNhY3Rpb25FcnJvciA9IFNRTEVycm9yOjpjcmVhdGUoMCwgImZhaWxlZCB0 byBjb21taXQgdGhlIHRyYW5zYWN0aW9uIik7CiAgICAgICAgIGhhbmRsZVRyYW5zYWN0aW9uRXJy b3IoZmFsc2UpOwogICAgICAgICByZXR1cm47CkBAIC00ODMsOCArNDgxLDggQEAgdm9pZCBTUUxU cmFuc2FjdGlvbjo6aGFuZGxlVHJhbnNhY3Rpb25FcnJvcihib29sIGluQ2FsbGJhY2spCiAgICAg ICAgIHJldHVybjsKICAgICB9CiAgICAgCi0gICAgLy8gVHJhbnNhY3Rpb24gU3RlcCAxMiAtIElm IHRoZSBjYWxsYmFjayBjb3VsZG4ndCBiZSBjYWxsZWQsIHRoZW4gcm9sbGJhY2sgdGhlIHRyYW5z YWN0aW9uLgotICAgIG1fc2hvdWxkQ29tbWl0QWZ0ZXJFcnJvckNhbGxiYWNrID0gZmFsc2U7Cisg ICAgLy8gTm8gZXJyb3IgY2FsbGJhY2ssIHNvIGZhc3QtZm9yd2FyZCB0bzoKKyAgICAvLyBUcmFu c2FjdGlvbiBTdGVwIDEyIC0gUm9sbGJhY2sgdGhlIHRyYW5zYWN0aW9uLgogICAgIGlmIChpbkNh bGxiYWNrKSB7CiAgICAgICAgIG1fbmV4dFN0ZXAgPSAmU1FMVHJhbnNhY3Rpb246OmNsZWFudXBB ZnRlclRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjazsKICAgICAgICAgTE9HKFN0b3JhZ2VBUEksICJT Y2hlZHVsaW5nIGNsZWFudXBBZnRlclRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjayBmb3IgdHJhbnNh Y3Rpb24gJXBcbiIsIHRoaXMpOwpAQCAtNDk4LDEwICs0OTYsMTAgQEAgdm9pZCBTUUxUcmFuc2Fj dGlvbjo6ZGVsaXZlclRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjaygpCiB7CiAgICAgQVNTRVJUKG1f dHJhbnNhY3Rpb25FcnJvcik7CiAgICAgCi0gICAgLy8gVHJhbnNhY3Rpb24gU3RlcCAxMiAtIElm IHRoZSBjYWxsYmFjayBkaWRuJ3QgcmV0dXJuIGZhbHNlLCB0aGVuIHJvbGxiYWNrIHRoZSB0cmFu c2FjdGlvbi4KLSAgICAvLyBUaGlzIGluY2x1ZGVzIHRoZSBjYWxsYmFjayBub3QgZXhpc3Rpbmcs IHJldHVybmluZyB0cnVlLCBvciB0aHJvd2luZyBhbiBleGNlcHRpb24KLSAgICBpZiAoIW1fZXJy b3JDYWxsYmFjayB8fCBtX2Vycm9yQ2FsbGJhY2stPmhhbmRsZUV2ZW50KG1fdHJhbnNhY3Rpb25F cnJvci5nZXQoKSkpCi0gICAgICAgIG1fc2hvdWxkQ29tbWl0QWZ0ZXJFcnJvckNhbGxiYWNrID0g ZmFsc2U7CisgICAgLy8gVHJhbnNhY3Rpb24gU3RlcCAxMiAtIElmIGV4aXN0cywgaW52b2tlIGVy cm9yIGNhbGxiYWNrIHdpdGggdGhlIGxhc3QKKyAgICAvLyBlcnJvciB0byBoYXZlIG9jY3VycmVk IGluIHRoaXMgdHJhbnNhY3Rpb24uCisgICAgaWYgKG1fZXJyb3JDYWxsYmFjaykKKyAgICAgICAg bV9lcnJvckNhbGxiYWNrLT5oYW5kbGVFdmVudChtX3RyYW5zYWN0aW9uRXJyb3IuZ2V0KCkpOwog CiAgICAgbV9uZXh0U3RlcCA9ICZTUUxUcmFuc2FjdGlvbjo6Y2xlYW51cEFmdGVyVHJhbnNhY3Rp b25FcnJvckNhbGxiYWNrOwogICAgIExPRyhTdG9yYWdlQVBJLCAiU2NoZWR1bGluZyBjbGVhbnVw QWZ0ZXJUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2sgZm9yIHRyYW5zYWN0aW9uICVwXG4iLCB0aGlz KTsKQEAgLTUxMiwxOSArNTEwLDggQEAgdm9pZCBTUUxUcmFuc2FjdGlvbjo6Y2xlYW51cEFmdGVy VHJhbnNhY3Rpb25FcnJvckNhbGxiYWNrKCkKIHsKICAgICBtX2RhdGFiYXNlLT5tX2RhdGFiYXNl QXV0aG9yaXplci0+ZGlzYWJsZSgpOwogICAgIGlmIChtX3NxbGl0ZVRyYW5zYWN0aW9uKSB7Ci0g ICAgICAgIC8vIFRyYW5zYWN0aW9uIFN0ZXAgMTIgLUlmIHRoZSBlcnJvciBjYWxsYmFjayByZXR1 cm5lZCBmYWxzZSwgYW5kIHRoZSBsYXN0IGVycm9yIHdhc24ndCBpdHNlbGYgYSAKLSAgICAgICAg Ly8gZmFpbHVyZSB3aGVuIGNvbW1pdHRpbmcgdGhlIHRyYW5zYWN0aW9uLCB0aGVuIHRyeSB0byBj b21taXQgdGhlIHRyYW5zYWN0aW9uCi0gICAgICAgIGlmIChtX3Nob3VsZENvbW1pdEFmdGVyRXJy b3JDYWxsYmFjaykKLSAgICAgICAgICAgIG1fc3FsaXRlVHJhbnNhY3Rpb24tPmNvbW1pdCgpOwot ICAgICAgICAKLSAgICAgICAgaWYgKG1fc3FsaXRlVHJhbnNhY3Rpb24tPmluUHJvZ3Jlc3MoKSkg ewotICAgICAgICAgICAgLy8gVHJhbnNhY3Rpb24gU3RlcCAxMiAtIElmIHRoYXQgZmFpbHMsIG9y IGlmIHRoZSBjYWxsYmFjayBjb3VsZG4ndCBiZSBjYWxsZWQgCi0gICAgICAgICAgICAvLyBvciBp ZiBpdCBkaWRuJ3QgcmV0dXJuIGZhbHNlLCB0aGVuIHJvbGxiYWNrIHRoZSB0cmFuc2FjdGlvbi4K LSAgICAgICAgICAgIG1fc3FsaXRlVHJhbnNhY3Rpb24tPnJvbGxiYWNrKCk7Ci0gICAgICAgIH0g ZWxzZSBpZiAobV9tb2RpZmllZERhdGFiYXNlKSB7Ci0gICAgICAgICAgICAvLyBCdXQgaWYgdGhl IGNvbW1pdCB3YXMgc3VjY2Vzc2Z1bCwgbm90aWZ5IHRoZSBkZWxlZ2F0ZXMgaWYgdGhlIHRyYW5z YWN0aW9uIG1vZGlmaWVkIHRoaXMgZGF0YWJhc2UKLSAgICAgICAgICAgIERhdGFiYXNlVHJhY2tl cjo6dHJhY2tlcigpLnNjaGVkdWxlTm90aWZ5RGF0YWJhc2VDaGFuZ2VkKG1fZGF0YWJhc2UtPm1f c2VjdXJpdHlPcmlnaW4uZ2V0KCksIG1fZGF0YWJhc2UtPm1fbmFtZSk7Ci0gICAgICAgIH0KKyAg ICAgICAgLy8gVHJhbnNhY3Rpb24gU3RlcCAxMiAtIFJvbGxiYWNrIHRoZSB0cmFuc2FjdGlvbi4K KyAgICAgICAgbV9zcWxpdGVUcmFuc2FjdGlvbi0+cm9sbGJhY2soKTsKICAgICAgICAgCiAgICAg ICAgIEFTU0VSVCghbV9kYXRhYmFzZS0+bV9zcWxpdGVEYXRhYmFzZS50cmFuc2FjdGlvbkluUHJv Z3Jlc3MoKSk7CiAgICAgICAgIG1fc3FsaXRlVHJhbnNhY3Rpb24uY2xlYXIoKTsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvc3RvcmFnZS9TUUxUcmFuc2FjdGlvbi5oIGIvV2ViQ29yZS9zdG9yYWdlL1NR TFRyYW5zYWN0aW9uLmgKaW5kZXggODdkNDM4ZS4uYjA4ZGRhZiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9zdG9yYWdlL1NRTFRyYW5zYWN0aW9uLmgKKysrIGIvV2ViQ29yZS9zdG9yYWdlL1NRTFRyYW5z YWN0aW9uLmgKQEAgLTExNyw3ICsxMTcsNiBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxTUUxUcmFu c2FjdGlvbkVycm9yQ2FsbGJhY2s+IG1fZXJyb3JDYWxsYmFjazsKICAgICBSZWZQdHI8U1FMRXJy b3I+IG1fdHJhbnNhY3Rpb25FcnJvcjsKICAgICBib29sIG1fc2hvdWxkUmV0cnlDdXJyZW50U3Rh dGVtZW50OwotICAgIGJvb2wgbV9zaG91bGRDb21taXRBZnRlckVycm9yQ2FsbGJhY2s7CiAgICAg Ym9vbCBtX21vZGlmaWVkRGF0YWJhc2U7CiAgICAgCiAgICAgTXV0ZXggbV9zdGF0ZW1lbnRNdXRl eDsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvc3RvcmFnZS9TUUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJh Y2suaCBiL1dlYkNvcmUvc3RvcmFnZS9TUUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2suaAppbmRl eCAyODkwNTU2Li5kMGRiNTI4IDEwMDY0NAotLS0gYS9XZWJDb3JlL3N0b3JhZ2UvU1FMVHJhbnNh Y3Rpb25FcnJvckNhbGxiYWNrLmgKKysrIGIvV2ViQ29yZS9zdG9yYWdlL1NRTFRyYW5zYWN0aW9u RXJyb3JDYWxsYmFjay5oCkBAIC0zOCw3ICszOCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICBjbGFzcyBTUUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2sgOiBwdWJsaWMgVGhyZWFkU2FmZVNo YXJlZDxTUUxUcmFuc2FjdGlvbkVycm9yQ2FsbGJhY2s+IHsKICAgICBwdWJsaWM6CiAgICAgICAg IHZpcnR1YWwgflNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjaygpIHsgfQotICAgICAgICB2aXJ0 dWFsIGJvb2wgaGFuZGxlRXZlbnQoU1FMRXJyb3IqKSA9IDA7CisgICAgICAgIHZpcnR1YWwgdm9p ZCBoYW5kbGVFdmVudChTUUxFcnJvciopID0gMDsKICAgICB9OwogICAgIAogfQo=