137787 2014-10-16 13:46:50 -0700 [Win] Update DRT to match Mac Logic 2014-10-16 15:08:15 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 bfulgham webkit-unassigned bfulgham oldest_to_newest 1042174 0 bfulgham 2014-10-16 13:46:50 -0700 The Windows port doesn't mimic the logic used in Mac DRT in a few places: 1. printf output during certain delegate operations do not match. 2. Certain 'error' categories of URL used in some HTTP/HTTPS tests are not implemented properly in Windows DRT. This patch corrects both of these problems. Once it is integrated, we can begin turning some of these HTTP tests back on. 1042179 1 239963 bfulgham 2014-10-16 13:56:45 -0700 Created attachment 239963 Patch 1042215 2 bfulgham 2014-10-16 15:08:15 -0700 Committed r174796: <http://trac.webkit.org/changeset/174796> 239963 2014-10-16 13:56:45 -0700 2014-10-16 14:00:40 -0700 Patch bug-137787-20141016140020.patch text/plain 13571 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NDc5MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM4IEBACisyMDE0LTEwLTE2ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIFVwZGF0ZSBEUlQgdG8gbWF0Y2ggTWFjIExvZ2ljCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc3ODcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVl L3dpbi9EdW1wUmVuZGVyVHJlZS5jcHA6CisgICAgICAgIChpbml0aWFsaXplKTogMCAtPiBudWxs cHRyCisgICAgICAgIChydW5UZXN0KTogSW5pdGlhbGl6ZSBNU0cgc3RydWN0dXJlIGJlZm9yZSB1 c2luZy4KKyAgICAgICAgKG1haW4pOiBBZGQgQ1JUIGRlYnVnIGZsYWdzIGlmIGJ1aWxkaW5nIERS VCB3aXRoIGRlYnVnIG1hbGxvYyBvbiBXaW5kb3dzLgorICAgICAgICBBbHNvLCBjbGVhbmx5IHNo dXQgZG93biBDT00gd2hlbiBleGl0aW5nLgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3dpbi9G cmFtZUxvYWREZWxlZ2F0ZS5jcHA6CisgICAgICAgIChGcmFtZUxvYWREZWxlZ2F0ZTo6ZGlkQ2hh bmdlTG9jYXRpb25XaXRoaW5QYWdlRm9yRnJhbWUpOiBNb3ZlIGZyb20KKyAgICAgICAgaGVhZGVy IGFuZCBhZGQgcHJpbnRmIHRvIG1hdGNoIE1hYy4KKyAgICAgICAgKEZyYW1lTG9hZERlbGVnYXRl Ojp3aW5kb3dTY3JpcHRPYmplY3RBdmFpbGFibGUpOiBEaXR0by4KKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS93aW4vRnJhbWVMb2FkRGVsZWdhdGUuaDoKKyAgICAgICAgKEZyYW1lTG9hZERlbGVn YXRlOjpkaWRDaGFuZ2VMb2NhdGlvbldpdGhpblBhZ2VGb3JGcmFtZSk6IERlbGV0ZWQuCisgICAg ICAgIChGcmFtZUxvYWREZWxlZ2F0ZTo6d2luZG93U2NyaXB0T2JqZWN0QXZhaWxhYmxlKTogRGVs ZXRlZC4KKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vUmVzb3VyY2VMb2FkRGVsZWdhdGUu Y3BwOgorICAgICAgICAoaXNMb2NhbGhvc3QpOiBBZGRlZC4KKyAgICAgICAgKGhvc3RJc1VzZWRC eVNvbWVUZXN0c1RvR2VuZXJhdGVFcnJvcik6IEFkZGVkLgorICAgICAgICAoUmVzb3VyY2VMb2Fk RGVsZWdhdGU6OndpbGxTZW5kUmVxdWVzdCk6IEFkZCBsb2dpYyB0byBtaW1pYyBNYWMncyB1c2UK KyAgICAgICAgb2YgY2VydGFpbiBlcnJvciBhbmQgcmVkaXJlY3QgaG9zdCBuYW1lcy4KKyAgICAg ICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vVUlEZWxlZ2F0ZS5jcHA6CisgICAgICAgIChVSURlbGVn YXRlOjpydW5KYXZhU2NyaXB0QWxlcnRQYW5lbFdpdGhNZXNzYWdlKTogVXNlICdkb25lJyBmbGFn IHRvIGRlY2lkZSBpZgorICAgICAgICBhbnl0aGluZyBzaG91bGQgYmUgb3V0cHV0IHRvIHRoZSBj b25zb2xlLiBUaGlzIG1vZGlmaWVzIGJlaGF2aW9yIHRvIG1hdGNoIHRoZSBNYWMuCisgICAgICAg IChVSURlbGVnYXRlOjpydW5KYXZhU2NyaXB0Q29uZmlybVBhbmVsV2l0aE1lc3NhZ2UpOiBEaXR0 by4KKyAgICAgICAgKFVJRGVsZWdhdGU6OnJ1bkphdmFTY3JpcHRUZXh0SW5wdXRQYW5lbFdpdGhQ cm9tcHQpOiBEaXR0by4KKyAgICAgICAgKFVJRGVsZWdhdGU6OnJ1bkJlZm9yZVVubG9hZENvbmZp cm1QYW5lbFdpdGhNZXNzYWdlKTogRGl0dG8uCisgICAgICAgIChVSURlbGVnYXRlOjp3ZWJWaWV3 QWRkTWVzc2FnZVRvQ29uc29sZSk6IERpdHRvLgorICAgICAgICAqIFdpbkxhdW5jaGVyL1BhZ2VM b2FkVGVzdENsaWVudC5jcHA6CisgICAgICAgIChQYWdlTG9hZFRlc3RDbGllbnQ6OnBhZ2VMb2Fk RW5kZWRBdFRpbWUpOiBEcml2ZS1ieS1maXggZm9yIGFuIGFzc2VydGlvbiB0aGF0IEkKKyAgICAg ICAgYWRkZWQgbGFzdCB3ZWVrLgorCiAyMDE0LTEwLTE1ICBHeXV5b3VuZyBLaW0gIDxneXV5b3Vu Zy5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgYWRkIG15c2VsZiB0byBD b29yZGluYXRlZEdyYXBoaWNzIHdhdGNoZXJzLgpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUv d2luL0R1bXBSZW5kZXJUcmVlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJl ZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCShyZXZpc2lvbiAxNzQ3MTIpCisrKyBUb29scy9EdW1w UmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDks NyArMzA5LDcgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZSgpCiAgICAgICAgICAgICBkbGxSZWdp c3RlclNlcnZlcigpOwogCiAgICAgLy8gSW5pdCBDT00KLSAgICBPbGVJbml0aWFsaXplKDApOwor ICAgIE9sZUluaXRpYWxpemUobnVsbHB0cik7CiAKICAgICBzdGF0aWMgTFBDVFNUUiBmb250c1Rv SW5zdGFsbFtdID0gewogICAgICAgICBURVhUKCJBSEVNX19fXy50dGYiKSwKQEAgLTEwNjQsNiAr MTA2NCw3IEBAIHN0YXRpYyB2b2lkIHJ1blRlc3QoY29uc3Qgc3RyaW5nJiBpbnB1dEwKICAgICBX b3JrUXVldWU6OnNoYXJlZCgpLT5jbGVhcigpOwogICAgIFdvcmtRdWV1ZTo6c2hhcmVkKCktPnNl dEZyb3plbihmYWxzZSk7CiAKKyAgICBNU0cgbXNnID0geyAwIH07CiAgICAgSFdORCBob3N0V2lu ZG93OwogICAgIHdlYlZpZXctPmhvc3RXaW5kb3coJmhvc3RXaW5kb3cpOwogCkBAIC0xMDc3LDcg KzEwNzgsNiBAQCBzdGF0aWMgdm9pZCBydW5UZXN0KGNvbnN0IHN0cmluZyYgaW5wdXRMCiAgICAg cmVxdWVzdC0+c2V0SFRUUE1ldGhvZChtZXRob2RCU3RyKTsKICAgICBmcmFtZS0+bG9hZFJlcXVl c3QocmVxdWVzdC5nZXQoKSk7CiAKLSAgICBNU0cgbXNnOwogICAgIHdoaWxlICh0cnVlKSB7CiAj aWYgVVNFKENGKQogICAgICAgICBDRlJ1bkxvb3BSdW5Jbk1vZGUoa0NGUnVuTG9vcERlZmF1bHRN b2RlLCAwLCB0cnVlKTsKQEAgLTEyNDEsNiArMTI0MSwxMSBAQCBzdGF0aWMgTE9ORyBXSU5BUEkg ZXhjZXB0aW9uRmlsdGVyKEVYQ0VQCiAKIGludCBtYWluKGludCBhcmdjLCBjb25zdCBjaGFyKiBh cmd2W10pCiB7CisjaWZkZWYgX0NSVERCR19NQVBfQUxMT0MKKyAgICBfQ3J0U2V0UmVwb3J0Rmls ZShfQ1JUX1dBUk4sIF9DUlREQkdfRklMRV9TVERFUlIpOworICAgIF9DcnRTZXRSZXBvcnRNb2Rl KF9DUlRfV0FSTiwgX0NSVERCR19NT0RFX0ZJTEUpOworI2VuZGlmCisKICAgICAvLyBDeWd3aW4g Y2FsbHMgOjpTZXRFcnJvck1vZGUoU0VNX0ZBSUxDUklUSUNBTEVSUk9SUyksIHdoaWNoIHdlIHdp bGwgaW5oZXJpdC4gVGhpcyBpcyBiYWQgZm9yCiAgICAgLy8gdGVzdGluZy9kZWJ1Z2dpbmcsIGFz IGl0IGNhdXNlcyB0aGUgcG9zdC1tb3J0ZW0gZGVidWdnZXIgbm90IHRvIGJlIGludm9rZWQuIFdl IHJlc2V0IHRoZQogICAgIC8vIGVycm9yIG1vZGUgaGVyZSB0byB3b3JrIGFyb3VuZCBDeWd3aW4n cyBiZWhhdmlvci4gU2VlIDxodHRwOi8vd2Via2l0Lm9yZy9iLzU1MjIyPi4KQEAgLTEzOTksNiAr MTQwNCwxMSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltdKQogI2VuZGlm CiAKICAgICBzaHV0RG93bldlYktpdCgpOworI2lmZGVmIF9DUlREQkdfTUFQX0FMTE9DCisgICAg X0NydER1bXBNZW1vcnlMZWFrcygpOworI2VuZGlmCisKKyAgICA6Ok9sZVVuaW5pdGlhbGl6ZSgp OwogCiAgICAgcmV0dXJuIDA7CiB9CkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRnJh bWVMb2FkRGVsZWdhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dp bi9GcmFtZUxvYWREZWxlZ2F0ZS5jcHAJKHJldmlzaW9uIDE3NDcxMikKKysrIFRvb2xzL0R1bXBS ZW5kZXJUcmVlL3dpbi9GcmFtZUxvYWREZWxlZ2F0ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEz OSw2ICsxMzksMTQgQEAgSFJFU1VMVCBGcmFtZUxvYWREZWxlZ2F0ZTo6ZGlkUmVjZWl2ZVNlcgog ICAgIHJldHVybiBTX09LOwogfQogCitIUkVTVUxUIEZyYW1lTG9hZERlbGVnYXRlOjpkaWRDaGFu Z2VMb2NhdGlvbldpdGhpblBhZ2VGb3JGcmFtZShJV2ViVmlldyogLCBJV2ViRnJhbWUqIGZyYW1l KQoreworICAgIGlmICghZG9uZSAmJiBnVGVzdFJ1bm5lci0+ZHVtcEZyYW1lTG9hZENhbGxiYWNr cygpKQorICAgICAgICBwcmludGYoIiVzIC0gZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlRm9y RnJhbWVcbiIsIGRlc2NyaXB0aW9uU3VpdGFibGVGb3JUZXN0UmVzdWx0KGZyYW1lKS5jX3N0cigp KTsKKworICAgIHJldHVybiBTX09LOworfQorCiBIUkVTVUxUIEZyYW1lTG9hZERlbGVnYXRlOjpk aWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yKElXZWJWaWV3KiAvKndlYlZpZXcqLywgSVdl YkVycm9yKiBlcnJvciwgSVdlYkZyYW1lKiBmcmFtZSkKIHsKICAgICBpZiAoIWRvbmUgJiYgZ1Rl c3RSdW5uZXItPmR1bXBGcmFtZUxvYWRDYWxsYmFja3MoKSkKQEAgLTI4Miw2ICsyOTAsMTYgQEAg SFJFU1VMVCBGcmFtZUxvYWREZWxlZ2F0ZTo6d2lsbENsb3NlRnJhbQogICAgIHJldHVybiBFX05P VElNUEw7CiB9CiAKK0hSRVNVTFQgRnJhbWVMb2FkRGVsZWdhdGU6OndpbmRvd1NjcmlwdE9iamVj dEF2YWlsYWJsZShJV2ViVmlldyosIEpTQ29udGV4dFJlZiwgSlNPYmplY3RSZWYpCit7CisgICAg aWYgKCFkb25lICYmIGdUZXN0UnVubmVyLT5kdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKCkpCisgICAg ICAgIHByaW50ZigiPz8gLSB3aW5kb3dTY3JpcHRPYmplY3RBdmFpbGFibGVcbiIpOworCisgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CisKKyAgICByZXR1cm4gU19PSzsKK30KKwogSFJFU1VMVCBG cmFtZUxvYWREZWxlZ2F0ZTo6ZGlkQ2xlYXJXaW5kb3dPYmplY3QoSVdlYlZpZXcqLCBKU0NvbnRl eHRSZWYsIEpTT2JqZWN0UmVmLCBJV2ViRnJhbWUqKQogewogICAgIHJldHVybiBFX05PVElNUEw7 CkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRnJhbWVMb2FkRGVsZWdhdGUuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRnJhbWVMb2FkRGVsZWdhdGUuaAko cmV2aXNpb24gMTc0NzEyKQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0ZyYW1lTG9hZERl bGVnYXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTg5LDkgKzg5LDcgQEAgcHVibGljOgogICAgICAg ICAvKiBbaW5dICovIElXZWJFcnJvciAqZXJyb3IsCiAgICAgICAgIC8qIFtpbl0gKi8gSVdlYkZy YW1lICpmb3JGcmFtZSk7CiAKLSAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUg ZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlRm9yRnJhbWUoIAotICAgICAgICAvKiBbaW5dICov IElXZWJWaWV3ICp3ZWJWaWV3LAotICAgICAgICAvKiBbaW5dICovIElXZWJGcmFtZSAqZnJhbWUp IHsgcmV0dXJuIEVfTk9USU1QTDsgfSAKKyAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9EQ0FM TFRZUEUgZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlRm9yRnJhbWUoSVdlYlZpZXcqLCBJV2Vi RnJhbWUqKTsKIAogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSB3aWxsUGVy Zm9ybUNsaWVudFJlZGlyZWN0VG9VUkwoIAogICAgICAgICAvKiBbaW5dICovIElXZWJWaWV3ICp3 ZWJWaWV3LApAQCAtMTA4LDE2ICsxMDYsMTAgQEAgcHVibGljOgogICAgICAgICAvKiBbaW5dICov IElXZWJWaWV3ICp3ZWJWaWV3LAogICAgICAgICAvKiBbaW5dICovIElXZWJGcmFtZSAqZnJhbWUp OwogCi0gICAgdmlydHVhbCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIHdpbmRvd1NjcmlwdE9i amVjdEF2YWlsYWJsZSggCi0gICAgICAgIC8qIFtpbl0gKi8gSVdlYlZpZXcgKnNlbmRlciwKLSAg ICAgICAgLyogW2luXSAqLyBKU0NvbnRleHRSZWYgY29udGV4dCwKLSAgICAgICAgLyogW2luXSAq LyBKU09iamVjdFJlZiB3aW5kb3dPYmplY3QpIHsgcmV0dXJuIEVfTk9USU1QTDsgfQotCi0gICAg dmlydHVhbCAvKiBbbG9jYWxdICovIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgZGlkQ2xlYXJX aW5kb3dPYmplY3QoIAotICAgICAgICAvKiBbaW5dICovIElXZWJWaWV3KiB3ZWJWaWV3LAotICAg ICAgICAvKiBbaW5dICovIEpTQ29udGV4dFJlZiBjb250ZXh0LAotICAgICAgICAvKiBbaW5dICov IEpTT2JqZWN0UmVmIHdpbmRvd09iamVjdCwKLSAgICAgICAgLyogW2luXSAqLyBJV2ViRnJhbWUq IGZyYW1lKTsKKyAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgd2luZG93U2Ny aXB0T2JqZWN0QXZhaWxhYmxlKElXZWJWaWV3KiwKK0pTQ29udGV4dFJlZiwgSlNPYmplY3RSZWYg d2luZG93T2JqZWN0KTsKKworICAgIHZpcnR1YWwgLyogW2xvY2FsXSAqLyBIUkVTVUxUIFNURE1F VEhPRENBTExUWVBFIGRpZENsZWFyV2luZG93T2JqZWN0KElXZWJWaWV3KiwgSlNDb250ZXh0UmVm LCBKU09iamVjdFJlZiB3aW5kb3dPYmplY3QsIElXZWJGcmFtZSopOwogCiAgICAgLy8gSVdlYkZy YW1lTG9hZERlbGVnYXRlUHJpdmF0ZQogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxM VFlQRSBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSggCkluZGV4OiBUb29scy9EdW1wUmVu ZGVyVHJlZS93aW4vUmVzb3VyY2VMb2FkRGVsZWdhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L0R1bXBSZW5kZXJUcmVlL3dpbi9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5jcHAJKHJldmlzaW9uIDE3 NDcxMikKKysrIFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlIDxjb211dGlsLmg+ CiAjaW5jbHVkZSA8c3N0cmVhbT4KICNpbmNsdWRlIDx0Y2hhci5oPgorI2luY2x1ZGUgPHd0Zi9S ZXRhaW5QdHIuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBz dGQ7CkBAIC0yMTcsNiArMjE4LDE3IEBAIEhSRVNVTFQgUmVzb3VyY2VMb2FkRGVsZWdhdGU6OnJl bW92ZUlkZW4KICAgICByZXR1cm4gU19PSzsKIH0KIAorc3RhdGljIGJvb2wgaXNMb2NhbGhvc3Qo Q0ZTdHJpbmdSZWYgaG9zdCkKK3sKKyAgICByZXR1cm4ga0NGQ29tcGFyZUVxdWFsVG8gPT0gQ0ZT dHJpbmdDb21wYXJlKGhvc3QsIENGU1RSKCIxMjcuMC4wLjEiKSwgMCkKKyAgICAgICAgfHwga0NG Q29tcGFyZUVxdWFsVG8gPT0gQ0ZTdHJpbmdDb21wYXJlKGhvc3QsIENGU1RSKCJsb2NhbGhvc3Qi KSwgMCk7Cit9CisKK3N0YXRpYyBib29sIGhvc3RJc1VzZWRCeVNvbWVUZXN0c1RvR2VuZXJhdGVF cnJvcihDRlN0cmluZ1JlZiBob3N0KQoreworICAgIHJldHVybiBrQ0ZDb21wYXJlRXF1YWxUbyA9 PSBDRlN0cmluZ0NvbXBhcmUoaG9zdCwgQ0ZTVFIoIjI1NS4yNTUuMjU1LjI1NSIpLCAwKTsKK30K KwogSFJFU1VMVCBSZXNvdXJjZUxvYWREZWxlZ2F0ZTo6d2lsbFNlbmRSZXF1ZXN0KElXZWJWaWV3 KiB3ZWJWaWV3LCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIElXZWJVUkxSZXF1ZXN0KiByZXF1 ZXN0LAogICAgIElXZWJVUkxSZXNwb25zZSogcmVkaXJlY3RSZXNwb25zZSwgSVdlYkRhdGFTb3Vy Y2UqIGRhdGFTb3VyY2UsIElXZWJVUkxSZXF1ZXN0KiogbmV3UmVxdWVzdCkKIHsKQEAgLTIyOSwy MiArMjQxLDU2IEBAIEhSRVNVTFQgUmVzb3VyY2VMb2FkRGVsZWdhdGU6OndpbGxTZW5kUmUKIAog ICAgIGlmICghZG9uZSAmJiAhZ1Rlc3RSdW5uZXItPmRlZmVyTWFpblJlc291cmNlRGF0YUxvYWQo KSkgewogICAgICAgICBDT01QdHI8SVdlYkRhdGFTb3VyY2VQcml2YXRlPiBkYXRhU291cmNlUHJp dmF0ZShRdWVyeSwgZGF0YVNvdXJjZSk7Ci0gICAgICAgIGlmICghZGF0YVNvdXJjZVByaXZhdGUp CisgICAgICAgIGlmICghZGF0YVNvdXJjZVByaXZhdGUpIHsKKyAgICAgICAgICAgICpuZXdSZXF1 ZXN0ID0gbnVsbHB0cjsKICAgICAgICAgICAgIHJldHVybiBFX0ZBSUw7CisgICAgICAgIH0KICAg ICAgICAgZGF0YVNvdXJjZVByaXZhdGUtPnNldERlZmVyTWFpblJlc291cmNlRGF0YUxvYWQoRkFM U0UpOwogICAgIH0KIAogICAgIGlmICghZG9uZSAmJiBnVGVzdFJ1bm5lci0+d2lsbFNlbmRSZXF1 ZXN0UmV0dXJuc051bGwoKSkgewotICAgICAgICAqbmV3UmVxdWVzdCA9IDA7CisgICAgICAgICpu ZXdSZXF1ZXN0ID0gbnVsbHB0cjsKICAgICAgICAgcmV0dXJuIFNfT0s7CiAgICAgfQogCiAgICAg aWYgKCFkb25lICYmIGdUZXN0UnVubmVyLT53aWxsU2VuZFJlcXVlc3RSZXR1cm5zTnVsbE9uUmVk aXJlY3QoKSAmJiByZWRpcmVjdFJlc3BvbnNlKSB7CiAgICAgICAgIHByaW50ZigiUmV0dXJuaW5n IG51bGwgZm9yIHRoaXMgcmVkaXJlY3RcbiIpOwotICAgICAgICAqbmV3UmVxdWVzdCA9IDA7Cisg ICAgICAgICpuZXdSZXF1ZXN0ID0gbnVsbHB0cjsKICAgICAgICAgcmV0dXJuIFNfT0s7CiAgICAg fQogCisgICAgX2JzdHJfdCB1cmxCc3RyOworICAgIGlmIChGQUlMRUQocmVxdWVzdC0+VVJMKCZ1 cmxCc3RyLkdldEJTVFIoKSkpKSB7CisgICAgICAgIHByaW50ZigiUmVxdWVzdCBoYXMgbm8gVVJM XG4iKTsKKyAgICAgICAgKm5ld1JlcXVlc3QgPSBudWxscHRyOworICAgICAgICByZXR1cm4gRV9G QUlMOworICAgIH0KKworICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gc3RyID0gYWRvcHRDRihD RlN0cmluZ0NyZWF0ZVdpdGhDU3RyaW5nKDAsIHN0YXRpY19jYXN0PGNvbnN0IGNoYXIqPih1cmxC c3RyKSwga0NGU3RyaW5nRW5jb2RpbmdXaW5kb3dzTGF0aW4xKSk7CisgICAgUmV0YWluUHRyPENG VVJMUmVmPiB1cmwgPSBhZG9wdENGKENGVVJMQ3JlYXRlV2l0aFN0cmluZyhrQ0ZBbGxvY2F0b3JE ZWZhdWx0LCBzdHIuZ2V0KCksIG51bGxwdHIpKTsKKyAgICBpZiAodXJsKSB7CisgICAgICAgIFJl dGFpblB0cjxDRlN0cmluZ1JlZj4gaG9zdCA9IGFkb3B0Q0YoQ0ZVUkxDb3B5SG9zdE5hbWUodXJs LmdldCgpKSk7CisgICAgICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gc2NoZW1lID0gYWRvcHRD RihDRlVSTENvcHlTY2hlbWUodXJsLmdldCgpKSk7CisKKyAgICAgICAgaWYgKGhvc3QgJiYgKChr Q0ZDb21wYXJlRXF1YWxUbyA9PSBDRlN0cmluZ0NvbXBhcmUoc2NoZW1lLmdldCgpLCBDRlNUUigi aHR0cCIpLCBrQ0ZDb21wYXJlQ2FzZUluc2Vuc2l0aXZlKSkKKyAgICAgICAgICAgIHx8IChrQ0ZD b21wYXJlRXF1YWxUbyA9PSBDRlN0cmluZ0NvbXBhcmUoc2NoZW1lLmdldCgpLCBDRlNUUigiaHR0 cHMiKSwga0NGQ29tcGFyZUNhc2VJbnNlbnNpdGl2ZSkpKSkgeworICAgICAgICAgICAgUmV0YWlu UHRyPENGU3RyaW5nUmVmPiB0ZXN0UGF0aE9yVVJMID0gYWRvcHRDRihDRlN0cmluZ0NyZWF0ZVdp dGhDU3RyaW5nKGtDRkFsbG9jYXRvckRlZmF1bHQsIGdUZXN0UnVubmVyLT50ZXN0UGF0aE9yVVJM KCkuY19zdHIoKSwga0NGU3RyaW5nRW5jb2RpbmdXaW5kb3dzTGF0aW4xKSk7CisgICAgICAgICAg ICBSZXRhaW5QdHI8Q0ZNdXRhYmxlU3RyaW5nUmVmPiBsb3dlcmNhc2VUZXN0UGF0aE9yVVJMID0g YWRvcHRDRihDRlN0cmluZ0NyZWF0ZU11dGFibGVDb3B5KGtDRkFsbG9jYXRvckRlZmF1bHQsIENG U3RyaW5nR2V0TGVuZ3RoKHRlc3RQYXRoT3JVUkwuZ2V0KCkpLCB0ZXN0UGF0aE9yVVJMLmdldCgp KSk7CisgICAgICAgICAgICBSZXRhaW5QdHI8Q0ZMb2NhbGVSZWY+IGxvY2FsZSA9IENGTG9jYWxl Q29weUN1cnJlbnQoKTsKKyAgICAgICAgICAgIENGU3RyaW5nTG93ZXJjYXNlKGxvd2VyY2FzZVRl c3RQYXRoT3JVUkwuZ2V0KCksIGxvY2FsZS5nZXQoKSk7CisgICAgICAgICAgICBSZXRhaW5QdHI8 Q0ZTdHJpbmdSZWY+IHRlc3RIb3N0OworICAgICAgICAgICAgaWYgKENGU3RyaW5nSGFzUHJlZml4 KGxvd2VyY2FzZVRlc3RQYXRoT3JVUkwuZ2V0KCksIENGU1RSKCJodHRwOiIpKSB8fCBDRlN0cmlu Z0hhc1ByZWZpeChsb3dlcmNhc2VUZXN0UGF0aE9yVVJMLmdldCgpLCBDRlNUUigiaHR0cHM6Iikp KSB7CisgICAgICAgICAgICAgICAgUmV0YWluUHRyPENGVVJMUmVmPiB0ZXN0UGF0aFVSTCA9IGFk b3B0Q0YoQ0ZVUkxDcmVhdGVXaXRoU3RyaW5nKGtDRkFsbG9jYXRvckRlZmF1bHQsIGxvd2VyY2Fz ZVRlc3RQYXRoT3JVUkwuZ2V0KCksIG51bGxwdHIpKTsKKyAgICAgICAgICAgICAgICB0ZXN0SG9z dCA9IGFkb3B0Q0YoQ0ZVUkxDb3B5SG9zdE5hbWUodGVzdFBhdGhVUkwuZ2V0KCkpKTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIGlmICghaXNMb2NhbGhvc3QoaG9zdC5nZXQoKSkgJiYgIWhv c3RJc1VzZWRCeVNvbWVUZXN0c1RvR2VuZXJhdGVFcnJvcihob3N0LmdldCgpKSAmJiAoIXRlc3RI b3N0IHx8IGlzTG9jYWxob3N0KHRlc3RIb3N0LmdldCgpKSkpIHsKKyAgICAgICAgICAgICAgICBw cmludGYoIkJsb2NrZWQgYWNjZXNzIHRvIGV4dGVybmFsIFVSTCAlc1xuIiwgc3RhdGljX2Nhc3Q8 Y29uc3QgY2hhcio+KHVybEJzdHIpKTsKKyAgICAgICAgICAgICAgICAqbmV3UmVxdWVzdCA9IG51 bGxwdHI7CisgICAgICAgICAgICAgICAgcmV0dXJuIFNfT0s7CisgICAgICAgICAgICB9CisgICAg ICAgIH0KKyAgICB9CisKICAgICBJV2ViTXV0YWJsZVVSTFJlcXVlc3QqIHJlcXVlc3RDb3B5ID0g MDsKICAgICByZXF1ZXN0LT5tdXRhYmxlQ29weSgmcmVxdWVzdENvcHkpOwogICAgIGNvbnN0IHNl dDxzdHJpbmc+JiBjbGVhckhlYWRlcnMgPSBnVGVzdFJ1bm5lci0+d2lsbFNlbmRSZXF1ZXN0Q2xl YXJIZWFkZXJzKCk7CkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vVUlEZWxlZ2F0ZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1VJRGVsZWdhdGUuY3Bw CShyZXZpc2lvbiAxNzQ3MTIpCisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vVUlEZWxlZ2F0 ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2NywxNSArMzY3LDE5IEBAIEhSRVNVTFQgVUlEZWxl Z2F0ZTo6d2ViVmlld0ZyYW1lKElXZWJWaWUKIAogSFJFU1VMVCBVSURlbGVnYXRlOjpydW5KYXZh U2NyaXB0QWxlcnRQYW5lbFdpdGhNZXNzYWdlKElXZWJWaWV3KiAvKnNlbmRlciovLCBCU1RSIG1l c3NhZ2UpCiB7Ci0gICAgcHJpbnRmKCJBTEVSVDogJVNcbiIsIG1lc3NhZ2UgPyBtZXNzYWdlIDog TCIiKTsKLSAgICBmZmx1c2goc3Rkb3V0KTsKKyAgICBpZiAoIWRvbmUpIHsKKyAgICAgICAgcHJp bnRmKCJBTEVSVDogJVNcbiIsIG1lc3NhZ2UgPyBtZXNzYWdlIDogTCIiKTsKKyAgICAgICAgZmZs dXNoKHN0ZG91dCk7CisgICAgfQogCiAgICAgcmV0dXJuIFNfT0s7CiB9CiAKIEhSRVNVTFQgVUlE ZWxlZ2F0ZTo6cnVuSmF2YVNjcmlwdENvbmZpcm1QYW5lbFdpdGhNZXNzYWdlKElXZWJWaWV3KiAv KnNlbmRlciovLCBCU1RSIG1lc3NhZ2UsIEJPT0wqIHJlc3VsdCkKIHsKLSAgICBwcmludGYoIkNP TkZJUk06ICVTXG4iLCBtZXNzYWdlID8gbWVzc2FnZSA6IEwiIik7CisgICAgaWYgKCFkb25lKQor ICAgICAgICBwcmludGYoIkNPTkZJUk06ICVTXG4iLCBtZXNzYWdlID8gbWVzc2FnZSA6IEwiIik7 CisKICAgICAqcmVzdWx0ID0gVFJVRTsKIAogICAgIHJldHVybiBTX09LOwpAQCAtMzgzLDcgKzM4 Nyw5IEBAIEhSRVNVTFQgVUlEZWxlZ2F0ZTo6cnVuSmF2YVNjcmlwdENvbmZpcm0KIAogSFJFU1VM VCBVSURlbGVnYXRlOjpydW5KYXZhU2NyaXB0VGV4dElucHV0UGFuZWxXaXRoUHJvbXB0KElXZWJW aWV3KiAvKnNlbmRlciovLCBCU1RSIG1lc3NhZ2UsIEJTVFIgZGVmYXVsdFRleHQsIEJTVFIqIHJl c3VsdCkKIHsKLSAgICBwcmludGYoIlBST01QVDogJVMsIGRlZmF1bHQgdGV4dDogJVNcbiIsIG1l c3NhZ2UgPyBtZXNzYWdlIDogTCIiLCBkZWZhdWx0VGV4dCA/IGRlZmF1bHRUZXh0IDogTCIiKTsK KyAgICBpZiAoIWRvbmUpCisgICAgICAgIHByaW50ZigiUFJPTVBUOiAlUywgZGVmYXVsdCB0ZXh0 OiAlU1xuIiwgbWVzc2FnZSA/IG1lc3NhZ2UgOiBMIiIsIGRlZmF1bHRUZXh0ID8gZGVmYXVsdFRl eHQgOiBMIiIpOworCiAgICAgKnJlc3VsdCA9IFN5c0FsbG9jU3RyaW5nKGRlZmF1bHRUZXh0KTsK IAogICAgIHJldHVybiBTX09LOwpAQCAtMzkzLDEzICszOTksMjAgQEAgSFJFU1VMVCBVSURlbGVn YXRlOjpydW5CZWZvcmVVbmxvYWRDb25maQogewogICAgIGlmICghcmVzdWx0KQogICAgICAgICBy ZXR1cm4gRV9QT0lOVEVSOwotICAgIHByaW50ZigiQ09ORklSTSBOQVZJR0FUSU9OOiAlU1xuIiwg bWVzc2FnZSA/IG1lc3NhZ2UgOiBMIiIpOworCisgICAgaWYgKCFkb25lKQorICAgICAgICBwcmlu dGYoIkNPTkZJUk0gTkFWSUdBVElPTjogJVNcbiIsIG1lc3NhZ2UgPyBtZXNzYWdlIDogTCIiKTsK KwogICAgICpyZXN1bHQgPSAhZ1Rlc3RSdW5uZXItPnNob3VsZFN0YXlPblBhZ2VBZnRlckhhbmRs aW5nQmVmb3JlVW5sb2FkKCk7CisKICAgICByZXR1cm4gU19PSzsKIH0KIAogSFJFU1VMVCBVSURl bGVnYXRlOjp3ZWJWaWV3QWRkTWVzc2FnZVRvQ29uc29sZShJV2ViVmlldyogLypzZW5kZXIqLywg QlNUUiBtZXNzYWdlLCBpbnQgbGluZU51bWJlciwgQlNUUiB1cmwsIEJPT0wgaXNFcnJvcikKIHsK KyAgICBpZiAoZG9uZSkKKyAgICAgICAgcmV0dXJuIFNfT0s7CisKICAgICB3c3RyaW5nIG5ld01l c3NhZ2U7CiAgICAgaWYgKG1lc3NhZ2UpIHsKICAgICAgICAgbmV3TWVzc2FnZSA9IG1lc3NhZ2U7 CkluZGV4OiBUb29scy9XaW5MYXVuY2hlci9QYWdlTG9hZFRlc3RDbGllbnQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1dpbkxhdW5jaGVyL1BhZ2VMb2FkVGVzdENsaWVudC5jcHAJKHJldmlzaW9u IDE3NDcxMikKKysrIFRvb2xzL1dpbkxhdW5jaGVyL1BhZ2VMb2FkVGVzdENsaWVudC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTEyMSw3ICsxMjEsNyBAQCB2b2lkIFBhZ2VMb2FkVGVzdENsaWVudDo6 ZGlkRW5kUmVzb3VyY2VMCiAKIHZvaWQgUGFnZUxvYWRUZXN0Q2xpZW50OjpwYWdlTG9hZEVuZGVk QXRUaW1lKENGQWJzb2x1dGVUaW1lIGVuZFRpbWUpCiB7Ci0gICAgQVNTRVJUKG1fZW5kVGltZXMu c2l6ZSgpID09IG1fY3VycmVudFJlcGV0aXRpb24pOworICAgIEFTU0VSVCghbV9wYWdlTG9hZFRl c3RpbmcgfHwgbV9lbmRUaW1lcy5zaXplKCkgPT0gbV9jdXJyZW50UmVwZXRpdGlvbik7CiAgICAg bV9lbmRUaW1lcy5hcHBlbmQoZW5kVGltZSk7CiAKICAgICBpZiAobV9jdXJyZW50UmVwZXRpdGlv bikgewo=