207598 2020-02-11 16:14:37 -0800 Allow use of proxies in MiniBrowser 2020-02-19 18:29:30 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 nham nham achristensen beidson commit-queue koivisto nham sam webkit-bug-importer oldest_to_newest 1617741 0 nham 2020-02-11 16:14:37 -0800 For testing purposes, we allow Safari to use a custom HTTP/HTTPS proxy passed through command line arguments. MiniBrowser should also be able to do this. 1617743 1 webkit-bug-importer 2020-02-11 16:15:15 -0800 <rdar://problem/59368527> 1617749 2 390458 nham 2020-02-11 16:18:19 -0800 Created attachment 390458 Patch 1617840 3 390486 nham 2020-02-11 20:01:48 -0800 Created attachment 390486 Patch 1618628 4 390486 commit-queue 2020-02-13 11:47:35 -0800 Comment on attachment 390486 Patch Clearing flags on attachment: 390486 Committed r256530: <https://trac.webkit.org/changeset/256530> 1618629 5 commit-queue 2020-02-13 11:47:36 -0800 All reviewed patches have been landed. Closing bug. 1618749 6 390486 achristensen 2020-02-13 15:32:10 -0800 Comment on attachment 390486 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390486&action=review > Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:386 > parameters.defaultDataStoreParameters.networkSessionParameters.httpProxy = URL(URL(), [defaults stringForKey:(NSString *)WebKit2HTTPProxyDefaultsKey]); This patch is good, but we should be pushing Safari and MiniBrowser towards using SPI when they want proxies rather than checking in defaults ourselves. 1620998 7 sam 2020-02-19 18:29:30 -0800 Why are we special casing these apps? Seems like what a preference they enable or entitlements are for if we want to limit this for some reason. 390458 2020-02-11 16:18:19 -0800 2020-02-11 20:01:47 -0800 Patch bug-207598-20200211161819.patch text/plain 6639 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2MjEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzFhYjI2ODFmNDc1Zjlm ZGU0ZjA4YzE0MGY3NTQ0NDk5NjdmY2JkMi4uYmY4YThhYmVhYmUwYWJhZjJjMTU3MjZjMDk4NDFk OWY0ZGQ1ZjA2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTAyLTExICBCZW5q YW1pbiBOaGFtICA8bmhhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQWxsb3cgdXNlIG9mIHByb3hp ZXMgaW4gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwNzU5OAorCisgICAgICAgIEZvciB0ZXN0aW5nIHB1cnBvc2VzLCB3ZSBhbGxv dyBTYWZhcmkgdG8gdXNlIGEgY3VzdG9tIEhUVFAvSFRUUFMgcHJveHkgcGFzc2VkIHRocm91Z2gK KyAgICAgICAgY29tbWFuZCBsaW5lIGFyZ3VtZW50cy4gVGhpcyBnaXZlcyBNaW5pQnJvd3NlciB0 aGUgc2FtZSBhYmlsaXR5LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogcGxhdGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmg6CisgICAgICAg ICogcGxhdGZvcm0vY29jb2EvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzQ29jb2EubW06CisgICAg ICAgIChXZWJDb3JlOjpNYWNBcHBsaWNhdGlvbjo6aXNNaW5pQnJvd3Nlcik6CisgICAgICAgIChX ZWJDb3JlOjpJT1NBcHBsaWNhdGlvbjo6aXNNaW5pQnJvd3Nlcik6CisKIDIwMjAtMDItMDcgIFJ5 b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRG9uJ3QgdXBkYXRlIHNl bGVjdGlvbiB3aGVuIGNhbGxpbmcgc2V0U2VsZWN0aW9uUmFuZ2Ugb24gYSBkaXNjb25uZWN0ZWQg aW5wdXQgZWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBhMzI2NjIyZTFkNmZmMjJhOWE4Mjc5OGJjMWQzZDU3 MmUzYWJjYmE0Li40MDRjYThjZDc0YTIwZGNkYWVjNDZmYjMzNzNlMzAxZGMyYWFkYjNlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTAyLTExICBCZW5qYW1pbiBOaGFtICA8bmhhbUBh cHBsZS5jb20+CisKKyAgICAgICAgQWxsb3cgdXNlIG9mIHByb3hpZXMgaW4gTWluaUJyb3dzZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNzU5OAor CisgICAgICAgIEZvciB0ZXN0aW5nIHB1cnBvc2VzLCB3ZSBhbGxvdyBTYWZhcmkgdG8gdXNlIGEg Y3VzdG9tIEhUVFAvSFRUUFMgcHJveHkgcGFzc2VkIHRocm91Z2gKKyAgICAgICAgY29tbWFuZCBs aW5lIGFyZ3VtZW50cy4gVGhpcyBnaXZlcyBNaW5pQnJvd3NlciB0aGUgc2FtZSBhYmlsaXR5Lgor CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW06CisgICAg ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJv Y2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRh U3RvcmVDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6cGFyYW1l dGVycyk6CisKIDIwMjAtMDItMTAgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgog CiAgICAgICAgIERpc2FsbG93IHNldHRpbmcgYmFzZSBVUkwgdG8gYSBkYXRhIG9yIEphdmFTY3Jp cHQgVVJMCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW50aW1lQXBwbGlj YXRpb25DaGVja3MuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bnRpbWVBcHBsaWNhdGlv bkNoZWNrcy5oCmluZGV4IDUyNTUzNGFiMzk2ODZmZDNhOWJiZjY3MzI5OWZmOWIzYmFhZmYxZTgu LmZjZDMyMGZhZWM2M2I0ZmEyNDkwYzgyODJhNGFhN2RlMGQwYzE2MmEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5oCkBAIC02Myw2 ICs2Myw3IEBAIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNJVHVuZXMoKTsKIFdFQkNPUkVfRVhQT1JU IGJvb2wgaXNNaWNyb3NvZnRNZXNzZW5nZXIoKTsKIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNNaWNy b3NvZnRNeURheSgpOwogV0VCQ09SRV9FWFBPUlQgYm9vbCBpc01pY3Jvc29mdE91dGxvb2soKTsK K1dFQkNPUkVfRVhQT1JUIGJvb2wgaXNNaW5pQnJvd3NlcigpOwogYm9vbCBpc1F1aWNrZW5Fc3Nl bnRpYWxzKCk7CiBXRUJDT1JFX0VYUE9SVCBib29sIGlzU2FmYXJpKCk7CiBib29sIGlzU29saWRT dGF0ZU5ldHdvcmtzRG93bmxvYWRlcigpOwpAQCAtODYsNiArODcsNyBAQCBXRUJDT1JFX0VYUE9S VCBib29sIGlzU2FmYXJpVmlld1NlcnZpY2UoKTsKIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNJTURi KCk7CiBXRUJDT1JFX0VYUE9SVCBib29sIGlzV2ViQm9va21hcmtzRCgpOwogV0VCQ09SRV9FWFBP UlQgYm9vbCBpc0R1bXBSZW5kZXJUcmVlKCk7CitXRUJDT1JFX0VYUE9SVCBib29sIGlzTWluaUJy b3dzZXIoKTsKIGJvb2wgaXNNb2JpbGVTdG9yZSgpOwogYm9vbCBpc1NwcmluZ0JvYXJkKCk7CiBX RUJDT1JFX0VYUE9SVCBib29sIGlzV2ViUHJvY2VzcygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY29jb2EvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzQ29jb2EubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9SdW50aW1lQXBwbGljYXRpb25DaGVja3NDb2Nv YS5tbQppbmRleCAzNGI2M2QxMTEyOGYxZGFiYWE3ZmFjYTRjMzBmZTY4ODIxMmZkMWIxLi40YTA0 N2YwY2YxNTVmOTcxMjgzNmRkY2E5YmQ4ZWM2M2M3NzcxMjFkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9SdW50aW1lQXBwbGljYXRpb25DaGVja3NDb2NvYS5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9SdW50aW1lQXBwbGljYXRpb25DaGVj a3NDb2NvYS5tbQpAQCAtMTY2LDYgKzE2NiwxMiBAQCBib29sIE1hY0FwcGxpY2F0aW9uOjppc01p Y3Jvc29mdE91dGxvb2soKQogICAgIHJldHVybiBpc01pY3Jvc29mdE91dGxvb2s7CiB9CiAKK2Jv b2wgTWFjQXBwbGljYXRpb246OmlzTWluaUJyb3dzZXIoKQoreworICAgIHN0YXRpYyBib29sIGlz TWluaUJyb3dzZXIgPSBhcHBsaWNhdGlvbkJ1bmRsZUlzRXF1YWxUbygib3JnLndlYmtpdC5NaW5p QnJvd3NlciJfcyk7CisgICAgcmV0dXJuIGlzTWluaUJyb3dzZXI7Cit9CisKIGJvb2wgTWFjQXBw bGljYXRpb246OmlzUXVpY2tlbkVzc2VudGlhbHMoKQogewogICAgIHN0YXRpYyBib29sIGlzUXVp Y2tlbkVzc2VudGlhbHMgPSBhcHBsaWNhdGlvbkJ1bmRsZUlzRXF1YWxUbygiY29tLmludHVpdC5R dWlja2VuRXNzZW50aWFscyJfcyk7CkBAIC0zNDUsNiArMzUxLDEyIEBAIGJvb2wgSU9TQXBwbGlj YXRpb246OmlzRGF0YUFjdGl2YXRpb24oKQogICAgIHJldHVybiBpc0RhdGFBY3RpdmF0aW9uOwog fQogCitib29sIElPU0FwcGxpY2F0aW9uOjppc01pbmlCcm93c2VyKCkKK3sKKyAgICBzdGF0aWMg Ym9vbCBpc01pbmlCcm93c2VyID0gYXBwbGljYXRpb25CdW5kbGVJc0VxdWFsVG8oIm9yZy53ZWJr aXQuTWluaUJyb3dzZXIiX3MpOworICAgIHJldHVybiBpc01pbmlCcm93c2VyOworfQorCiAjZW5k aWYKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29jb2EubW0KaW5kZXggNGI0OTIxMmMxMzg2ZDM0 NjU3MTk2NmE0YmFhOTYzMWEyZDkzM2YzYi4uYjk3ZTUyY2ViODg5N2UwYzAxZjExNjYxMGFjYTgy YTEzNzA0YmU1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi UHJvY2Vzc1Bvb2xDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9X ZWJQcm9jZXNzUG9vbENvY29hLm1tCkBAIC0zNzQsMTIgKzM3NCwxNSBAQCB2b2lkIFdlYlByb2Nl c3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJvY2VzcyhOZXR3b3JrUHJvY2Vzc0Ny ZWF0aW9uUGFyYQogCiAgICAgewogICAgICAgICBib29sIGlzU2FmYXJpID0gZmFsc2U7CisgICAg ICAgIGJvb2wgaXNNaW5pQnJvd3NlciA9IGZhbHNlOwogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkp CiAgICAgICAgIGlzU2FmYXJpID0gV2ViQ29yZTo6SU9TQXBwbGljYXRpb246OmlzTW9iaWxlU2Fm YXJpKCk7CisgICAgICAgIGlzTWluaUJyb3dzZXIgPSBXZWJDb3JlOjpJT1NBcHBsaWNhdGlvbjo6 aXNNaW5pQnJvd3NlcigpOwogI2VsaWYgUExBVEZPUk0oTUFDKQogICAgICAgICBpc1NhZmFyaSA9 IFdlYkNvcmU6Ok1hY0FwcGxpY2F0aW9uOjppc1NhZmFyaSgpOworICAgICAgICBpc01pbmlCcm93 c2VyID0gV2ViQ29yZTo6TWFjQXBwbGljYXRpb246OmlzTWluaUJyb3dzZXIoKTsKICNlbmRpZgot ICAgICAgICBpZiAoaXNTYWZhcmkpIHsKKyAgICAgICAgaWYgKGlzU2FmYXJpIHx8IGlzTWluaUJy b3dzZXIpIHsKICAgICAgICAgICAgIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRl cnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmh0dHBQcm94eSA9IFVSTChVUkwoKSwgW2RlZmF1 bHRzIHN0cmluZ0ZvcktleTooTlNTdHJpbmcgKilXZWJLaXQySFRUUFByb3h5RGVmYXVsdHNLZXld KTsKICAgICAgICAgICAgIHBhcmFtZXRlcnMuZGVmYXVsdERhdGFTdG9yZVBhcmFtZXRlcnMubmV0 d29ya1Nlc3Npb25QYXJhbWV0ZXJzLmh0dHBzUHJveHkgPSBVUkwoVVJMKCksIFtkZWZhdWx0cyBz dHJpbmdGb3JLZXk6KE5TU3RyaW5nICopV2ViS2l0MkhUVFBTUHJveHlEZWZhdWx0c0tleV0pOwog ICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0 YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KaW5kZXggYjFmMTBh MzIwNWEzODliMWZkNWQ0NWIxNTc4ZWNhNjdkNWY5YjgyYy4uZTE2NTFjODMyMWJhNTNjYjg3Mjlm NWNmMzVlYzc5Mzg3NTFjOTgwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5t bQpAQCAtMTIwLDE1ICsxMjAsMTggQEAgV2Vic2l0ZURhdGFTdG9yZVBhcmFtZXRlcnMgV2Vic2l0 ZURhdGFTdG9yZTo6cGFyYW1ldGVycygpCiAgICAgVVJMIGh0dHBzUHJveHkgPSBtX2NvbmZpZ3Vy YXRpb24tPmh0dHBzUHJveHkoKTsKICAgICAKICAgICBib29sIGlzU2FmYXJpID0gZmFsc2U7Cisg ICAgYm9vbCBpc01pbmlCcm93c2VyID0gZmFsc2U7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkK ICAgICBpc1NhZmFyaSA9IFdlYkNvcmU6OklPU0FwcGxpY2F0aW9uOjppc01vYmlsZVNhZmFyaSgp OworICAgIGlzTWluaUJyb3dzZXIgPSBXZWJDb3JlOjpJT1NBcHBsaWNhdGlvbjo6aXNNaW5pQnJv d3NlcigpOwogI2VsaWYgUExBVEZPUk0oTUFDKQogICAgIGlzU2FmYXJpID0gV2ViQ29yZTo6TWFj QXBwbGljYXRpb246OmlzU2FmYXJpKCk7CisgICAgaXNNaW5pQnJvd3NlciA9IFdlYkNvcmU6Ok1h Y0FwcGxpY2F0aW9uOjppc01pbmlCcm93c2VyKCk7CiAjZW5kaWYKICAgICAvLyBGSVhNRTogUmVt b3ZlIHRoZXNlIG9uY2UgU2FmYXJpIGFkb3B0cyBfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJh dGlvbi5odHRwUHJveHkgYW5kIC5odHRwc1Byb3h5LgotICAgIGlmICghaHR0cFByb3h5LmlzVmFs aWQoKSAmJiBpc1NhZmFyaSkKKyAgICBpZiAoIWh0dHBQcm94eS5pc1ZhbGlkKCkgJiYgKGlzU2Fm YXJpIHx8IGlzTWluaUJyb3dzZXIpKQogICAgICAgICBodHRwUHJveHkgPSBVUkwoVVJMKCksIFtk ZWZhdWx0cyBzdHJpbmdGb3JLZXk6KE5TU3RyaW5nICopV2ViS2l0MkhUVFBQcm94eURlZmF1bHRz S2V5XSk7Ci0gICAgaWYgKCFodHRwc1Byb3h5LmlzVmFsaWQoKSAmJiBpc1NhZmFyaSkKKyAgICBp ZiAoIWh0dHBzUHJveHkuaXNWYWxpZCgpICYmIChpc1NhZmFyaSB8fCBpc01pbmlCcm93c2VyKSkK ICAgICAgICAgaHR0cHNQcm94eSA9IFVSTChVUkwoKSwgW2RlZmF1bHRzIHN0cmluZ0ZvcktleToo TlNTdHJpbmcgKilXZWJLaXQySFRUUFNQcm94eURlZmF1bHRzS2V5XSk7CiAKICAgICBhdXRvIHJl c291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkgPSBtX2NvbmZpZ3VyYXRpb24tPnJlc291cmNl TG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkoKTsK 390486 2020-02-11 20:01:48 -0800 2020-02-13 11:47:35 -0800 Patch bug-207598-20200211200148.patch text/plain 7024 nham U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2MjEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzFhYjI2ODFmNDc1Zjlm ZGU0ZjA4YzE0MGY3NTQ0NDk5NjdmY2JkMi4uYTllYmI4OTI2YzNlMmE2MjdjZGEwN2FkMzlhNTYx NmMyNmRhM2VjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTAyLTExICBCZW5q YW1pbiBOaGFtICA8bmhhbUBhcHBsZS5jb20+CisKKyAgICAgICAgQWxsb3cgdXNlIG9mIHByb3hp ZXMgaW4gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIwNzU5OAorCisgICAgICAgIEZvciB0ZXN0aW5nIHB1cnBvc2VzLCB3ZSBhbGxv dyBTYWZhcmkgdG8gdXNlIGEgY3VzdG9tIEhUVFAvSFRUUFMgcHJveHkgcGFzc2VkIHRocm91Z2gK KyAgICAgICAgY29tbWFuZCBsaW5lIGFyZ3VtZW50cy4gVGhpcyBnaXZlcyBNaW5pQnJvd3NlciB0 aGUgc2FtZSBhYmlsaXR5LgorCisgICAgICAgICQgcnVuLW1pbmlicm93c2VyIC0tcmVsZWFzZSAt V2ViS2l0MkhUVFBQcm94eSAiaHR0cDovLzEyNy4wLjAuMTo4MDgwIiBcCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAtV2ViS2l0MkhUVFBTUHJveHkgImh0dHA6Ly8xMjcuMC4w LjE6ODA4MCIKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAg ICAqIHBsYXRmb3JtL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5oOgorICAgICAgICAqIHBsYXRm b3JtL2NvY29hL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrc0NvY29hLm1tOgorICAgICAgICAoV2Vi Q29yZTo6TWFjQXBwbGljYXRpb246OmlzTWluaUJyb3dzZXIpOgorICAgICAgICAoV2ViQ29yZTo6 SU9TQXBwbGljYXRpb246OmlzTWluaUJyb3dzZXIpOgorCiAyMDIwLTAyLTA3ICBSeW9zdWtlIE5p d2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIERvbid0IHVwZGF0ZSBzZWxlY3Rpb24g d2hlbiBjYWxsaW5nIHNldFNlbGVjdGlvblJhbmdlIG9uIGEgZGlzY29ubmVjdGVkIGlucHV0IGVs ZW1lbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKaW5kZXggYTMyNjYyMmUxZDZmZjIyYTlhODI3OThiYzFkM2Q1NzJlM2FiY2Jh NC4uYTc5ZTVjMzM4OGI5ZDVkM2E3ZGZhOTA5YTExNGUzODNlNzY0YjkzMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMSBAQAorMjAyMC0wMi0xMSAgQmVuamFtaW4gTmhhbSAgPG5oYW1AYXBwbGUuY29t PgorCisgICAgICAgIEFsbG93IHVzZSBvZiBwcm94aWVzIGluIE1pbmlCcm93c2VyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDc1OTgKKworICAgICAg ICBGb3IgdGVzdGluZyBwdXJwb3Nlcywgd2UgYWxsb3cgU2FmYXJpIHRvIHVzZSBhIGN1c3RvbSBI VFRQL0hUVFBTIHByb3h5IHBhc3NlZCB0aHJvdWdoCisgICAgICAgIGNvbW1hbmQgbGluZSBhcmd1 bWVudHMuIFRoaXMgZ2l2ZXMgTWluaUJyb3dzZXIgdGhlIHNhbWUgYWJpbGl0eS4gRXhhbXBsZSBp bnZvY2F0aW9uOgorCisgICAgICAgICQgcnVuLW1pbmlicm93c2VyIC0tcmVsZWFzZSAtV2ViS2l0 MkhUVFBQcm94eSAiaHR0cDovLzEyNy4wLjAuMTo4MDgwIiBcCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAtV2ViS2l0MkhUVFBTUHJveHkgImh0dHA6Ly8xMjcuMC4wLjE6ODA4 MCIKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpX ZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3MpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW06 CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnBhcmFtZXRlcnMpOgorCiAyMDIw LTAyLTEwICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBEaXNh bGxvdyBzZXR0aW5nIGJhc2UgVVJMIHRvIGEgZGF0YSBvciBKYXZhU2NyaXB0IFVSTApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3MuaAppbmRl eCA1MjU1MzRhYjM5Njg2ZmQzYTliYmY2NzMyOTlmZjliM2JhYWZmMWU4Li5mY2QzMjBmYWVjNjNi NGZhMjQ5MGM4MjgyYTRhYTdkZTBkMGMxNjJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3MuaApAQCAtNjMsNiArNjMsNyBAQCBXRUJD T1JFX0VYUE9SVCBib29sIGlzSVR1bmVzKCk7CiBXRUJDT1JFX0VYUE9SVCBib29sIGlzTWljcm9z b2Z0TWVzc2VuZ2VyKCk7CiBXRUJDT1JFX0VYUE9SVCBib29sIGlzTWljcm9zb2Z0TXlEYXkoKTsK IFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNNaWNyb3NvZnRPdXRsb29rKCk7CitXRUJDT1JFX0VYUE9S VCBib29sIGlzTWluaUJyb3dzZXIoKTsKIGJvb2wgaXNRdWlja2VuRXNzZW50aWFscygpOwogV0VC Q09SRV9FWFBPUlQgYm9vbCBpc1NhZmFyaSgpOwogYm9vbCBpc1NvbGlkU3RhdGVOZXR3b3Jrc0Rv d25sb2FkZXIoKTsKQEAgLTg2LDYgKzg3LDcgQEAgV0VCQ09SRV9FWFBPUlQgYm9vbCBpc1NhZmFy aVZpZXdTZXJ2aWNlKCk7CiBXRUJDT1JFX0VYUE9SVCBib29sIGlzSU1EYigpOwogV0VCQ09SRV9F WFBPUlQgYm9vbCBpc1dlYkJvb2ttYXJrc0QoKTsKIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNEdW1w UmVuZGVyVHJlZSgpOworV0VCQ09SRV9FWFBPUlQgYm9vbCBpc01pbmlCcm93c2VyKCk7CiBib29s IGlzTW9iaWxlU3RvcmUoKTsKIGJvb2wgaXNTcHJpbmdCb2FyZCgpOwogV0VCQ09SRV9FWFBPUlQg Ym9vbCBpc1dlYlByb2Nlc3MoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2NvY29hL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrc0NvY29hLm1tIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY29jb2EvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzQ29jb2EubW0KaW5kZXggMzRi NjNkMTExMjhmMWRhYmFhN2ZhY2E0YzMwZmU2ODgyMTJmZDFiMS4uNGEwNDdmMGNmMTU1Zjk3MTI4 MzZkZGNhOWJkOGVjNjNjNzc3MTIxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY29jb2EvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzQ29jb2EubW0KKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY29jb2EvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzQ29jb2EubW0KQEAg LTE2Niw2ICsxNjYsMTIgQEAgYm9vbCBNYWNBcHBsaWNhdGlvbjo6aXNNaWNyb3NvZnRPdXRsb29r KCkKICAgICByZXR1cm4gaXNNaWNyb3NvZnRPdXRsb29rOwogfQogCitib29sIE1hY0FwcGxpY2F0 aW9uOjppc01pbmlCcm93c2VyKCkKK3sKKyAgICBzdGF0aWMgYm9vbCBpc01pbmlCcm93c2VyID0g YXBwbGljYXRpb25CdW5kbGVJc0VxdWFsVG8oIm9yZy53ZWJraXQuTWluaUJyb3dzZXIiX3MpOwor ICAgIHJldHVybiBpc01pbmlCcm93c2VyOworfQorCiBib29sIE1hY0FwcGxpY2F0aW9uOjppc1F1 aWNrZW5Fc3NlbnRpYWxzKCkKIHsKICAgICBzdGF0aWMgYm9vbCBpc1F1aWNrZW5Fc3NlbnRpYWxz ID0gYXBwbGljYXRpb25CdW5kbGVJc0VxdWFsVG8oImNvbS5pbnR1aXQuUXVpY2tlbkVzc2VudGlh bHMiX3MpOwpAQCAtMzQ1LDYgKzM1MSwxMiBAQCBib29sIElPU0FwcGxpY2F0aW9uOjppc0RhdGFB Y3RpdmF0aW9uKCkKICAgICByZXR1cm4gaXNEYXRhQWN0aXZhdGlvbjsKIH0KIAorYm9vbCBJT1NB cHBsaWNhdGlvbjo6aXNNaW5pQnJvd3NlcigpCit7CisgICAgc3RhdGljIGJvb2wgaXNNaW5pQnJv d3NlciA9IGFwcGxpY2F0aW9uQnVuZGxlSXNFcXVhbFRvKCJvcmcud2Via2l0Lk1pbmlCcm93c2Vy Il9zKTsKKyAgICByZXR1cm4gaXNNaW5pQnJvd3NlcjsKK30KKwogI2VuZGlmCiAKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29h L1dlYlByb2Nlc3NQb29sQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9X ZWJQcm9jZXNzUG9vbENvY29hLm1tCmluZGV4IDRiNDkyMTJjMTM4NmQzNDY1NzE5NjZhNGJhYTk2 MzFhMmQ5MzNmM2IuLmI5N2U1MmNlYjg4OTdlMGMwMWYxMTY2MTBhY2E4MmExMzcwNGJlNTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29j b2EubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xD b2NvYS5tbQpAQCAtMzc0LDEyICszNzQsMTUgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6cGxhdGZv cm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3MoTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmEKIAog ICAgIHsKICAgICAgICAgYm9vbCBpc1NhZmFyaSA9IGZhbHNlOworICAgICAgICBib29sIGlzTWlu aUJyb3dzZXIgPSBmYWxzZTsKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgICAgICBpc1Nh ZmFyaSA9IFdlYkNvcmU6OklPU0FwcGxpY2F0aW9uOjppc01vYmlsZVNhZmFyaSgpOworICAgICAg ICBpc01pbmlCcm93c2VyID0gV2ViQ29yZTo6SU9TQXBwbGljYXRpb246OmlzTWluaUJyb3dzZXIo KTsKICNlbGlmIFBMQVRGT1JNKE1BQykKICAgICAgICAgaXNTYWZhcmkgPSBXZWJDb3JlOjpNYWNB cHBsaWNhdGlvbjo6aXNTYWZhcmkoKTsKKyAgICAgICAgaXNNaW5pQnJvd3NlciA9IFdlYkNvcmU6 Ok1hY0FwcGxpY2F0aW9uOjppc01pbmlCcm93c2VyKCk7CiAjZW5kaWYKLSAgICAgICAgaWYgKGlz U2FmYXJpKSB7CisgICAgICAgIGlmIChpc1NhZmFyaSB8fCBpc01pbmlCcm93c2VyKSB7CiAgICAg ICAgICAgICBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNz aW9uUGFyYW1ldGVycy5odHRwUHJveHkgPSBVUkwoVVJMKCksIFtkZWZhdWx0cyBzdHJpbmdGb3JL ZXk6KE5TU3RyaW5nICopV2ViS2l0MkhUVFBQcm94eURlZmF1bHRzS2V5XSk7CiAgICAgICAgICAg ICBwYXJhbWV0ZXJzLmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFy YW1ldGVycy5odHRwc1Byb3h5ID0gVVJMKFVSTCgpLCBbZGVmYXVsdHMgc3RyaW5nRm9yS2V5OihO U1N0cmluZyAqKVdlYktpdDJIVFRQU1Byb3h5RGVmYXVsdHNLZXldKTsKICAgICAgICAgfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0 ZURhdGFTdG9yZUNvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEv Q29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29hLm1tCmluZGV4IGIxZjEwYTMyMDVhMzg5YjFmZDVk NDViMTU3OGVjYTY3ZDVmOWI4MmMuLmUxNjUxYzgzMjFiYTUzY2I4NzI5ZjVjZjM1ZWM3OTM4NzUx Yzk4MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0Nv Y29hL1dlYnNpdGVEYXRhU3RvcmVDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KQEAgLTEyMCwxNSAr MTIwLDE4IEBAIFdlYnNpdGVEYXRhU3RvcmVQYXJhbWV0ZXJzIFdlYnNpdGVEYXRhU3RvcmU6OnBh cmFtZXRlcnMoKQogICAgIFVSTCBodHRwc1Byb3h5ID0gbV9jb25maWd1cmF0aW9uLT5odHRwc1By b3h5KCk7CiAgICAgCiAgICAgYm9vbCBpc1NhZmFyaSA9IGZhbHNlOworICAgIGJvb2wgaXNNaW5p QnJvd3NlciA9IGZhbHNlOwogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgaXNTYWZhcmkg PSBXZWJDb3JlOjpJT1NBcHBsaWNhdGlvbjo6aXNNb2JpbGVTYWZhcmkoKTsKKyAgICBpc01pbmlC cm93c2VyID0gV2ViQ29yZTo6SU9TQXBwbGljYXRpb246OmlzTWluaUJyb3dzZXIoKTsKICNlbGlm IFBMQVRGT1JNKE1BQykKICAgICBpc1NhZmFyaSA9IFdlYkNvcmU6Ok1hY0FwcGxpY2F0aW9uOjpp c1NhZmFyaSgpOworICAgIGlzTWluaUJyb3dzZXIgPSBXZWJDb3JlOjpNYWNBcHBsaWNhdGlvbjo6 aXNNaW5pQnJvd3NlcigpOwogI2VuZGlmCiAgICAgLy8gRklYTUU6IFJlbW92ZSB0aGVzZSBvbmNl IFNhZmFyaSBhZG9wdHMgX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaHR0cFByb3h5 IGFuZCAuaHR0cHNQcm94eS4KLSAgICBpZiAoIWh0dHBQcm94eS5pc1ZhbGlkKCkgJiYgaXNTYWZh cmkpCisgICAgaWYgKCFodHRwUHJveHkuaXNWYWxpZCgpICYmIChpc1NhZmFyaSB8fCBpc01pbmlC cm93c2VyKSkKICAgICAgICAgaHR0cFByb3h5ID0gVVJMKFVSTCgpLCBbZGVmYXVsdHMgc3RyaW5n Rm9yS2V5OihOU1N0cmluZyAqKVdlYktpdDJIVFRQUHJveHlEZWZhdWx0c0tleV0pOwotICAgIGlm ICghaHR0cHNQcm94eS5pc1ZhbGlkKCkgJiYgaXNTYWZhcmkpCisgICAgaWYgKCFodHRwc1Byb3h5 LmlzVmFsaWQoKSAmJiAoaXNTYWZhcmkgfHwgaXNNaW5pQnJvd3NlcikpCiAgICAgICAgIGh0dHBz UHJveHkgPSBVUkwoVVJMKCksIFtkZWZhdWx0cyBzdHJpbmdGb3JLZXk6KE5TU3RyaW5nICopV2Vi S2l0MkhUVFBTUHJveHlEZWZhdWx0c0tleV0pOwogCiAgICAgYXV0byByZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRGlyZWN0b3J5ID0gbV9jb25maWd1cmF0aW9uLT5yZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGlyZWN0b3J5KCk7Cg==