58961 2011-04-19 21:20:02 -0700 Live streams sometimes won't play with AVFoundation backend 2011-05-05 19:30:57 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Mac (Intel) Other RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 eric.carlson eric.carlson webkit.review.bot oldest_to_newest 389042 0 eric.carlson 2011-04-19 21:20:02 -0700 A <video> element with an http live stream displays the first frame of video but can not be played. 389043 1 eric.carlson 2011-04-19 21:20:22 -0700 <rdar://9284748> 389055 2 90305 eric.carlson 2011-04-19 21:58:54 -0700 Created attachment 90305 Proposed patch. 389056 3 webkit.review.bot 2011-04-19 22:01:26 -0700 Attachment 90305 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:480: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 390005 4 eric.carlson 2011-04-21 07:11:42 -0700 http://trac.webkit.org/changeset/84497 399008 5 eric.carlson 2011-05-05 14:08:40 -0700 Live streams still sometimes won't play. 399011 6 eric.carlson 2011-05-05 14:10:04 -0700 The problem happens when seekToTime: is called on the AVPlayerItem immediately after AVFoundation reports that the stream's metadata is available, and neither the completion handler nor the periodic time observer fires. This leaves WebKit waiting for the seek to complete. 399018 7 eric.carlson 2011-05-05 14:12:43 -0700 Two issues here: 1) the periodic time observer is an autorelease object, but we don't retain it so it it is deleted and *can't* ever fire. 1) our AVFoundation media engine state machine should not try to track when a seek is in progress, and should instead depend on AVFoundation to notify of buffering state changes. 399040 8 92467 eric.carlson 2011-05-05 14:29:54 -0700 Created attachment 92467 Proposed patch. 399046 9 webkit.review.bot 2011-05-05 14:32:37 -0700 Attachment 92467 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 399069 10 92475 eric.carlson 2011-05-05 14:48:01 -0700 Created attachment 92475 Patch, with bug number. 399289 11 eric.carlson 2011-05-05 19:30:57 -0700 http://trac.webkit.org/changeset/85913 90305 2011-04-19 21:58:54 -0700 2011-05-05 14:29:54 -0700 Proposed patch. patch_3.txt text/plain 7078 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0MzM4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMDQtMTkgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTGl2ZSBzdHJlYW1zIHdvbid0IHBsYXkgd2l0aCBBVkZv dW5kYXRpb24gYmFja2VuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTg5NjEKKworICAgICAgICBUZXN0ZWQgbWFudWFsbHkgYmVjYXVzZSB3ZSBkb24n dCBoYXZlIGFueSBsaXZlIHN0cmVhbXMgdG8gdGVzdCBpbiBEUlQuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6 c2Vlayk6IERvIG5vdGhpbmcgd2hlbiBhc2tlZCB0byBzZWVrIHRvIHRoZQorICAgICAgICAgICAg Y3VycmVudCB0aW1lLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uOjp1cGRhdGVTdGF0ZXMpOiBJZiB0aGUgcmVhZHlTdGF0ZSBpcyBIYXZlRW5vdWdoRGF0 YSwKKyAgICAgICAgICAgIGRvbid0IHJldmVydCB3aGVuIHRoZSBuZXcgc3RhdGUgaXMgInJlYWR5 IHRvIHBsYXkiIG9yICJidWZmZXIgZnVsbCIuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb246Om1vdmllTG9hZFR5cGUpOiBVc2UgbmV3IGNvbnZlbmllbmNl IGZ1bmN0aW9uIGlzTGl2ZVN0cmVhbS4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmg6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OmlzTGl2ZVN0cmVhbSk6IE5ldy4K KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6dHJhY2tzQ2hhbmdlZCk6IERvbid0IHVzZSBBVkFzc2V0 J3MKKyAgICAgICAgICAgIHRyYWNrc1dpdGhNZWRpYUNoYXJhY3RlcmlzdGljIGJlY2F1c2UgaXQg ZG9lc24ndCBnaXZlIHVzIHdoYXQgd2UgbmVlZCB3aXRoIGxpdmUKKyAgICAgICAgICAgIHN0cmVh bXMuCisKIDIwMTEtMDQtMTkgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFW Rm91bmRhdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAJKHJl dmlzaW9uIDg0MTM5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI5MCwxMyArMjkwLDE2IEBAIGZsb2F0IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bjo6ZHUKIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnNlZWsoZmxvYXQg dGltZSkKIHsKLSAgICBMT0coTWVkaWEsICJNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246 OnNlZWsoJXApIC0gc2Vla2luZyB0byAlZiIsIHRoaXMsIHRpbWUpOwogICAgIGlmICghbWV0YURh dGFBdmFpbGFibGUoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKHRpbWUgPiBkdXJhdGlv bigpKQogICAgICAgICB0aW1lID0gZHVyYXRpb24oKTsKIAorICAgIGlmIChjdXJyZW50VGltZSgp ID09IHRpbWUpCisgICAgICAgIHJldHVybjsKKworICAgIExPRyhNZWRpYSwgIk1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbjo6c2VlayglcCkgLSBzZWVraW5nIHRvICVmIiwgdGhpcywgdGlt ZSk7CiAgICAgbV9zZWVrVG8gPSB0aW1lOwogCiAgICAgc2Vla1RvVGltZSh0aW1lKTsKQEAgLTQ2 OSw4ICs0NzIsMTIgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb246OnVwZAog ICAgICAgICAgICAgICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRpYVBsYXllcjo6SGF2ZUVub3Vn aERhdGE7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIGNhc2Ug TWVkaWFQbGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNSZWFkeVRvUGxheToKLSAgICAgICAgICAgICAg ICBjYXNlIE1lZGlhUGxheWVyQVZQbGF5ZXJJdGVtU3RhdHVzUGxheWJhY2tCdWZmZXJFbXB0eToK ICAgICAgICAgICAgICAgICBjYXNlIE1lZGlhUGxheWVyQVZQbGF5ZXJJdGVtU3RhdHVzUGxheWJh Y2tCdWZmZXJGdWxsOgorICAgICAgICAgICAgICAgICAgICAvLyBJZiB0aGUgcmVhZHlTdGF0ZSBp cyBhbHJlYWR5IEhhdmVFbm91Z2hEYXRhLCBkb24ndCBnbyBsb3dlciBiZWNhdXNlIG9mIHRoaXMg c3RhdGUgY2hhbmdlLgorICAgICAgICAgICAgICAgICAgICBpZiAobV9yZWFkeVN0YXRlID09IE1l ZGlhUGxheWVyOjpIYXZlRW5vdWdoRGF0YSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFr OworCisgICAgICAgICAgICAgICAgICAgIGNhc2UgTWVkaWFQbGF5ZXJBVlBsYXllckl0ZW1TdGF0 dXNQbGF5YmFja0J1ZmZlckVtcHR5OgogICAgICAgICAgICAgICAgICAgICBpZiAobWF4TG9hZGVk ID4gY3VycmVudFRpbWUoKSkKICAgICAgICAgICAgICAgICAgICAgICAgIG1fcmVhZHlTdGF0ZSA9 IE1lZGlhUGxheWVyOjpIYXZlRnV0dXJlRGF0YTsKICAgICAgICAgICAgICAgICAgICAgZWxzZQpA QCAtNjMwLDcgKzYzNyw3IEBAIE1lZGlhUGxheWVyOjpNb3ZpZUxvYWRUeXBlIE1lZGlhUGxheWVy UHIKICAgICBpZiAoIW1ldGFEYXRhQXZhaWxhYmxlKCkgfHwgYXNzZXRTdGF0dXMoKSA9PSBNZWRp YVBsYXllckFWQXNzZXRTdGF0dXNVbmtub3duKQogICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6 OlVua25vd247CiAKLSAgICBpZiAoaXNpbmYoZHVyYXRpb24oKSkpCisgICAgaWYgKGlzTGl2ZVN0 cmVhbSgpKQogICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6OkxpdmVTdHJlYW07CiAKICAgICBy ZXR1cm4gTWVkaWFQbGF5ZXI6OkRvd25sb2FkOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uaAkocmV2aXNpb24gODQxMzkpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTIyMCw2ICsyMjAsNyBA QCBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBzZXREZWxheUNhbGxiYWNrcyhib29sKTsKICAgICB2b2lk IHNldElnbm9yZUxvYWRTdGF0ZUNoYW5nZXMoYm9vbCBkZWxheSkgeyBtX2lnbm9yZUxvYWRTdGF0 ZUNoYW5nZXMgPSBkZWxheTsgfQogICAgIHZvaWQgc2V0TmF0dXJhbFNpemUoSW50U2l6ZSk7Cisg ICAgYm9vbCBpc0xpdmVTdHJlYW0oKSBjb25zdCB7IHJldHVybiBpc2luZihkdXJhdGlvbigpKTsg fQogCiAgICAgZW51bSBNZWRpYVJlbmRlcmluZ01vZGUgeyBNZWRpYVJlbmRlcmluZ05vbmUsIE1l ZGlhUmVuZGVyaW5nVG9Db250ZXh0LCBNZWRpYVJlbmRlcmluZ1RvTGF5ZXIgfTsKICAgICBNZWRp YVJlbmRlcmluZ01vZGUgY3VycmVudFJlbmRlcmluZ01vZGUoKSBjb25zdDsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZh dGVBVkZvdW5kYXRpb25PYmpDLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDLm1tCShyZXZpc2lvbiA4NDEzOSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC02Myw2ICs2Myw4IEBAIFNPRlRfTElOS19DTEFTUyhBVkZvdW5kYXRp b24sIEFWQXNzZXRJbWEKIFNPRlRfTElOS19QT0lOVEVSKEFWRm91bmRhdGlvbiwgQVZNZWRpYUNo YXJhY3RlcmlzdGljVmlzdWFsLCBOU1N0cmluZyAqKQogU09GVF9MSU5LX1BPSU5URVIoQVZGb3Vu ZGF0aW9uLCBBVk1lZGlhQ2hhcmFjdGVyaXN0aWNBdWRpYmxlLCBOU1N0cmluZyAqKQogU09GVF9M SU5LX1BPSU5URVIoQVZGb3VuZGF0aW9uLCBBVk1lZGlhVHlwZUNsb3NlZENhcHRpb24sIE5TU3Ry aW5nICopCitTT0ZUX0xJTktfUE9JTlRFUihBVkZvdW5kYXRpb24sIEFWTWVkaWFUeXBlVmlkZW8s IE5TU3RyaW5nICopCitTT0ZUX0xJTktfUE9JTlRFUihBVkZvdW5kYXRpb24sIEFWTWVkaWFUeXBl QXVkaW8sIE5TU3RyaW5nICopCiBTT0ZUX0xJTktfUE9JTlRFUihBVkZvdW5kYXRpb24sIEFWUGxh eWVySXRlbURpZFBsYXlUb0VuZFRpbWVOb3RpZmljYXRpb24sIE5TU3RyaW5nICopCiBTT0ZUX0xJ TktfUE9JTlRFUihBVkZvdW5kYXRpb24sIEFWQXNzZXRJbWFnZUdlbmVyYXRvckFwZXJ0dXJlTW9k ZUNsZWFuQXBlcnR1cmUsIE5TU3RyaW5nICopCiAKQEAgLTc3LDYgKzc5LDggQEAgU09GVF9MSU5L X0NPTlNUQU5UKENvcmVNZWRpYSwga0NNVGltZVplcgogI2RlZmluZSBBVk1lZGlhQ2hhcmFjdGVy aXN0aWNWaXN1YWwgZ2V0QVZNZWRpYUNoYXJhY3RlcmlzdGljVmlzdWFsKCkKICNkZWZpbmUgQVZN ZWRpYUNoYXJhY3RlcmlzdGljQXVkaWJsZSBnZXRBVk1lZGlhQ2hhcmFjdGVyaXN0aWNBdWRpYmxl KCkKICNkZWZpbmUgQVZNZWRpYVR5cGVDbG9zZWRDYXB0aW9uIGdldEFWTWVkaWFUeXBlQ2xvc2Vk Q2FwdGlvbigpCisjZGVmaW5lIEFWTWVkaWFUeXBlVmlkZW8gZ2V0QVZNZWRpYVR5cGVWaWRlbygp CisjZGVmaW5lIEFWTWVkaWFUeXBlQXVkaW8gZ2V0QVZNZWRpYVR5cGVBdWRpbygpCiAjZGVmaW5l IEFWUGxheWVySXRlbURpZFBsYXlUb0VuZFRpbWVOb3RpZmljYXRpb24gZ2V0QVZQbGF5ZXJJdGVt RGlkUGxheVRvRW5kVGltZU5vdGlmaWNhdGlvbigpCiAjZGVmaW5lIEFWQXNzZXRJbWFnZUdlbmVy YXRvckFwZXJ0dXJlTW9kZUNsZWFuQXBlcnR1cmUgZ2V0QVZBc3NldEltYWdlR2VuZXJhdG9yQXBl cnR1cmVNb2RlQ2xlYW5BcGVydHVyZSgpCiAKQEAgLTY1NSw5ICs2NTksMjQgQEAgdm9pZCBNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOgogewogICAgIC8vIFRoaXMgaXMgY2FsbGVk IHdoZW5ldmVyIHRoZSB0cmFja3MgY29sbGVjdGlvbiBjaGFuZ2VzIHNvIGNhY2hlIGhhc1ZpZGVv IGFuZCBoYXNBdWRpbyBzaW5jZSB3ZSBnZXQKICAgICAvLyBhc2tlZCBhYm91dCB0aG9zZSBmYWly bHkgZmVxdWVudGx5LgotICAgIHNldEhhc1ZpZGVvKFtbbV9hdkFzc2V0LmdldCgpIHRyYWNrc1dp dGhNZWRpYUNoYXJhY3RlcmlzdGljOkFWTWVkaWFDaGFyYWN0ZXJpc3RpY1Zpc3VhbF0gY291bnRd KTsKLSAgICBzZXRIYXNBdWRpbyhbW21fYXZBc3NldC5nZXQoKSB0cmFja3NXaXRoTWVkaWFDaGFy YWN0ZXJpc3RpYzpBVk1lZGlhQ2hhcmFjdGVyaXN0aWNBdWRpYmxlXSBjb3VudF0pOwotICAgIHNl dEhhc0Nsb3NlZENhcHRpb25zKFtbbV9hdkFzc2V0LmdldCgpIHRyYWNrc1dpdGhNZWRpYVR5cGU6 QVZNZWRpYVR5cGVDbG9zZWRDYXB0aW9uXSBjb3VudF0pOworICAgIGJvb2wgaGFzVmlkZW8gPSBm YWxzZTsKKyAgICBib29sIGhhc0F1ZGlvID0gZmFsc2U7CisgICAgYm9vbCBoYXNDYXB0aW9ucyA9 IGZhbHNlOworICAgIE5TQXJyYXkgKnRyYWNrcyA9IFttX2F2UGxheWVySXRlbS5nZXQoKSB0cmFj a3NdOworICAgIGZvciAoQVZQbGF5ZXJJdGVtVHJhY2sgKnRyYWNrIGluIHRyYWNrcykgeworICAg ICAgICBpZiAoW3RyYWNrIGlzRW5hYmxlZF0pIHsKKyAgICAgICAgICAgIEFWQXNzZXRUcmFjayAq YXNzZXRUcmFjayA9IFt0cmFjayBhc3NldFRyYWNrXTsKKyAgICAgICAgICAgIGlmIChbW2Fzc2V0 VHJhY2sgbWVkaWFUeXBlXSBpc0VxdWFsVG9TdHJpbmc6QVZNZWRpYVR5cGVWaWRlb10pCisgICAg ICAgICAgICAgICAgaGFzVmlkZW8gPSB0cnVlOworICAgICAgICAgICAgZWxzZSBpZiAoW1thc3Nl dFRyYWNrIG1lZGlhVHlwZV0gaXNFcXVhbFRvU3RyaW5nOkFWTWVkaWFUeXBlQXVkaW9dKQorICAg ICAgICAgICAgICAgIGhhc0F1ZGlvID0gdHJ1ZTsKKyAgICAgICAgICAgIGVsc2UgaWYgKFtbYXNz ZXRUcmFjayBtZWRpYVR5cGVdIGlzRXF1YWxUb1N0cmluZzpBVk1lZGlhVHlwZUNsb3NlZENhcHRp b25dKQorICAgICAgICAgICAgICAgIGhhc0NhcHRpb25zID0gdHJ1ZTsKKyAgICAgICAgfQorICAg IH0KKyAgICBzZXRIYXNWaWRlbyhoYXNWaWRlbyk7CisgICAgc2V0SGFzQXVkaW8oaGFzQXVkaW8p OworICAgIHNldEhhc0Nsb3NlZENhcHRpb25zKGhhc0NhcHRpb25zKTsKIAogICAgIHNpemVDaGFu Z2VkKCk7CiB9Cg== 92467 2011-05-05 14:29:54 -0700 2011-05-05 14:48:01 -0700 Proposed patch. patch_5.txt text/plain 6924 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1ODc4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDUtMDUgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTGl2ZSBzdHJlYW1zIHNvbWV0aW1lcyB3b24ndCBwbGF5 IHdpdGggQVZGb3VuZGF0aW9uIGJhY2tlbmQKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vOTI4NDc0 OAorCisgICAgICAgIFRlc3RlZCBtYW51YWxseSBiZWNhdXNlIHdlIGRvbid0IGhhdmUgYW55IGxp dmUgc3RyZWFtcyB0byB0ZXN0IGluIERSVC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb24uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjp1cGRhdGVTdGF0ZXMp OiBEb24ndCBzcGVjaWFsIGNhc2Ugc2Vla2luZy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmg6IE1h a2UgbV90aW1lT2JzZXJ2ZXIKKyAgICAgICAgICAgIGEgUmV0YWluUHRyCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b25PYmpDOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDKTogRGl0dG8uCisgICAg ICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjYW5jZWxM b2FkKTogRGl0dG8uCisKIDIwMTEtMDUtMDUgIEFiaGlzaGVrIEFyeWEgIDxpbmZlcm5vQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZlIEh5YXR0LgpJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAJ KHJldmlzaW9uIDg1ODcyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTQyMSw0MCArNDIxLDM2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uOjp1cGQKICAgICAgICAgfQogICAgICAgICAKICAgICAgICAgaWYgKGFzc2V0U3RhdHVzID49 IE1lZGlhUGxheWVyQVZBc3NldFN0YXR1c0xvYWRlZCAmJiBpdGVtU3RhdHVzID4gTWVkaWFQbGF5 ZXJBVlBsYXllckl0ZW1TdGF0dXNVbmtub3duKSB7Ci0gICAgICAgICAgICBpZiAoc2Vla2luZygp KQotICAgICAgICAgICAgICAgIG1fcmVhZHlTdGF0ZSA9IG1fcmVhZHlTdGF0ZSA+PSBNZWRpYVBs YXllcjo6SGF2ZU1ldGFkYXRhID8gTWVkaWFQbGF5ZXI6OkhhdmVNZXRhZGF0YSA6IE1lZGlhUGxh eWVyOjpIYXZlTm90aGluZzsKLSAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgIHN3 aXRjaCAoaXRlbVN0YXR1cykgewotICAgICAgICAgICAgICAgIGNhc2UgTWVkaWFQbGF5ZXJBVlBs YXllckl0ZW1TdGF0dXNEb2VzTm90RXhpc3Q6Ci0gICAgICAgICAgICAgICAgY2FzZSBNZWRpYVBs YXllckFWUGxheWVySXRlbVN0YXR1c1Vua25vd246Ci0gICAgICAgICAgICAgICAgY2FzZSBNZWRp YVBsYXllckFWUGxheWVySXRlbVN0YXR1c0ZhaWxlZDoKKyAgICAgICAgICAgIHN3aXRjaCAoaXRl bVN0YXR1cykgeworICAgICAgICAgICAgY2FzZSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1 c0RvZXNOb3RFeGlzdDoKKyAgICAgICAgICAgIGNhc2UgTWVkaWFQbGF5ZXJBVlBsYXllckl0ZW1T dGF0dXNVbmtub3duOgorICAgICAgICAgICAgY2FzZSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0 YXR1c0ZhaWxlZDoKKyAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgY2FzZSBN ZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1BsYXliYWNrTGlrZWx5VG9LZWVwVXA6CisgICAg ICAgICAgICAgICAgbV9yZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6OkhhdmVFbm91Z2hEYXRhOwor ICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgICBjYXNlIE1lZGlhUGxheWVyQVZQ bGF5ZXJJdGVtU3RhdHVzUGxheWJhY2tCdWZmZXJGdWxsOgorICAgICAgICAgICAgY2FzZSBNZWRp YVBsYXllckFWUGxheWVySXRlbVN0YXR1c1JlYWR5VG9QbGF5OgorICAgICAgICAgICAgICAgIC8v IElmIHRoZSByZWFkeVN0YXRlIGlzIGFscmVhZHkgSGF2ZUVub3VnaERhdGEsIGRvbid0IGdvIGxv d2VyIGJlY2F1c2Ugb2YgdGhpcyBzdGF0ZSBjaGFuZ2UuCisgICAgICAgICAgICAgICAgaWYgKG1f cmVhZHlTdGF0ZSA9PSBNZWRpYVBsYXllcjo6SGF2ZUVub3VnaERhdGEpCiAgICAgICAgICAgICAg ICAgICAgIGJyZWFrOwogCi0gICAgICAgICAgICAgICAgY2FzZSBNZWRpYVBsYXllckFWUGxheWVy SXRlbVN0YXR1c1BsYXliYWNrTGlrZWx5VG9LZWVwVXA6Ci0gICAgICAgICAgICAgICAgICAgIG1f cmVhZHlTdGF0ZSA9IE1lZGlhUGxheWVyOjpIYXZlRW5vdWdoRGF0YTsKLSAgICAgICAgICAgICAg ICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgICAgICBjYXNlIE1lZGlhUGxheWVyQVZQbGF5ZXJJ dGVtU3RhdHVzUGxheWJhY2tCdWZmZXJGdWxsOgotICAgICAgICAgICAgICAgIGNhc2UgTWVkaWFQ bGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNSZWFkeVRvUGxheToKLSAgICAgICAgICAgICAgICAgICAg Ly8gSWYgdGhlIHJlYWR5U3RhdGUgaXMgYWxyZWFkeSBIYXZlRW5vdWdoRGF0YSwgZG9uJ3QgZ28g bG93ZXIgYmVjYXVzZSBvZiB0aGlzIHN0YXRlIGNoYW5nZS4KLSAgICAgICAgICAgICAgICAgICAg aWYgKG1fcmVhZHlTdGF0ZSA9PSBNZWRpYVBsYXllcjo6SGF2ZUVub3VnaERhdGEpCi0gICAgICAg ICAgICAgICAgICAgICAgICBicmVhazsKLQotICAgICAgICAgICAgICAgIGNhc2UgTWVkaWFQbGF5 ZXJBVlBsYXllckl0ZW1TdGF0dXNQbGF5YmFja0J1ZmZlckVtcHR5OgotICAgICAgICAgICAgICAg ICAgICBpZiAobWF4VGltZUxvYWRlZCgpID4gY3VycmVudFRpbWUoKSkKLSAgICAgICAgICAgICAg ICAgICAgICAgIG1fcmVhZHlTdGF0ZSA9IE1lZGlhUGxheWVyOjpIYXZlRnV0dXJlRGF0YTsKLSAg ICAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICAgICAgbV9yZWFkeVN0 YXRlID0gTWVkaWFQbGF5ZXI6OkhhdmVDdXJyZW50RGF0YTsKLSAgICAgICAgICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAgICAgaWYgKGl0ZW1TdGF0 dXMgPT0gTWVkaWFQbGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNQbGF5YmFja0J1ZmZlckZ1bGwpCi0g ICAgICAgICAgICAgICAgICAgIG1fbmV0d29ya1N0YXRlID0gTWVkaWFQbGF5ZXI6OklkbGU7Ci0g ICAgICAgICAgICAgICAgZWxzZSBpZiAoaXRlbVN0YXR1cyA9PSBNZWRpYVBsYXllckFWUGxheWVy SXRlbVN0YXR1c0ZhaWxlZCkKLSAgICAgICAgICAgICAgICAgICAgbV9uZXR3b3JrU3RhdGUgPSBN ZWRpYVBsYXllcjo6RGVjb2RlRXJyb3I7Ci0gICAgICAgICAgICAgICAgZWxzZSBpZiAoaXRlbVN0 YXR1cyAhPSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1BsYXliYWNrQnVmZmVyRnVsbCAm JiBpdGVtU3RhdHVzID49IE1lZGlhUGxheWVyQVZQbGF5ZXJJdGVtU3RhdHVzUmVhZHlUb1BsYXkp Ci0gICAgICAgICAgICAgICAgICAgIG1fbmV0d29ya1N0YXRlID0gKG1heFRpbWVMb2FkZWQoKSA9 PSBkdXJhdGlvbigpKSA/IE1lZGlhUGxheWVyOjpMb2FkZWQgOiBNZWRpYVBsYXllcjo6TG9hZGlu ZzsKKyAgICAgICAgICAgIGNhc2UgTWVkaWFQbGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNQbGF5YmFj a0J1ZmZlckVtcHR5OgorICAgICAgICAgICAgICAgIGlmIChtYXhUaW1lTG9hZGVkKCkgPiBjdXJy ZW50VGltZSgpKQorICAgICAgICAgICAgICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRpYVBsYXll cjo6SGF2ZUZ1dHVyZURhdGE7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAg ICAgICBtX3JlYWR5U3RhdGUgPSBNZWRpYVBsYXllcjo6SGF2ZUN1cnJlbnREYXRhOworICAgICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQorCisgICAgICAgICAgICBpZiAoaXRlbVN0 YXR1cyA9PSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1BsYXliYWNrQnVmZmVyRnVsbCkK KyAgICAgICAgICAgICAgICBtX25ldHdvcmtTdGF0ZSA9IE1lZGlhUGxheWVyOjpJZGxlOworICAg ICAgICAgICAgZWxzZSBpZiAoaXRlbVN0YXR1cyA9PSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0 YXR1c0ZhaWxlZCkKKyAgICAgICAgICAgICAgICBtX25ldHdvcmtTdGF0ZSA9IE1lZGlhUGxheWVy OjpEZWNvZGVFcnJvcjsKKyAgICAgICAgICAgIGVsc2UgaWYgKGl0ZW1TdGF0dXMgIT0gTWVkaWFQ bGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNQbGF5YmFja0J1ZmZlckZ1bGwgJiYgaXRlbVN0YXR1cyA+ PSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1JlYWR5VG9QbGF5KQorICAgICAgICAgICAg ICAgIG1fbmV0d29ya1N0YXRlID0gKG1heFRpbWVMb2FkZWQoKSA9PSBkdXJhdGlvbigpKSA/IE1l ZGlhUGxheWVyOjpMb2FkZWQgOiBNZWRpYVBsYXllcjo6TG9hZGluZzsKICAgICAgICAgfQogICAg IH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQy5oCShyZXZpc2lvbiA4NTg2NSkKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5k YXRpb25PYmpDLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyOCw3ICsxMjgsNyBAQCBwcml2YXRlOgog ICAgIFJldGFpblB0cjxBVlBsYXllckxheWVyPiBtX3ZpZGVvTGF5ZXI7CiAgICAgUmV0YWluUHRy PFdlYkNvcmVBVkZNb3ZpZU9ic2VydmVyPiBtX29iamNPYnNlcnZlcjsKICAgICBSZXRhaW5QdHI8 QVZBc3NldEltYWdlR2VuZXJhdG9yPiBtX2ltYWdlR2VuZXJhdG9yOwotICAgIGlkIG1fdGltZU9i c2VydmVyOworICAgIFJldGFpblB0cjxpZD4gbV90aW1lT2JzZXJ2ZXI7CiAgICAgYm9vbCBtX3Zp ZGVvRnJhbWVIYXNEcmF3bjsKICAgICBib29sIG1faGF2ZUNoZWNrZWRQbGF5YWJpbGl0eTsKIH07 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVk aWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uT2JqQy5tbQkocmV2aXNpb24gODU4NjUpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uT2JqQy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTM3LDcgKzEzNyw2IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzoKIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbk9iakM6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMoTWVkaWFQbGF5ZXIq IHBsYXllcikKICAgICA6IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbihwbGF5ZXIpCiAg ICAgLCBtX29iamNPYnNlcnZlcihBZG9wdE5TLCBbW1dlYkNvcmVBVkZNb3ZpZU9ic2VydmVyIGFs bG9jXSBpbml0V2l0aENhbGxiYWNrOnRoaXNdKQotICAgICwgbV90aW1lT2JzZXJ2ZXIoMCkKICAg ICAsIG1fdmlkZW9GcmFtZUhhc0RyYXduKGZhbHNlKQogICAgICwgbV9oYXZlQ2hlY2tlZFBsYXlh YmlsaXR5KGZhbHNlKQogewpAQCAtMTcwLDcgKzE2OSw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQzoKICAgICB9CiAgICAgaWYgKG1fYXZQbGF5ZXIpIHsKICAgICAg ICAgaWYgKG1fdGltZU9ic2VydmVyKQotICAgICAgICAgICAgW21fYXZQbGF5ZXIuZ2V0KCkgcmVt b3ZlVGltZU9ic2VydmVyOm1fdGltZU9ic2VydmVyXTsKKyAgICAgICAgICAgIFttX2F2UGxheWVy LmdldCgpIHJlbW92ZVRpbWVPYnNlcnZlcjptX3RpbWVPYnNlcnZlci5nZXQoKV07CisgICAgICAg IG1fdGltZU9ic2VydmVyID0gbmlsOwogICAgICAgICBbbV9hdlBsYXllci5nZXQoKSByZW1vdmVP YnNlcnZlcjptX29iamNPYnNlcnZlci5nZXQoKSBmb3JLZXlQYXRoOkAicmF0ZSJdOwogICAgICAg ICBtX2F2UGxheWVyID0gbmlsOwogICAgIH0K 92475 2011-05-05 14:48:01 -0700 2011-05-05 15:52:26 -0700 Patch, with bug number. patch_5.txt text/plain 7056 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1ODc4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDUtMDUgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTGl2ZSBzdHJlYW1zIHNvbWV0aW1lcyB3b24ndCBwbGF5 IHdpdGggQVZGb3VuZGF0aW9uIGJhY2tlbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU4OTYxCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzkyODQ3NDgK KworICAgICAgICBUZXN0ZWQgbWFudWFsbHkgYmVjYXVzZSB3ZSBkb24ndCBoYXZlIGFueSBsaXZl IHN0cmVhbXMgdG8gdGVzdCBpbiBEUlQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbjo6dXBkYXRlU3RhdGVzKTog RG9uJ3Qgc3BlY2lhbCBjYXNlIHNlZWtpbmcsIGFzc3VtZQorICAgICAgICAgICAgQVZGb3VuZGF0 aW9uIHdpbGwgbm90aWZ5IHVzIHdoZW4gaW50ZXJuYWwgc3RhdGVzIGNoYW5nZS4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDLmg6IE1ha2UgbV90aW1lT2JzZXJ2ZXIKKyAgICAgICAgICAgIGEgUmV0YWlu UHRyCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5k YXRpb25PYmpDOjpjYW5jZWxMb2FkKTogRGl0dG8uCisKIDIwMTEtMDUtMDUgIEFiaGlzaGVrIEFy eWEgIDxpbmZlcm5vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZlIEh5 YXR0LgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0 ZUFWRm91bmRhdGlvbi5jcHAJKHJldmlzaW9uIDg1ODcyKQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyMSw0MCArNDIxLDM2IEBAIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uOjp1cGQKICAgICAgICAgfQogICAgICAgICAKICAgICAgICAg aWYgKGFzc2V0U3RhdHVzID49IE1lZGlhUGxheWVyQVZBc3NldFN0YXR1c0xvYWRlZCAmJiBpdGVt U3RhdHVzID4gTWVkaWFQbGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNVbmtub3duKSB7Ci0gICAgICAg ICAgICBpZiAoc2Vla2luZygpKQotICAgICAgICAgICAgICAgIG1fcmVhZHlTdGF0ZSA9IG1fcmVh ZHlTdGF0ZSA+PSBNZWRpYVBsYXllcjo6SGF2ZU1ldGFkYXRhID8gTWVkaWFQbGF5ZXI6OkhhdmVN ZXRhZGF0YSA6IE1lZGlhUGxheWVyOjpIYXZlTm90aGluZzsKLSAgICAgICAgICAgIGVsc2Ugewot ICAgICAgICAgICAgICAgIHN3aXRjaCAoaXRlbVN0YXR1cykgewotICAgICAgICAgICAgICAgIGNh c2UgTWVkaWFQbGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNEb2VzTm90RXhpc3Q6Ci0gICAgICAgICAg ICAgICAgY2FzZSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1Vua25vd246Ci0gICAgICAg ICAgICAgICAgY2FzZSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c0ZhaWxlZDoKKyAgICAg ICAgICAgIHN3aXRjaCAoaXRlbVN0YXR1cykgeworICAgICAgICAgICAgY2FzZSBNZWRpYVBsYXll ckFWUGxheWVySXRlbVN0YXR1c0RvZXNOb3RFeGlzdDoKKyAgICAgICAgICAgIGNhc2UgTWVkaWFQ bGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNVbmtub3duOgorICAgICAgICAgICAgY2FzZSBNZWRpYVBs YXllckFWUGxheWVySXRlbVN0YXR1c0ZhaWxlZDoKKyAgICAgICAgICAgICAgICBicmVhazsKKwor ICAgICAgICAgICAgY2FzZSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1BsYXliYWNrTGlr ZWx5VG9LZWVwVXA6CisgICAgICAgICAgICAgICAgbV9yZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6 OkhhdmVFbm91Z2hEYXRhOworICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgICBj YXNlIE1lZGlhUGxheWVyQVZQbGF5ZXJJdGVtU3RhdHVzUGxheWJhY2tCdWZmZXJGdWxsOgorICAg ICAgICAgICAgY2FzZSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1JlYWR5VG9QbGF5Ogor ICAgICAgICAgICAgICAgIC8vIElmIHRoZSByZWFkeVN0YXRlIGlzIGFscmVhZHkgSGF2ZUVub3Vn aERhdGEsIGRvbid0IGdvIGxvd2VyIGJlY2F1c2Ugb2YgdGhpcyBzdGF0ZSBjaGFuZ2UuCisgICAg ICAgICAgICAgICAgaWYgKG1fcmVhZHlTdGF0ZSA9PSBNZWRpYVBsYXllcjo6SGF2ZUVub3VnaERh dGEpCiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogCi0gICAgICAgICAgICAgICAgY2FzZSBN ZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1BsYXliYWNrTGlrZWx5VG9LZWVwVXA6Ci0gICAg ICAgICAgICAgICAgICAgIG1fcmVhZHlTdGF0ZSA9IE1lZGlhUGxheWVyOjpIYXZlRW5vdWdoRGF0 YTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgICAgICAgICBjYXNlIE1l ZGlhUGxheWVyQVZQbGF5ZXJJdGVtU3RhdHVzUGxheWJhY2tCdWZmZXJGdWxsOgotICAgICAgICAg ICAgICAgIGNhc2UgTWVkaWFQbGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNSZWFkeVRvUGxheToKLSAg ICAgICAgICAgICAgICAgICAgLy8gSWYgdGhlIHJlYWR5U3RhdGUgaXMgYWxyZWFkeSBIYXZlRW5v dWdoRGF0YSwgZG9uJ3QgZ28gbG93ZXIgYmVjYXVzZSBvZiB0aGlzIHN0YXRlIGNoYW5nZS4KLSAg ICAgICAgICAgICAgICAgICAgaWYgKG1fcmVhZHlTdGF0ZSA9PSBNZWRpYVBsYXllcjo6SGF2ZUVu b3VnaERhdGEpCi0gICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLQotICAgICAgICAgICAg ICAgIGNhc2UgTWVkaWFQbGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNQbGF5YmFja0J1ZmZlckVtcHR5 OgotICAgICAgICAgICAgICAgICAgICBpZiAobWF4VGltZUxvYWRlZCgpID4gY3VycmVudFRpbWUo KSkKLSAgICAgICAgICAgICAgICAgICAgICAgIG1fcmVhZHlTdGF0ZSA9IE1lZGlhUGxheWVyOjpI YXZlRnV0dXJlRGF0YTsKLSAgICAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAg ICAgICAgICAgbV9yZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6OkhhdmVDdXJyZW50RGF0YTsKLSAg ICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAg ICAgICAgaWYgKGl0ZW1TdGF0dXMgPT0gTWVkaWFQbGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNQbGF5 YmFja0J1ZmZlckZ1bGwpCi0gICAgICAgICAgICAgICAgICAgIG1fbmV0d29ya1N0YXRlID0gTWVk aWFQbGF5ZXI6OklkbGU7Ci0gICAgICAgICAgICAgICAgZWxzZSBpZiAoaXRlbVN0YXR1cyA9PSBN ZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c0ZhaWxlZCkKLSAgICAgICAgICAgICAgICAgICAg bV9uZXR3b3JrU3RhdGUgPSBNZWRpYVBsYXllcjo6RGVjb2RlRXJyb3I7Ci0gICAgICAgICAgICAg ICAgZWxzZSBpZiAoaXRlbVN0YXR1cyAhPSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1Bs YXliYWNrQnVmZmVyRnVsbCAmJiBpdGVtU3RhdHVzID49IE1lZGlhUGxheWVyQVZQbGF5ZXJJdGVt U3RhdHVzUmVhZHlUb1BsYXkpCi0gICAgICAgICAgICAgICAgICAgIG1fbmV0d29ya1N0YXRlID0g KG1heFRpbWVMb2FkZWQoKSA9PSBkdXJhdGlvbigpKSA/IE1lZGlhUGxheWVyOjpMb2FkZWQgOiBN ZWRpYVBsYXllcjo6TG9hZGluZzsKKyAgICAgICAgICAgIGNhc2UgTWVkaWFQbGF5ZXJBVlBsYXll ckl0ZW1TdGF0dXNQbGF5YmFja0J1ZmZlckVtcHR5OgorICAgICAgICAgICAgICAgIGlmIChtYXhU aW1lTG9hZGVkKCkgPiBjdXJyZW50VGltZSgpKQorICAgICAgICAgICAgICAgICAgICBtX3JlYWR5 U3RhdGUgPSBNZWRpYVBsYXllcjo6SGF2ZUZ1dHVyZURhdGE7CisgICAgICAgICAgICAgICAgZWxz ZQorICAgICAgICAgICAgICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRpYVBsYXllcjo6SGF2ZUN1 cnJlbnREYXRhOworICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQorCisgICAg ICAgICAgICBpZiAoaXRlbVN0YXR1cyA9PSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1Bs YXliYWNrQnVmZmVyRnVsbCkKKyAgICAgICAgICAgICAgICBtX25ldHdvcmtTdGF0ZSA9IE1lZGlh UGxheWVyOjpJZGxlOworICAgICAgICAgICAgZWxzZSBpZiAoaXRlbVN0YXR1cyA9PSBNZWRpYVBs YXllckFWUGxheWVySXRlbVN0YXR1c0ZhaWxlZCkKKyAgICAgICAgICAgICAgICBtX25ldHdvcmtT dGF0ZSA9IE1lZGlhUGxheWVyOjpEZWNvZGVFcnJvcjsKKyAgICAgICAgICAgIGVsc2UgaWYgKGl0 ZW1TdGF0dXMgIT0gTWVkaWFQbGF5ZXJBVlBsYXllckl0ZW1TdGF0dXNQbGF5YmFja0J1ZmZlckZ1 bGwgJiYgaXRlbVN0YXR1cyA+PSBNZWRpYVBsYXllckFWUGxheWVySXRlbVN0YXR1c1JlYWR5VG9Q bGF5KQorICAgICAgICAgICAgICAgIG1fbmV0d29ya1N0YXRlID0gKG1heFRpbWVMb2FkZWQoKSA9 PSBkdXJhdGlvbigpKSA/IE1lZGlhUGxheWVyOjpMb2FkZWQgOiBNZWRpYVBsYXllcjo6TG9hZGlu ZzsKICAgICAgICAgfQogICAgIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oCShyZXZpc2lvbiA4NTg2NSkK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9NZWRpYVBs YXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyOCw3ICsx MjgsNyBAQCBwcml2YXRlOgogICAgIFJldGFpblB0cjxBVlBsYXllckxheWVyPiBtX3ZpZGVvTGF5 ZXI7CiAgICAgUmV0YWluUHRyPFdlYkNvcmVBVkZNb3ZpZU9ic2VydmVyPiBtX29iamNPYnNlcnZl cjsKICAgICBSZXRhaW5QdHI8QVZBc3NldEltYWdlR2VuZXJhdG9yPiBtX2ltYWdlR2VuZXJhdG9y OwotICAgIGlkIG1fdGltZU9ic2VydmVyOworICAgIFJldGFpblB0cjxpZD4gbV90aW1lT2JzZXJ2 ZXI7CiAgICAgYm9vbCBtX3ZpZGVvRnJhbWVIYXNEcmF3bjsKICAgICBib29sIG1faGF2ZUNoZWNr ZWRQbGF5YWJpbGl0eTsKIH07CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQkocmV2aXNpb24gODU4NjUpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTM3LDcgKzEz Nyw2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzoKIE1lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bk9iakMoTWVkaWFQbGF5ZXIqIHBsYXllcikKICAgICA6IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbihwbGF5ZXIpCiAgICAgLCBtX29iamNPYnNlcnZlcihBZG9wdE5TLCBbW1dlYkNvcmVB VkZNb3ZpZU9ic2VydmVyIGFsbG9jXSBpbml0V2l0aENhbGxiYWNrOnRoaXNdKQotICAgICwgbV90 aW1lT2JzZXJ2ZXIoMCkKICAgICAsIG1fdmlkZW9GcmFtZUhhc0RyYXduKGZhbHNlKQogICAgICwg bV9oYXZlQ2hlY2tlZFBsYXlhYmlsaXR5KGZhbHNlKQogewpAQCAtMTcwLDcgKzE2OSw4IEBAIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzoKICAgICB9CiAgICAgaWYgKG1f YXZQbGF5ZXIpIHsKICAgICAgICAgaWYgKG1fdGltZU9ic2VydmVyKQotICAgICAgICAgICAgW21f YXZQbGF5ZXIuZ2V0KCkgcmVtb3ZlVGltZU9ic2VydmVyOm1fdGltZU9ic2VydmVyXTsKKyAgICAg ICAgICAgIFttX2F2UGxheWVyLmdldCgpIHJlbW92ZVRpbWVPYnNlcnZlcjptX3RpbWVPYnNlcnZl ci5nZXQoKV07CisgICAgICAgIG1fdGltZU9ic2VydmVyID0gbmlsOwogICAgICAgICBbbV9hdlBs YXllci5nZXQoKSByZW1vdmVPYnNlcnZlcjptX29iamNPYnNlcnZlci5nZXQoKSBmb3JLZXlQYXRo OkAicmF0ZSJdOwogICAgICAgICBtX2F2UGxheWVyID0gbmlsOwogICAgIH0K