<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>154689</bug_id>
          
          <creation_ts>2016-02-25 12:59:43 -0800</creation_ts>
          <short_desc>[WK2] Stub support for WebsiteDataTypeResourceLoadStatistics</short_desc>
          <delta_ts>2016-03-01 17:02:03 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit2</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Brent Fulgham">bfulgham</reporter>
          <assigned_to name="Brent Fulgham">bfulgham</assigned_to>
          <cc>aestes</cc>
    
    <cc>andersca</cc>
    
    <cc>bfulgham</cc>
    
    <cc>jberlin</cc>
    
    <cc>sam</cc>
    
    <cc>wilander</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1168184</commentid>
    <comment_count>0</comment_count>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-02-25 12:59:43 -0800</bug_when>
    <thetext>Provide a stub implementation of a proposed WKWebsiteDataStore method so we can write some internal tests.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1168185</commentid>
    <comment_count>1</comment_count>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-02-25 13:00:27 -0800</bug_when>
    <thetext>&lt;rdar://problem/24702576&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1168190</commentid>
    <comment_count>2</comment_count>
      <attachid>272228</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-02-25 13:11:45 -0800</bug_when>
    <thetext>Created attachment 272228
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1168199</commentid>
    <comment_count>3</comment_count>
      <attachid>272228</attachid>
    <who name="Anders Carlsson">andersca</who>
    <bug_when>2016-02-25 13:34:54 -0800</bug_when>
    <thetext>Comment on attachment 272228
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=272228&amp;action=review

This shouldn&apos;t be API.

&gt; Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm:146
&gt; +- (void)removeDataOfTypes:(NSSet *)dataTypes forURL:(NSURL *)url fromDate:(NSDate *)startData toDate:(NSDate *)endDate completionHandler:(void (^)(void))completionHandler

No, this is not how we remove data in the WKWebsiteDataStore world. See WKWebsiteDataRecord.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1168215</commentid>
    <comment_count>4</comment_count>
      <attachid>272237</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-02-25 14:17:39 -0800</bug_when>
    <thetext>Created attachment 272237
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1168220</commentid>
    <comment_count>5</comment_count>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-02-25 14:20:04 -0800</bug_when>
    <thetext>(In reply to comment #3)
&gt; Comment on attachment 272228 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=272228&amp;action=review
&gt; 
&gt; This shouldn&apos;t be API.
&gt; 
&gt; &gt; Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm:146
&gt; &gt; +- (void)removeDataOfTypes:(NSSet *)dataTypes forURL:(NSURL *)url fromDate:(NSDate *)startData toDate:(NSDate *)endDate completionHandler:(void (^)(void))completionHandler
&gt; 
&gt; No, this is not how we remove data in the WKWebsiteDataStore world. See
&gt; WKWebsiteDataRecord.

OK. As we discussed offline we will use the existing API. We do need the new flag to handle deleting load statistics without getting rid of other stuff.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1168287</commentid>
    <comment_count>6</comment_count>
      <attachid>272260</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-02-25 16:23:24 -0800</bug_when>
    <thetext>Created attachment 272260
Patch (Correct typo)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1169335</commentid>
    <comment_count>7</comment_count>
      <attachid>272260</attachid>
    <who name="Sam Weinig">sam</who>
    <bug_when>2016-02-29 18:18:16 -0800</bug_when>
    <thetext>Comment on attachment 272260
Patch (Correct typo)

View in context: https://bugs.webkit.org/attachment.cgi?id=272260&amp;action=review

&gt; Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.h:50
&gt; +/*! @constant WKWebsiteDataTypeResourceLoadStatistics Resource load statistics. */
&gt; +WK_EXTERN NSString * const WKWebsiteDataTypeResourceLoadStatistics WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);

This needs to go in WKWebsiteDataRecordPrivate.h and gain an _.

&gt; Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm:90
&gt; +        allWebsiteDataTypes = [[NSSet alloc] initWithArray:@[ WKWebsiteDataTypeDiskCache, WKWebsiteDataTypeMemoryCache, WKWebsiteDataTypeOfflineWebApplicationCache, WKWebsiteDataTypeCookies, WKWebsiteDataTypeSessionStorage, WKWebsiteDataTypeLocalStorage, WKWebsiteDataTypeIndexedDBDatabases, WKWebsiteDataTypeWebSQLDatabases, WKWebsiteDataTypeResourceLoadStatistics ]];

Only API types should be in this set.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1169346</commentid>
    <comment_count>8</comment_count>
      <attachid>272541</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-02-29 19:34:39 -0800</bug_when>
    <thetext>Created attachment 272541
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1169359</commentid>
    <comment_count>9</comment_count>
      <attachid>272547</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-02-29 21:26:18 -0800</bug_when>
    <thetext>Created attachment 272547
Patch (revised per Sam, rebaselined)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1169360</commentid>
    <comment_count>10</comment_count>
      <attachid>272548</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-02-29 21:35:26 -0800</bug_when>
    <thetext>Created attachment 272548
Patch (revised per Sam, rebaselined).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1169614</commentid>
    <comment_count>11</comment_count>
      <attachid>272548</attachid>
    <who name="Sam Weinig">sam</who>
    <bug_when>2016-03-01 16:19:03 -0800</bug_when>
    <thetext>Comment on attachment 272548
Patch (revised per Sam, rebaselined).

View in context: https://bugs.webkit.org/attachment.cgi?id=272548&amp;action=review

&gt; Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm:47
&gt; +NSString * const _WKWebsiteDataTypeResourceLoadStatistics = @&quot;WKWebsiteDataTypeResourceLoadStatistics&quot;;

Please add underscore to string as well.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1169649</commentid>
    <comment_count>12</comment_count>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-03-01 17:02:03 -0800</bug_when>
    <thetext>Committed r197427: &lt;http://trac.webkit.org/changeset/197427&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>272228</attachid>
            <date>2016-02-25 13:11:45 -0800</date>
            <delta_ts>2016-02-25 14:17:36 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-154689-20160225131127.patch</filename>
            <type>text/plain</type>
            <size>8920</size>
            <attacher name="Brent Fulgham">bfulgham</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzEyOSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE2LTAyLTI1ICBCcmVudCBG
dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIFByb3ZpZGUgc3R1
YiBpbXBsZW1lbnRhdGlvbiBmb3IgV0tXZWJzaXRlRGF0YVN0b3JlCisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQ2ODkKKyAgICAgICAgPHJkYXI6Ly9w
cm9ibGVtLzI0NzAyNTc2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor
CisgICAgICAgICogU2hhcmVkL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhVHlwZXMuaDogQWRkIG5l
dyBXZWJzaXRlRGF0YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLgorICAgICAgICAqIFVJUHJv
Y2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZC5oOgorICAgICAgICAqIFVJUHJvY2Vz
cy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZC5tbToKKyAgICAgICAgKGRhdGFUeXBlc1Rv
U3RyaW5nKTogSGFuZGxlIG5ldyB0eXBlLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2Ev
V0tXZWJzaXRlRGF0YVJlY29yZEludGVybmFsLmg6CisgICAgICAgIChXZWJLaXQ6OnRvV2Vic2l0
ZURhdGFUeXBlcyk6IERpdHRvLgorICAgICAgICAoV2ViS2l0Ojp0b1dLV2Vic2l0ZURhdGFUeXBl
cyk6IERpdHRvLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0
b3JlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUu
bW06CisgICAgICAgICgrW1dLV2Vic2l0ZURhdGFTdG9yZSBhbGxXZWJzaXRlRGF0YVR5cGVzXSk6
IEFkZCBuZXcgV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljcy4KKyAgICAgICAg
KC1bV0tXZWJzaXRlRGF0YVN0b3JlIHJlbW92ZURhdGFPZlR5cGVzOmZvclVSTDpmcm9tRGF0ZTp0
b0RhdGU6Y29tcGxldGlvbkhhbmRsZXI6XSk6IEFkZGVkCisgICAgICAgIG5ldyBzdHViLgorCiAy
MDE2LTAyLTI1ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBN
b2Rlcm4gSURCOiBXZWJLaXQgMiBJUEMgbGF5ZXIuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFy
ZWQvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFUeXBlcy5oCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X
ZWJLaXQyL1NoYXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGVzLmgJKHJldmlzaW9uIDE5
NzEyNSkKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5
cGVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChD
KSAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykg
MjAxNCwgMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0
cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo
b3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s
bG93aW5nIGNvbmRpdGlvbnMKQEAgLTQ2LDYgKzQ2LDcgQEAgZW51bSBXZWJzaXRlRGF0YVR5cGVz
IHsKICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQogICAgIFdlYnNpdGVEYXRhVHlwZU1lZGlhRGV2
aWNlSWRlbnRpZmllciA9IDEgPDwgMTIsCiAjZW5kaWYKKyAgICBXZWJzaXRlRGF0YVR5cGVSZXNv
dXJjZUxvYWRTdGF0aXN0aWNzID0gMSA8PCAxMywKIH07CiAKIH07CkluZGV4OiBTb3VyY2UvV2Vi
S2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFSZWNvcmQuaAo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFSZWNv
cmQuaAkocmV2aXNpb24gMTk3MTI1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D
b2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBA
CiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl
ZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNS0yMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl
cnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5
IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw
cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNDYsNiArNDYsOSBAQCBX
S19FWFRFUk4gTlNTdHJpbmcgKiBjb25zdCBXS1dlYnNpdGVEYXRhCiAvKiEgQGNvbnN0YW50IFdL
V2Vic2l0ZURhdGFUeXBlU2Vzc2lvblN0b3JhZ2UgSFRNTCBzZXNzaW9uIHN0b3JhZ2UuICovCiBX
S19FWFRFUk4gTlNTdHJpbmcgKiBjb25zdCBXS1dlYnNpdGVEYXRhVHlwZVNlc3Npb25TdG9yYWdl
IFdLX0FWQUlMQUJMRSgxMF8xMSwgOV8wKTsKIAorLyohIEBjb25zdGFudCBXS1dlYnNpdGVEYXRh
VHlwZVJlc291cmNlTG9hZFN0YXRpc3RpY3MgUmVzb3VyY2UgbG9hZCBzdGF0aXN0aWNzLiAqLwor
V0tfRVhURVJOIE5TU3RyaW5nICogY29uc3QgV0tXZWJzaXRlRGF0YVR5cGVSZXNvdXJjZUxvYWRT
dGF0aXN0aWNzIFdLX0FWQUlMQUJMRShXS19NQUNfVEJBLCBXS19JT1NfVEJBKTsKKwogLyohIEBj
b25zdGFudCBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSBIVE1MIGxvY2FsIHN0b3JhZ2Uu
ICovCiBXS19FWFRFUk4gTlNTdHJpbmcgKiBjb25zdCBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3Rv
cmFnZSBXS19BVkFJTEFCTEUoMTBfMTEsIDlfMCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ
UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZC5tbQo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT
b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFSZWNvcmQubW0J
KHJldmlzaW9uIDE5NzEyNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev
V0tXZWJzaXRlRGF0YVJlY29yZC5tbQkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8q
Ci0gKiBDb3B5cmlnaHQgKEMpIDIwMTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor
ICogQ29weXJpZ2h0IChDKSAyMDE1LTIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk
LgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y
bXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp
ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0zNCw2ICszNCw3IEBAIE5TU3Ry
aW5nICogY29uc3QgV0tXZWJzaXRlRGF0YVR5cGVPZmZsaW4KIAogTlNTdHJpbmcgKiBjb25zdCBX
S1dlYnNpdGVEYXRhVHlwZUNvb2tpZXMgPSBAIldLV2Vic2l0ZURhdGFUeXBlQ29va2llcyI7CiBO
U1N0cmluZyAqIGNvbnN0IFdLV2Vic2l0ZURhdGFUeXBlU2Vzc2lvblN0b3JhZ2UgPSBAIldLV2Vi
c2l0ZURhdGFUeXBlU2Vzc2lvblN0b3JhZ2UiOworTlNTdHJpbmcgKiBjb25zdCBXS1dlYnNpdGVE
YXRhVHlwZVJlc291cmNlTG9hZFN0YXRpc3RpY3MgPSBAIldLV2Vic2l0ZURhdGFUeXBlUmVzb3Vy
Y2VMb2FkU3RhdGlzdGljcyI7CiAKIE5TU3RyaW5nICogY29uc3QgV0tXZWJzaXRlRGF0YVR5cGVM
b2NhbFN0b3JhZ2UgPSBAIldLV2Vic2l0ZURhdGFUeXBlTG9jYWxTdG9yYWdlIjsKIE5TU3RyaW5n
ICogY29uc3QgV0tXZWJzaXRlRGF0YVR5cGVXZWJTUUxEYXRhYmFzZXMgPSBAIldLV2Vic2l0ZURh
dGFUeXBlV2ViU1FMRGF0YWJhc2VzIjsKQEAgLTg2LDYgKzg3LDggQEAgc3RhdGljIE5TU3RyaW5n
ICpkYXRhVHlwZXNUb1N0cmluZyhOU1NldAogICAgIGlmIChbZGF0YVR5cGVzIGNvbnRhaW5zT2Jq
ZWN0Ol9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGFdKQogICAgICAgICBbYXJyYXkgYWRkT2Jq
ZWN0OkAiUGx1Zy1pbiBEYXRhIl07CiAjZW5kaWYKKyAgICBpZiAoW2RhdGFUeXBlcyBjb250YWlu
c09iamVjdDpXS1dlYnNpdGVEYXRhVHlwZVJlc291cmNlTG9hZFN0YXRpc3RpY3NdKQorICAgICAg
ICBbYXJyYXkgYWRkT2JqZWN0OkAiUmVzb3VyY2UgTG9hZCBTdGF0aXN0aWNzIl07CiAKICAgICBy
ZXR1cm4gW2FycmF5IGNvbXBvbmVudHNKb2luZWRCeVN0cmluZzpAIiwgIl07CiB9CkluZGV4OiBT
b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFSZWNvcmRJbnRl
cm5hbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev
V0tXZWJzaXRlRGF0YVJlY29yZEludGVybmFsLmgJKHJldmlzaW9uIDE5NzEyNSkKKysrIFNvdXJj
ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZEludGVybmFs
LmgJKHdvcmtpbmcgY29weSkKQEAgLTcwLDYgKzcwLDggQEAgc3RhdGljIGlubGluZSBXZWJLaXQ6
OldlYnNpdGVEYXRhVHlwZXMgdAogICAgIGlmIChbd2tXZWJzaXRlRGF0YVR5cGVzIGNvbnRhaW5z
T2JqZWN0Ol9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGFdKQogICAgICAgICB3ZWJzaXRlRGF0
YVR5cGVzIHw9IFdlYnNpdGVEYXRhVHlwZXM6OldlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGE7CiAj
ZW5kaWYKKyAgICBpZiAoW3drV2Vic2l0ZURhdGFUeXBlcyBjb250YWluc09iamVjdDpXS1dlYnNp
dGVEYXRhVHlwZVJlc291cmNlTG9hZFN0YXRpc3RpY3NdKQorICAgICAgICB3ZWJzaXRlRGF0YVR5
cGVzICE9IFdlYnNpdGVEYXRhVHlwZXM6OldlYnNpdGVEYXRhVHlwZVJlc291cmNlTG9hZFN0YXRp
c3RpY3M7CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFdlYnNpdGVEYXRhVHlwZXM+KHdlYnNpdGVE
YXRhVHlwZXMpOwogfQogCkBAIC0xMDUsNiArMTA3LDggQEAgc3RhdGljIGlubGluZSBSZXRhaW5Q
dHI8TlNTZXQ+IHRvV0tXZWJzaQogICAgIGlmICh3ZWJzaXRlRGF0YVR5cGVzICYgV2Vic2l0ZURh
dGFUeXBlczo6V2Vic2l0ZURhdGFUeXBlUGx1Z0luRGF0YSkKICAgICAgICAgW3drV2Vic2l0ZURh
dGFUeXBlcyBhZGRPYmplY3Q6X1dLV2Vic2l0ZURhdGFUeXBlUGx1Z0luRGF0YV07CiAjZW5kaWYK
KyAgICBpZiAod2Vic2l0ZURhdGFUeXBlcyAmIFdlYnNpdGVEYXRhVHlwZXM6OldlYnNpdGVEYXRh
VHlwZVJlc291cmNlTG9hZFN0YXRpc3RpY3MpCisgICAgICAgIFt3a1dlYnNpdGVEYXRhVHlwZXMg
YWRkT2JqZWN0OldLV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljc107CiAKICAg
ICByZXR1cm4gd2tXZWJzaXRlRGF0YVR5cGVzOwogfQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQ
cm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUuaAo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy
Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5oCShyZXZp
c2lvbiAxOTcxMjUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi
c2l0ZURhdGFTdG9yZS5oCSh3b3JraW5nIGNvcHkpCkBAIC03NSw2ICs3NSwxNSBAQCBXS19DTEFT
U19BVkFJTEFCTEUoMTBfMTEsIDlfMCkKICovCiAtICh2b2lkKXJlbW92ZURhdGFPZlR5cGVzOihX
S19TRVQoTlNTdHJpbmcgKikgKil3ZWJzaXRlRGF0YVR5cGVzIG1vZGlmaWVkU2luY2U6KE5TRGF0
ZSAqKWRhdGUgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5k
bGVyOwogCisvKiEgQGFic3RyYWN0IFJlbW92ZXMgYWxsIHdlYnNpdGUgZGF0YSBvZiB0aGUgZ2l2
ZW4gdHlwZXMgZm9yIGEgZ2l2ZW4gVVJMIHRoYXQgd2VyZSBjcmVhdGVkIHdpdGhpbiBhIHNwZWNp
ZmljIHJhbmdlIG9mIGRhdGVzLgorIEBwYXJhbSBkYXRhVHlwZXMgVGhlIHdlYnNpdGUgZGF0YSB0
eXBlcyB0aGF0IHNob3VsZCBiZSByZW1vdmVkLgorIEBwYXJhbSB1cmwgQSBVUkwuIEFsbCB3ZWJz
aXRlIGRhdGEgYXNzb2NpYXRlZCB3aXRoIHRoaXMgVVJMIHdpbGwgYmUgcmVtb3ZlZC4KKyBAcGFy
YW0gZnJvbURhdGUgQSBkYXRlLiBBbGwgd2Vic2l0ZSBkYXRhIG1vZGlmaWVkIGFmdGVyIHRoaXMg
ZGF0ZSB3aWxsIGJlIHJlbW92ZWQuCisgQHBhcmFtIHRvRGF0ZSBBIGRhdGUuIEFsbCB3ZWJzaXRl
IGRhdGEgbW9kaWZpZWQgcHJpb3IgdG8gdGhpcyBkYXRlIHdpbGwgYmUgcmVtb3ZlZC4KKyBAcGFy
YW0gY29tcGxldGlvbkhhbmRsZXIgQSBibG9jayB0byBpbnZva2Ugd2hlbiB0aGUgd2Vic2l0ZSBk
YXRhIGhhcyBiZWVuIHJlbW92ZWQuCisgKi8KKy0gKHZvaWQpcmVtb3ZlRGF0YU9mVHlwZXM6KFdL
X1NFVChOU1N0cmluZyAqKSAqKXdlYnNpdGVEYXRhVHlwZXMgZm9yVVJMOihOU1VSTCAqKXVybCBm
cm9tRGF0ZTooTlNEYXRlICopc3RhcnREYXRhIHRvRGF0ZTooTlNEYXRlICopZW5kRGF0ZSBjb21w
bGV0aW9uSGFuZGxlcjoodm9pZCAoXikodm9pZCkpY29tcGxldGlvbkhhbmRsZXI7CisKIEBlbmQK
IAogTlNfQVNTVU1FX05PTk5VTExfRU5ECkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv
QVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQkocmV2aXNpb24g
MTk3MTI1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVE
YXRhU3RvcmUubW0JKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJp
Z2h0IChDKSAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdo
dCAoQykgMjAxNCwgMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICog
UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv
ciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0
aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTg3LDcgKzg3LDcgQEAgKyAoTlNTZXQgKilhbGxX
ZWJzaXRlRGF0YVR5cGVzCiAgICAgc3RhdGljIGRpc3BhdGNoX29uY2VfdCBvbmNlVG9rZW47CiAg
ICAgc3RhdGljIE5TU2V0ICphbGxXZWJzaXRlRGF0YVR5cGVzOwogICAgIGRpc3BhdGNoX29uY2Uo
Jm9uY2VUb2tlbiwgXnsKLSAgICAgICAgYWxsV2Vic2l0ZURhdGFUeXBlcyA9IFtbTlNTZXQgYWxs
b2NdIGluaXRXaXRoQXJyYXk6QFsgV0tXZWJzaXRlRGF0YVR5cGVEaXNrQ2FjaGUsIFdLV2Vic2l0
ZURhdGFUeXBlTWVtb3J5Q2FjaGUsIFdLV2Vic2l0ZURhdGFUeXBlT2ZmbGluZVdlYkFwcGxpY2F0
aW9uQ2FjaGUsIFdLV2Vic2l0ZURhdGFUeXBlQ29va2llcywgV0tXZWJzaXRlRGF0YVR5cGVTZXNz
aW9uU3RvcmFnZSwgV0tXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2UsIFdLV2Vic2l0ZURhdGFU
eXBlSW5kZXhlZERCRGF0YWJhc2VzLCBXS1dlYnNpdGVEYXRhVHlwZVdlYlNRTERhdGFiYXNlcyBd
XTsKKyAgICAgICAgYWxsV2Vic2l0ZURhdGFUeXBlcyA9IFtbTlNTZXQgYWxsb2NdIGluaXRXaXRo
QXJyYXk6QFsgV0tXZWJzaXRlRGF0YVR5cGVEaXNrQ2FjaGUsIFdLV2Vic2l0ZURhdGFUeXBlTWVt
b3J5Q2FjaGUsIFdLV2Vic2l0ZURhdGFUeXBlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUsIFdL
V2Vic2l0ZURhdGFUeXBlQ29va2llcywgV0tXZWJzaXRlRGF0YVR5cGVTZXNzaW9uU3RvcmFnZSwg
V0tXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2UsIFdLV2Vic2l0ZURhdGFUeXBlSW5kZXhlZERC
RGF0YWJhc2VzLCBXS1dlYnNpdGVEYXRhVHlwZVdlYlNRTERhdGFiYXNlcywgV0tXZWJzaXRlRGF0
YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIF1dOwogICAgIH0pOwogCiAgICAgcmV0dXJuIGFs
bFdlYnNpdGVEYXRhVHlwZXM7CkBAIC0xNDMsNiArMTQzLDEyIEBAIC0gKHZvaWQpcmVtb3ZlRGF0
YU9mVHlwZXM6KE5TU2V0ICopZGF0YVQKICAgICB9KTsKIH0KIAorLSAodm9pZClyZW1vdmVEYXRh
T2ZUeXBlczooTlNTZXQgKilkYXRhVHlwZXMgZm9yVVJMOihOU1VSTCAqKXVybCBmcm9tRGF0ZToo
TlNEYXRlICopc3RhcnREYXRhIHRvRGF0ZTooTlNEYXRlICopZW5kRGF0ZSBjb21wbGV0aW9uSGFu
ZGxlcjoodm9pZCAoXikodm9pZCkpY29tcGxldGlvbkhhbmRsZXIKK3sKKyAgICAvLyBGSVhNRTog
SW1wbGVtZW50LiA8cmRhcjovL3Byb2JsZW0vMjQ3MDI1NzY+CisgICAgbm90SW1wbGVtZW50ZWQo
KTsKK30KKwogI3ByYWdtYSBtYXJrIFdLT2JqZWN0IHByb3RvY29sIGltcGxlbWVudGF0aW9uCiAK
IC0gKEFQSTo6T2JqZWN0JilfYXBpT2JqZWN0Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>272237</attachid>
            <date>2016-02-25 14:17:39 -0800</date>
            <delta_ts>2016-02-25 16:23:20 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-154689-20160225141722.patch</filename>
            <type>text/plain</type>
            <size>7431</size>
            <attacher name="Brent Fulgham">bfulgham</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzEyOSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE2LTAyLTI1ICBCcmVudCBG
dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIFN0dWIgc3VwcG9y
dCBmb3IgV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljcworICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0Njg5CisgICAgICAgIDxyZGFy
Oi8vcHJvYmxlbS8yNDcwMjU3Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICAqIFNoYXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGVzLmg6IEFk
ZCBuZXcgV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljcy4KKyAgICAgICAgKiBV
SVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFSZWNvcmQuaDoKKyAgICAgICAgKiBVSVBy
b2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFSZWNvcmQubW06CisgICAgICAgIChkYXRhVHlw
ZXNUb1N0cmluZyk6IEhhbmRsZSBuZXcgdHlwZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Nv
Y29hL1dLV2Vic2l0ZURhdGFSZWNvcmRJbnRlcm5hbC5oOgorICAgICAgICAoV2ViS2l0Ojp0b1dl
YnNpdGVEYXRhVHlwZXMpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6dG9XS1dlYnNpdGVEYXRh
VHlwZXMpOiBEaXR0by4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURh
dGFTdG9yZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0
b3JlLm1tOgorICAgICAgICAoK1tXS1dlYnNpdGVEYXRhU3RvcmUgYWxsV2Vic2l0ZURhdGFUeXBl
c10pOiBBZGQgbmV3IFdlYnNpdGVEYXRhVHlwZVJlc291cmNlTG9hZFN0YXRpc3RpY3MuCisKIDIw
MTYtMDItMjUgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIE1v
ZGVybiBJREI6IFdlYktpdCAyIElQQyBsYXllci4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJl
ZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl
YktpdDIvU2hhcmVkL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhVHlwZXMuaAkocmV2aXNpb24gMTk3
MTI5KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhVHlw
ZXMuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMp
IDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAy
MDE0LCAyMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3Ry
aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv
dXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs
b3dpbmcgY29uZGl0aW9ucwpAQCAtNDYsNiArNDYsNyBAQCBlbnVtIFdlYnNpdGVEYXRhVHlwZXMg
ewogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCiAgICAgV2Vic2l0ZURhdGFUeXBlTWVkaWFEZXZp
Y2VJZGVudGlmaWVyID0gMSA8PCAxMiwKICNlbmRpZgorICAgIFdlYnNpdGVEYXRhVHlwZVJlc291
cmNlTG9hZFN0YXRpc3RpY3MgPSAxIDw8IDEzLAogfTsKIAogfTsKSW5kZXg6IFNvdXJjZS9XZWJL
aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZC5oCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29y
ZC5oCShyZXZpc2lvbiAxOTcxMjkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv
Y29hL1dLV2Vic2l0ZURhdGFSZWNvcmQuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAK
IC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk
LgorICogQ29weXJpZ2h0IChDKSAyMDE1LTIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy
dmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg
Zm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy
b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00Niw2ICs0Niw5IEBAIFdL
X0VYVEVSTiBOU1N0cmluZyAqIGNvbnN0IFdLV2Vic2l0ZURhdGEKIC8qISBAY29uc3RhbnQgV0tX
ZWJzaXRlRGF0YVR5cGVTZXNzaW9uU3RvcmFnZSBIVE1MIHNlc3Npb24gc3RvcmFnZS4gKi8KIFdL
X0VYVEVSTiBOU1N0cmluZyAqIGNvbnN0IFdLV2Vic2l0ZURhdGFUeXBlU2Vzc2lvblN0b3JhZ2Ug
V0tfQVZBSUxBQkxFKDEwXzExLCA5XzApOwogCisvKiEgQGNvbnN0YW50IFdLV2Vic2l0ZURhdGFU
eXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljcyBSZXNvdXJjZSBsb2FkIHN0YXRpc3RpY3MuICovCitX
S19FWFRFUk4gTlNTdHJpbmcgKiBjb25zdCBXS1dlYnNpdGVEYXRhVHlwZVJlc291cmNlTG9hZFN0
YXRpc3RpY3MgV0tfQVZBSUxBQkxFKFdLX01BQ19UQkEsIFdLX0lPU19UQkEpOworCiAvKiEgQGNv
bnN0YW50IFdLV2Vic2l0ZURhdGFUeXBlTG9jYWxTdG9yYWdlIEhUTUwgbG9jYWwgc3RvcmFnZS4g
Ki8KIFdLX0VYVEVSTiBOU1N0cmluZyAqIGNvbnN0IFdLV2Vic2l0ZURhdGFUeXBlTG9jYWxTdG9y
YWdlIFdLX0FWQUlMQUJMRSgxMF8xMSwgOV8wKTsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQ
cm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkLm1tCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv
dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZC5tbQko
cmV2aXNpb24gMTk3MTI5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X
S1dlYnNpdGVEYXRhUmVjb3JkLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoK
LSAqIENvcHlyaWdodCAoQykgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg
KiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu
CiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt
cywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk
ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTM0LDYgKzM0LDcgQEAgTlNTdHJp
bmcgKiBjb25zdCBXS1dlYnNpdGVEYXRhVHlwZU9mZmxpbgogCiBOU1N0cmluZyAqIGNvbnN0IFdL
V2Vic2l0ZURhdGFUeXBlQ29va2llcyA9IEAiV0tXZWJzaXRlRGF0YVR5cGVDb29raWVzIjsKIE5T
U3RyaW5nICogY29uc3QgV0tXZWJzaXRlRGF0YVR5cGVTZXNzaW9uU3RvcmFnZSA9IEAiV0tXZWJz
aXRlRGF0YVR5cGVTZXNzaW9uU3RvcmFnZSI7CitOU1N0cmluZyAqIGNvbnN0IFdLV2Vic2l0ZURh
dGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IEAiV0tXZWJzaXRlRGF0YVR5cGVSZXNvdXJj
ZUxvYWRTdGF0aXN0aWNzIjsKIAogTlNTdHJpbmcgKiBjb25zdCBXS1dlYnNpdGVEYXRhVHlwZUxv
Y2FsU3RvcmFnZSA9IEAiV0tXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2UiOwogTlNTdHJpbmcg
KiBjb25zdCBXS1dlYnNpdGVEYXRhVHlwZVdlYlNRTERhdGFiYXNlcyA9IEAiV0tXZWJzaXRlRGF0
YVR5cGVXZWJTUUxEYXRhYmFzZXMiOwpAQCAtODYsNiArODcsOCBAQCBzdGF0aWMgTlNTdHJpbmcg
KmRhdGFUeXBlc1RvU3RyaW5nKE5TU2V0CiAgICAgaWYgKFtkYXRhVHlwZXMgY29udGFpbnNPYmpl
Y3Q6X1dLV2Vic2l0ZURhdGFUeXBlUGx1Z0luRGF0YV0pCiAgICAgICAgIFthcnJheSBhZGRPYmpl
Y3Q6QCJQbHVnLWluIERhdGEiXTsKICNlbmRpZgorICAgIGlmIChbZGF0YVR5cGVzIGNvbnRhaW5z
T2JqZWN0OldLV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljc10pCisgICAgICAg
IFthcnJheSBhZGRPYmplY3Q6QCJSZXNvdXJjZSBMb2FkIFN0YXRpc3RpY3MiXTsKIAogICAgIHJl
dHVybiBbYXJyYXkgY29tcG9uZW50c0pvaW5lZEJ5U3RyaW5nOkAiLCAiXTsKIH0KSW5kZXg6IFNv
dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZEludGVy
bmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X
S1dlYnNpdGVEYXRhUmVjb3JkSW50ZXJuYWwuaAkocmV2aXNpb24gMTk3MTI5KQorKysgU291cmNl
L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkSW50ZXJuYWwu
aAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIw
MTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE1
LTIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0
aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAog
ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu
ZyBjb25kaXRpb25zCkBAIC03MCw2ICs3MCw4IEBAIHN0YXRpYyBpbmxpbmUgV2ViS2l0OjpXZWJz
aXRlRGF0YVR5cGVzIHQKICAgICBpZiAoW3drV2Vic2l0ZURhdGFUeXBlcyBjb250YWluc09iamVj
dDpfV0tXZWJzaXRlRGF0YVR5cGVQbHVnSW5EYXRhXSkKICAgICAgICAgd2Vic2l0ZURhdGFUeXBl
cyB8PSBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVQbHVnSW5EYXRhOwogI2VuZGlm
CisgICAgaWYgKFt3a1dlYnNpdGVEYXRhVHlwZXMgY29udGFpbnNPYmplY3Q6V0tXZWJzaXRlRGF0
YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzXSkKKyAgICAgICAgd2Vic2l0ZURhdGFUeXBlcyAh
PSBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNz
OwogICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJzaXRlRGF0YVR5cGVzPih3ZWJzaXRlRGF0YVR5
cGVzKTsKIH0KIApAQCAtMTA1LDYgKzEwNyw4IEBAIHN0YXRpYyBpbmxpbmUgUmV0YWluUHRyPE5T
U2V0PiB0b1dLV2Vic2kKICAgICBpZiAod2Vic2l0ZURhdGFUeXBlcyAmIFdlYnNpdGVEYXRhVHlw
ZXM6OldlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGEpCiAgICAgICAgIFt3a1dlYnNpdGVEYXRhVHlw
ZXMgYWRkT2JqZWN0Ol9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGFdOwogI2VuZGlmCisgICAg
aWYgKHdlYnNpdGVEYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVS
ZXNvdXJjZUxvYWRTdGF0aXN0aWNzKQorICAgICAgICBbd2tXZWJzaXRlRGF0YVR5cGVzIGFkZE9i
amVjdDpXS1dlYnNpdGVEYXRhVHlwZVJlc291cmNlTG9hZFN0YXRpc3RpY3NdOwogCiAgICAgcmV0
dXJuIHdrV2Vic2l0ZURhdGFUeXBlczsKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz
cy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X
ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCShyZXZpc2lv
biAxOTcxMjkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0
ZURhdGFTdG9yZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5
cmlnaHQgKEMpIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJp
Z2h0IChDKSAyMDE0LCAyMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAg
KiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo
IG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0
IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtODcsNyArODcsNyBAQCArIChOU1NldCAqKWFs
bFdlYnNpdGVEYXRhVHlwZXMKICAgICBzdGF0aWMgZGlzcGF0Y2hfb25jZV90IG9uY2VUb2tlbjsK
ICAgICBzdGF0aWMgTlNTZXQgKmFsbFdlYnNpdGVEYXRhVHlwZXM7CiAgICAgZGlzcGF0Y2hfb25j
ZSgmb25jZVRva2VuLCBeewotICAgICAgICBhbGxXZWJzaXRlRGF0YVR5cGVzID0gW1tOU1NldCBh
bGxvY10gaW5pdFdpdGhBcnJheTpAWyBXS1dlYnNpdGVEYXRhVHlwZURpc2tDYWNoZSwgV0tXZWJz
aXRlRGF0YVR5cGVNZW1vcnlDYWNoZSwgV0tXZWJzaXRlRGF0YVR5cGVPZmZsaW5lV2ViQXBwbGlj
YXRpb25DYWNoZSwgV0tXZWJzaXRlRGF0YVR5cGVDb29raWVzLCBXS1dlYnNpdGVEYXRhVHlwZVNl
c3Npb25TdG9yYWdlLCBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSwgV0tXZWJzaXRlRGF0
YVR5cGVJbmRleGVkREJEYXRhYmFzZXMsIFdLV2Vic2l0ZURhdGFUeXBlV2ViU1FMRGF0YWJhc2Vz
IF1dOworICAgICAgICBhbGxXZWJzaXRlRGF0YVR5cGVzID0gW1tOU1NldCBhbGxvY10gaW5pdFdp
dGhBcnJheTpAWyBXS1dlYnNpdGVEYXRhVHlwZURpc2tDYWNoZSwgV0tXZWJzaXRlRGF0YVR5cGVN
ZW1vcnlDYWNoZSwgV0tXZWJzaXRlRGF0YVR5cGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSwg
V0tXZWJzaXRlRGF0YVR5cGVDb29raWVzLCBXS1dlYnNpdGVEYXRhVHlwZVNlc3Npb25TdG9yYWdl
LCBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSwgV0tXZWJzaXRlRGF0YVR5cGVJbmRleGVk
REJEYXRhYmFzZXMsIFdLV2Vic2l0ZURhdGFUeXBlV2ViU1FMRGF0YWJhc2VzLCBXS1dlYnNpdGVE
YXRhVHlwZVJlc291cmNlTG9hZFN0YXRpc3RpY3MgXV07CiAgICAgfSk7CiAKICAgICByZXR1cm4g
YWxsV2Vic2l0ZURhdGFUeXBlczsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>272260</attachid>
            <date>2016-02-25 16:23:24 -0800</date>
            <delta_ts>2016-02-29 19:34:33 -0800</delta_ts>
            <desc>Patch (Correct typo)</desc>
            <filename>bug-154689-20160225162307.patch</filename>
            <type>text/plain</type>
            <size>7431</size>
            <attacher name="Brent Fulgham">bfulgham</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzEyOSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE2LTAyLTI1ICBCcmVudCBG
dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIFN0dWIgc3VwcG9y
dCBmb3IgV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljcworICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0Njg5CisgICAgICAgIDxyZGFy
Oi8vcHJvYmxlbS8yNDcwMjU3Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICAqIFNoYXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGVzLmg6IEFk
ZCBuZXcgV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljcy4KKyAgICAgICAgKiBV
SVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFSZWNvcmQuaDoKKyAgICAgICAgKiBVSVBy
b2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFSZWNvcmQubW06CisgICAgICAgIChkYXRhVHlw
ZXNUb1N0cmluZyk6IEhhbmRsZSBuZXcgdHlwZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Nv
Y29hL1dLV2Vic2l0ZURhdGFSZWNvcmRJbnRlcm5hbC5oOgorICAgICAgICAoV2ViS2l0Ojp0b1dl
YnNpdGVEYXRhVHlwZXMpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6dG9XS1dlYnNpdGVEYXRh
VHlwZXMpOiBEaXR0by4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURh
dGFTdG9yZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0
b3JlLm1tOgorICAgICAgICAoK1tXS1dlYnNpdGVEYXRhU3RvcmUgYWxsV2Vic2l0ZURhdGFUeXBl
c10pOiBBZGQgbmV3IFdlYnNpdGVEYXRhVHlwZVJlc291cmNlTG9hZFN0YXRpc3RpY3MuCisKIDIw
MTYtMDItMjUgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIE1v
ZGVybiBJREI6IFdlYktpdCAyIElQQyBsYXllci4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJl
ZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl
YktpdDIvU2hhcmVkL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhVHlwZXMuaAkocmV2aXNpb24gMTk3
MTI5KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhVHlw
ZXMuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMp
IDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAy
MDE0LCAyMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3Ry
aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv
dXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs
b3dpbmcgY29uZGl0aW9ucwpAQCAtNDYsNiArNDYsNyBAQCBlbnVtIFdlYnNpdGVEYXRhVHlwZXMg
ewogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCiAgICAgV2Vic2l0ZURhdGFUeXBlTWVkaWFEZXZp
Y2VJZGVudGlmaWVyID0gMSA8PCAxMiwKICNlbmRpZgorICAgIFdlYnNpdGVEYXRhVHlwZVJlc291
cmNlTG9hZFN0YXRpc3RpY3MgPSAxIDw8IDEzLAogfTsKIAogfTsKSW5kZXg6IFNvdXJjZS9XZWJL
aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZC5oCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29y
ZC5oCShyZXZpc2lvbiAxOTcxMjkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv
Y29hL1dLV2Vic2l0ZURhdGFSZWNvcmQuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAK
IC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk
LgorICogQ29weXJpZ2h0IChDKSAyMDE1LTIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy
dmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg
Zm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy
b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00Niw2ICs0Niw5IEBAIFdL
X0VYVEVSTiBOU1N0cmluZyAqIGNvbnN0IFdLV2Vic2l0ZURhdGEKIC8qISBAY29uc3RhbnQgV0tX
ZWJzaXRlRGF0YVR5cGVTZXNzaW9uU3RvcmFnZSBIVE1MIHNlc3Npb24gc3RvcmFnZS4gKi8KIFdL
X0VYVEVSTiBOU1N0cmluZyAqIGNvbnN0IFdLV2Vic2l0ZURhdGFUeXBlU2Vzc2lvblN0b3JhZ2Ug
V0tfQVZBSUxBQkxFKDEwXzExLCA5XzApOwogCisvKiEgQGNvbnN0YW50IFdLV2Vic2l0ZURhdGFU
eXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljcyBSZXNvdXJjZSBsb2FkIHN0YXRpc3RpY3MuICovCitX
S19FWFRFUk4gTlNTdHJpbmcgKiBjb25zdCBXS1dlYnNpdGVEYXRhVHlwZVJlc291cmNlTG9hZFN0
YXRpc3RpY3MgV0tfQVZBSUxBQkxFKFdLX01BQ19UQkEsIFdLX0lPU19UQkEpOworCiAvKiEgQGNv
bnN0YW50IFdLV2Vic2l0ZURhdGFUeXBlTG9jYWxTdG9yYWdlIEhUTUwgbG9jYWwgc3RvcmFnZS4g
Ki8KIFdLX0VYVEVSTiBOU1N0cmluZyAqIGNvbnN0IFdLV2Vic2l0ZURhdGFUeXBlTG9jYWxTdG9y
YWdlIFdLX0FWQUlMQUJMRSgxMF8xMSwgOV8wKTsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQ
cm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkLm1tCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv
dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZC5tbQko
cmV2aXNpb24gMTk3MTI5KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X
S1dlYnNpdGVEYXRhUmVjb3JkLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoK
LSAqIENvcHlyaWdodCAoQykgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg
KiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu
CiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt
cywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk
ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTM0LDYgKzM0LDcgQEAgTlNTdHJp
bmcgKiBjb25zdCBXS1dlYnNpdGVEYXRhVHlwZU9mZmxpbgogCiBOU1N0cmluZyAqIGNvbnN0IFdL
V2Vic2l0ZURhdGFUeXBlQ29va2llcyA9IEAiV0tXZWJzaXRlRGF0YVR5cGVDb29raWVzIjsKIE5T
U3RyaW5nICogY29uc3QgV0tXZWJzaXRlRGF0YVR5cGVTZXNzaW9uU3RvcmFnZSA9IEAiV0tXZWJz
aXRlRGF0YVR5cGVTZXNzaW9uU3RvcmFnZSI7CitOU1N0cmluZyAqIGNvbnN0IFdLV2Vic2l0ZURh
dGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljcyA9IEAiV0tXZWJzaXRlRGF0YVR5cGVSZXNvdXJj
ZUxvYWRTdGF0aXN0aWNzIjsKIAogTlNTdHJpbmcgKiBjb25zdCBXS1dlYnNpdGVEYXRhVHlwZUxv
Y2FsU3RvcmFnZSA9IEAiV0tXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2UiOwogTlNTdHJpbmcg
KiBjb25zdCBXS1dlYnNpdGVEYXRhVHlwZVdlYlNRTERhdGFiYXNlcyA9IEAiV0tXZWJzaXRlRGF0
YVR5cGVXZWJTUUxEYXRhYmFzZXMiOwpAQCAtODYsNiArODcsOCBAQCBzdGF0aWMgTlNTdHJpbmcg
KmRhdGFUeXBlc1RvU3RyaW5nKE5TU2V0CiAgICAgaWYgKFtkYXRhVHlwZXMgY29udGFpbnNPYmpl
Y3Q6X1dLV2Vic2l0ZURhdGFUeXBlUGx1Z0luRGF0YV0pCiAgICAgICAgIFthcnJheSBhZGRPYmpl
Y3Q6QCJQbHVnLWluIERhdGEiXTsKICNlbmRpZgorICAgIGlmIChbZGF0YVR5cGVzIGNvbnRhaW5z
T2JqZWN0OldLV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljc10pCisgICAgICAg
IFthcnJheSBhZGRPYmplY3Q6QCJSZXNvdXJjZSBMb2FkIFN0YXRpc3RpY3MiXTsKIAogICAgIHJl
dHVybiBbYXJyYXkgY29tcG9uZW50c0pvaW5lZEJ5U3RyaW5nOkAiLCAiXTsKIH0KSW5kZXg6IFNv
dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZEludGVy
bmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X
S1dlYnNpdGVEYXRhUmVjb3JkSW50ZXJuYWwuaAkocmV2aXNpb24gMTk3MTI5KQorKysgU291cmNl
L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkSW50ZXJuYWwu
aAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIw
MTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE1
LTIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0
aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAog
ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu
ZyBjb25kaXRpb25zCkBAIC03MCw2ICs3MCw4IEBAIHN0YXRpYyBpbmxpbmUgV2ViS2l0OjpXZWJz
aXRlRGF0YVR5cGVzIHQKICAgICBpZiAoW3drV2Vic2l0ZURhdGFUeXBlcyBjb250YWluc09iamVj
dDpfV0tXZWJzaXRlRGF0YVR5cGVQbHVnSW5EYXRhXSkKICAgICAgICAgd2Vic2l0ZURhdGFUeXBl
cyB8PSBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVQbHVnSW5EYXRhOwogI2VuZGlm
CisgICAgaWYgKFt3a1dlYnNpdGVEYXRhVHlwZXMgY29udGFpbnNPYmplY3Q6V0tXZWJzaXRlRGF0
YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzXSkKKyAgICAgICAgd2Vic2l0ZURhdGFUeXBlcyB8
PSBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNz
OwogICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJzaXRlRGF0YVR5cGVzPih3ZWJzaXRlRGF0YVR5
cGVzKTsKIH0KIApAQCAtMTA1LDYgKzEwNyw4IEBAIHN0YXRpYyBpbmxpbmUgUmV0YWluUHRyPE5T
U2V0PiB0b1dLV2Vic2kKICAgICBpZiAod2Vic2l0ZURhdGFUeXBlcyAmIFdlYnNpdGVEYXRhVHlw
ZXM6OldlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGEpCiAgICAgICAgIFt3a1dlYnNpdGVEYXRhVHlw
ZXMgYWRkT2JqZWN0Ol9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGFdOwogI2VuZGlmCisgICAg
aWYgKHdlYnNpdGVEYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVS
ZXNvdXJjZUxvYWRTdGF0aXN0aWNzKQorICAgICAgICBbd2tXZWJzaXRlRGF0YVR5cGVzIGFkZE9i
amVjdDpXS1dlYnNpdGVEYXRhVHlwZVJlc291cmNlTG9hZFN0YXRpc3RpY3NdOwogCiAgICAgcmV0
dXJuIHdrV2Vic2l0ZURhdGFUeXBlczsKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz
cy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X
ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tCShyZXZpc2lv
biAxOTcxMjkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0
ZURhdGFTdG9yZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5
cmlnaHQgKEMpIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJp
Z2h0IChDKSAyMDE0LCAyMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAg
KiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRo
IG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0
IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtODcsNyArODcsNyBAQCArIChOU1NldCAqKWFs
bFdlYnNpdGVEYXRhVHlwZXMKICAgICBzdGF0aWMgZGlzcGF0Y2hfb25jZV90IG9uY2VUb2tlbjsK
ICAgICBzdGF0aWMgTlNTZXQgKmFsbFdlYnNpdGVEYXRhVHlwZXM7CiAgICAgZGlzcGF0Y2hfb25j
ZSgmb25jZVRva2VuLCBeewotICAgICAgICBhbGxXZWJzaXRlRGF0YVR5cGVzID0gW1tOU1NldCBh
bGxvY10gaW5pdFdpdGhBcnJheTpAWyBXS1dlYnNpdGVEYXRhVHlwZURpc2tDYWNoZSwgV0tXZWJz
aXRlRGF0YVR5cGVNZW1vcnlDYWNoZSwgV0tXZWJzaXRlRGF0YVR5cGVPZmZsaW5lV2ViQXBwbGlj
YXRpb25DYWNoZSwgV0tXZWJzaXRlRGF0YVR5cGVDb29raWVzLCBXS1dlYnNpdGVEYXRhVHlwZVNl
c3Npb25TdG9yYWdlLCBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSwgV0tXZWJzaXRlRGF0
YVR5cGVJbmRleGVkREJEYXRhYmFzZXMsIFdLV2Vic2l0ZURhdGFUeXBlV2ViU1FMRGF0YWJhc2Vz
IF1dOworICAgICAgICBhbGxXZWJzaXRlRGF0YVR5cGVzID0gW1tOU1NldCBhbGxvY10gaW5pdFdp
dGhBcnJheTpAWyBXS1dlYnNpdGVEYXRhVHlwZURpc2tDYWNoZSwgV0tXZWJzaXRlRGF0YVR5cGVN
ZW1vcnlDYWNoZSwgV0tXZWJzaXRlRGF0YVR5cGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSwg
V0tXZWJzaXRlRGF0YVR5cGVDb29raWVzLCBXS1dlYnNpdGVEYXRhVHlwZVNlc3Npb25TdG9yYWdl
LCBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSwgV0tXZWJzaXRlRGF0YVR5cGVJbmRleGVk
REJEYXRhYmFzZXMsIFdLV2Vic2l0ZURhdGFUeXBlV2ViU1FMRGF0YWJhc2VzLCBXS1dlYnNpdGVE
YXRhVHlwZVJlc291cmNlTG9hZFN0YXRpc3RpY3MgXV07CiAgICAgfSk7CiAKICAgICByZXR1cm4g
YWxsV2Vic2l0ZURhdGFUeXBlczsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>272541</attachid>
            <date>2016-02-29 19:34:39 -0800</date>
            <delta_ts>2016-02-29 21:26:11 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-154689-20160229193440.patch</filename>
            <type>text/plain</type>
            <size>5805</size>
            <attacher name="Brent Fulgham">bfulgham</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzEyOSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE2LTAyLTI5ICBCcmVudCBG
dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIFN0dWIgc3VwcG9y
dCBmb3IgV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljcworICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0Njg5CisgICAgICAgIDxyZGFy
Oi8vcHJvYmxlbS8yNDcwMjU3Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICAqIFNoYXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGVzLmg6IEFk
ZCBuZXcgV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljcy4KKyAgICAgICAgKiBV
SVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFSZWNvcmQubW06CisgICAgICAgIChkYXRh
VHlwZXNUb1N0cmluZyk6IEhhbmRsZSBuZXcgdHlwZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ
L0NvY29hL1dLV2Vic2l0ZURhdGFSZWNvcmRJbnRlcm5hbC5oOgorICAgICAgICAoV2ViS2l0Ojp0
b1dlYnNpdGVEYXRhVHlwZXMpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6dG9XS1dlYnNpdGVE
YXRhVHlwZXMpOiBEaXR0by4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0
ZURhdGFSZWNvcmRQcml2YXRlLmg6IEFkZCBuZXcgX1dlYnNpdGVEYXRhVHlwZVJlc291cmNlTG9h
ZFN0YXRpc3RpY3MuCisKIDIwMTYtMDItMjUgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu
Y29tPgogCiAgICAgICAgIE1vZGVybiBJREI6IFdlYktpdCAyIElQQyBsYXllci4KSW5kZXg6IFNv
dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGVzLmgKPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhVHlw
ZXMuaAkocmV2aXNpb24gMTk3MTI5KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYnNpdGVE
YXRhL1dlYnNpdGVEYXRhVHlwZXMuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8q
Ci0gKiBDb3B5cmlnaHQgKEMpIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor
ICogQ29weXJpZ2h0IChDKSAyMDE0LCAyMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl
ZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv
cm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92
aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNDYsNiArNDYsNyBAQCBlbnVt
IFdlYnNpdGVEYXRhVHlwZXMgewogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCiAgICAgV2Vic2l0
ZURhdGFUeXBlTWVkaWFEZXZpY2VJZGVudGlmaWVyID0gMSA8PCAxMiwKICNlbmRpZgorICAgIFdl
YnNpdGVEYXRhVHlwZVJlc291cmNlTG9hZFN0YXRpc3RpY3MgPSAxIDw8IDEzLAogfTsKIAogfTsK
SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJl
Y29yZC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h
L1dLV2Vic2l0ZURhdGFSZWNvcmQubW0JKHJldmlzaW9uIDE5NzEyOSkKKysrIFNvdXJjZS9XZWJL
aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZC5tbQkod29ya2luZyBj
b3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTUgQXBwbGUgSW5j
LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE1LTIwMTYgQXBwbGUg
SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug
aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0
aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z
CkBAIC00Miw2ICs0Miw3IEBAIE5TU3RyaW5nICogY29uc3QgV0tXZWJzaXRlRGF0YVR5cGVJbmRl
eGUKIE5TU3RyaW5nICogY29uc3QgX1dLV2Vic2l0ZURhdGFUeXBlTWVkaWFLZXlzID0gQCJfV0tX
ZWJzaXRlRGF0YVR5cGVNZWRpYUtleXMiOwogTlNTdHJpbmcgKiBjb25zdCBfV0tXZWJzaXRlRGF0
YVR5cGVIU1RTQ2FjaGUgPSBAIl9XS1dlYnNpdGVEYXRhVHlwZUhTVFNDYWNoZSI7CiBOU1N0cmlu
ZyAqIGNvbnN0IF9XS1dlYnNpdGVEYXRhVHlwZVNlYXJjaEZpZWxkUmVjZW50U2VhcmNoZXMgPSBA
Il9XS1dlYnNpdGVEYXRhVHlwZVNlYXJjaEZpZWxkUmVjZW50U2VhcmNoZXMiOworTlNTdHJpbmcg
KiBjb25zdCBfV0tXZWJzaXRlRGF0YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzID0gQCJXS1dl
YnNpdGVEYXRhVHlwZVJlc291cmNlTG9hZFN0YXRpc3RpY3MiOwogCiAjaWYgUExBVEZPUk0oTUFD
KQogTlNTdHJpbmcgKiBjb25zdCBfV0tXZWJzaXRlRGF0YVR5cGVQbHVnSW5EYXRhID0gQCJfV0tX
ZWJzaXRlRGF0YVR5cGVQbHVnSW5EYXRhIjsKQEAgLTg2LDYgKzg3LDggQEAgc3RhdGljIE5TU3Ry
aW5nICpkYXRhVHlwZXNUb1N0cmluZyhOU1NldAogICAgIGlmIChbZGF0YVR5cGVzIGNvbnRhaW5z
T2JqZWN0Ol9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGFdKQogICAgICAgICBbYXJyYXkgYWRk
T2JqZWN0OkAiUGx1Zy1pbiBEYXRhIl07CiAjZW5kaWYKKyAgICBpZiAoW2RhdGFUeXBlcyBjb250
YWluc09iamVjdDpfV0tXZWJzaXRlRGF0YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzXSkKKyAg
ICAgICAgW2FycmF5IGFkZE9iamVjdDpAIlJlc291cmNlIExvYWQgU3RhdGlzdGljcyJdOwogCiAg
ICAgcmV0dXJuIFthcnJheSBjb21wb25lbnRzSm9pbmVkQnlTdHJpbmc6QCIsICJdOwogfQpJbmRl
eDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhUmVjb3Jk
SW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv
Y29hL1dLV2Vic2l0ZURhdGFSZWNvcmRJbnRlcm5hbC5oCShyZXZpc2lvbiAxOTcxMjkpCisrKyBT
b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFSZWNvcmRJbnRl
cm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAo
QykgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMp
IDIwMTUtMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0
cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo
b3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s
bG93aW5nIGNvbmRpdGlvbnMKQEAgLTcwLDYgKzcwLDggQEAgc3RhdGljIGlubGluZSBXZWJLaXQ6
OldlYnNpdGVEYXRhVHlwZXMgdAogICAgIGlmIChbd2tXZWJzaXRlRGF0YVR5cGVzIGNvbnRhaW5z
T2JqZWN0Ol9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGFdKQogICAgICAgICB3ZWJzaXRlRGF0
YVR5cGVzIHw9IFdlYnNpdGVEYXRhVHlwZXM6OldlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGE7CiAj
ZW5kaWYKKyAgICBpZiAoW3drV2Vic2l0ZURhdGFUeXBlcyBjb250YWluc09iamVjdDpfV0tXZWJz
aXRlRGF0YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzXSkKKyAgICAgICAgd2Vic2l0ZURhdGFU
eXBlcyB8PSBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVSZXNvdXJjZUxvYWRTdGF0
aXN0aWNzOwogICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJzaXRlRGF0YVR5cGVzPih3ZWJzaXRl
RGF0YVR5cGVzKTsKIH0KIApAQCAtMTA1LDYgKzEwNyw4IEBAIHN0YXRpYyBpbmxpbmUgUmV0YWlu
UHRyPE5TU2V0PiB0b1dLV2Vic2kKICAgICBpZiAod2Vic2l0ZURhdGFUeXBlcyAmIFdlYnNpdGVE
YXRhVHlwZXM6OldlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGEpCiAgICAgICAgIFt3a1dlYnNpdGVE
YXRhVHlwZXMgYWRkT2JqZWN0Ol9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGFdOwogI2VuZGlm
CisgICAgaWYgKHdlYnNpdGVEYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0
YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzKQorICAgICAgICBbd2tXZWJzaXRlRGF0YVR5cGVz
IGFkZE9iamVjdDpfV0tXZWJzaXRlRGF0YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzXTsKIAog
ICAgIHJldHVybiB3a1dlYnNpdGVEYXRhVHlwZXM7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V
SVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFSZWNvcmRQcml2YXRlLmgKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhUmVj
b3JkUHJpdmF0ZS5oCShyZXZpc2lvbiAxOTcxMjkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl
c3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFSZWNvcmRQcml2YXRlLmgJKHdvcmtpbmcgY29weSkK
QEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE1IEFwcGxlIEluYy4gQWxs
IHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNS0yMDE2IEFwcGxlIEluYy4g
QWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv
dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwg
YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAt
MzAsNiArMzAsOCBAQAogV0tfRVhURVJOIE5TU3RyaW5nICogY29uc3QgX1dLV2Vic2l0ZURhdGFU
eXBlSFNUU0NhY2hlIFdLX0FWQUlMQUJMRSgxMF8xMSwgOV8wKTsKIFdLX0VYVEVSTiBOU1N0cmlu
ZyAqIGNvbnN0IF9XS1dlYnNpdGVEYXRhVHlwZU1lZGlhS2V5cyBXS19BVkFJTEFCTEUoMTBfMTEs
IDlfMCk7CiBXS19FWFRFUk4gTlNTdHJpbmcgKiBjb25zdCBfV0tXZWJzaXRlRGF0YVR5cGVTZWFy
Y2hGaWVsZFJlY2VudFNlYXJjaGVzIFdLX0FWQUlMQUJMRShXS19NQUNfVEJBLCBXS19JT1NfVEJB
KTsKK1dLX0VYVEVSTiBOU1N0cmluZyAqIGNvbnN0IF9XS1dlYnNpdGVEYXRhVHlwZVJlc291cmNl
TG9hZFN0YXRpc3RpY3MgV0tfQVZBSUxBQkxFKFdLX01BQ19UQkEsIFdLX0lPU19UQkEpOworCiAK
ICNpZiAhVEFSR0VUX09TX0lQSE9ORQogV0tfRVhURVJOIE5TU3RyaW5nICogY29uc3QgX1dLV2Vi
c2l0ZURhdGFUeXBlUGx1Z0luRGF0YSBXS19BVkFJTEFCTEUoMTBfMTEsIE5BKTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>272547</attachid>
            <date>2016-02-29 21:26:18 -0800</date>
            <delta_ts>2016-02-29 21:34:21 -0800</delta_ts>
            <desc>Patch (revised per Sam, rebaselined)</desc>
            <filename>bug-154689-20160229212601.patch</filename>
            <type>text/plain</type>
            <size>5473</size>
            <attacher name="Brent Fulgham">bfulgham</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzM4MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE2LTAyLTI5ICBCcmVudCBG
dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIFN0dWIgc3VwcG9y
dCBmb3IgV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljcworICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0Njg5CisgICAgICAgIDxyZGFy
Oi8vcHJvYmxlbS8yNDcwMjU3Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICAqIFNoYXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGUuaDogQWRk
IG5ldyBXZWJzaXRlRGF0YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLgorICAgICAgICAqIFVJ
UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZC5tbToKKyAgICAgICAgKGRhdGFU
eXBlc1RvU3RyaW5nKTogSGFuZGxlIG5ldyB0eXBlLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv
Q29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZEludGVybmFsLmg6CisgICAgICAgIChXZWJLaXQ6OnRv
V2Vic2l0ZURhdGFUeXBlcyk6IERpdHRvLgorICAgICAgICAoV2ViS2l0Ojp0b1dLV2Vic2l0ZURh
dGFUeXBlcyk6IERpdHRvLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRl
RGF0YVJlY29yZFByaXZhdGUuaDogQWRkIG5ldyBfV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2Fk
U3RhdGlzdGljcy4KKwogMjAxNi0wMi0yOSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw
cGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdGhlIGV4cGVyaW1lbnRhbCBmZWF0dXJlIG9mIGFu
dGlhbGlhc2VkIGZvbnQgZGlsYXRpb24KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJz
aXRlRGF0YS9XZWJzaXRlRGF0YVR5cGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9T
aGFyZWQvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFUeXBlLmgJKHJldmlzaW9uIDE5NzM4MykKKysr
IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGUuaAkod29y
a2luZyBjb3B5KQpAQCAtNDYsNiArNDYsNyBAQCBlbnVtIGNsYXNzIFdlYnNpdGVEYXRhVHlwZSB7
CiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKICAgICBNZWRpYURldmljZUlkZW50aWZpZXIgPSAx
IDw8IDEyLAogI2VuZGlmCisgICAgV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGlj
cyA9IDEgPDwgMTMsCiB9OwogCiB9OwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ
SS9Db2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZC5tbQkocmV2aXNpb24g
MTk3MzgzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVE
YXRhUmVjb3JkLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHly
aWdodCAoQykgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln
aHQgKEMpIDIwMTUtMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICog
UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv
ciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0
aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTQ0LDYgKzQ0LDcgQEAgTlNTdHJpbmcgKiBjb25z
dCBXS1dlYnNpdGVEYXRhVHlwZUluZGV4ZQogTlNTdHJpbmcgKiBjb25zdCBfV0tXZWJzaXRlRGF0
YVR5cGVNZWRpYUtleXMgPSBAIl9XS1dlYnNpdGVEYXRhVHlwZU1lZGlhS2V5cyI7CiBOU1N0cmlu
ZyAqIGNvbnN0IF9XS1dlYnNpdGVEYXRhVHlwZUhTVFNDYWNoZSA9IEAiX1dLV2Vic2l0ZURhdGFU
eXBlSFNUU0NhY2hlIjsKIE5TU3RyaW5nICogY29uc3QgX1dLV2Vic2l0ZURhdGFUeXBlU2VhcmNo
RmllbGRSZWNlbnRTZWFyY2hlcyA9IEAiX1dLV2Vic2l0ZURhdGFUeXBlU2VhcmNoRmllbGRSZWNl
bnRTZWFyY2hlcyI7CitOU1N0cmluZyAqIGNvbnN0IF9XS1dlYnNpdGVEYXRhVHlwZVJlc291cmNl
TG9hZFN0YXRpc3RpY3MgPSBAIldLV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGlj
cyI7CiAKICNpZiBQTEFURk9STShNQUMpCiBOU1N0cmluZyAqIGNvbnN0IF9XS1dlYnNpdGVEYXRh
VHlwZVBsdWdJbkRhdGEgPSBAIl9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGEiOwpAQCAtODgs
NiArODksOCBAQCBzdGF0aWMgTlNTdHJpbmcgKmRhdGFUeXBlc1RvU3RyaW5nKE5TU2V0CiAgICAg
aWYgKFtkYXRhVHlwZXMgY29udGFpbnNPYmplY3Q6X1dLV2Vic2l0ZURhdGFUeXBlUGx1Z0luRGF0
YV0pCiAgICAgICAgIFthcnJheSBhZGRPYmplY3Q6QCJQbHVnLWluIERhdGEiXTsKICNlbmRpZgor
ICAgIGlmIChbZGF0YVR5cGVzIGNvbnRhaW5zT2JqZWN0Ol9XS1dlYnNpdGVEYXRhVHlwZVJlc291
cmNlTG9hZFN0YXRpc3RpY3NdKQorICAgICAgICBbYXJyYXkgYWRkT2JqZWN0OkAiUmVzb3VyY2Ug
TG9hZCBTdGF0aXN0aWNzIl07CiAKICAgICByZXR1cm4gW2FycmF5IGNvbXBvbmVudHNKb2luZWRC
eVN0cmluZzpAIiwgIl07CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv
Y29hL1dLV2Vic2l0ZURhdGFSZWNvcmRJbnRlcm5hbC5oCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X
ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZEludGVybmFsLmgJ
KHJldmlzaW9uIDE5NzM4MykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev
V0tXZWJzaXRlRGF0YVJlY29yZEludGVybmFsLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1
IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl
cnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNS0yMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy
ZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu
YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl
ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNjgsNiArNjgsOCBA
QCBzdGF0aWMgaW5saW5lIE9wdGlvbmFsPFdlYnNpdGVEYXRhVHlwZT4gCiAgICAgaWYgKFt3ZWJz
aXRlRGF0YVR5cGUgaXNFcXVhbFRvU3RyaW5nOl9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGFd
KQogICAgICAgICByZXR1cm4gV2Vic2l0ZURhdGFUeXBlOjpQbHVnSW5EYXRhOwogI2VuZGlmCisg
ICAgaWYgKFt3ZWJzaXRlRGF0YVR5cGVzIGlzRXF1YWxUb1N0cmluZzpfV0tXZWJzaXRlRGF0YVR5
cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzXSkKKyAgICAgICAgcmV0dXJuIFdlYnNpdGVEYXRhVHlw
ZTo6V2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljczsKIAogICAgIHJldHVybiBO
dWxsb3B0OwogfQpAQCAtMTE0LDYgKzExNiw4IEBAIHN0YXRpYyBpbmxpbmUgUmV0YWluUHRyPE5T
U2V0PiB0b1dLV2Vic2kKICAgICBpZiAod2Vic2l0ZURhdGFUeXBlcy5jb250YWlucyhXZWJzaXRl
RGF0YVR5cGU6OlBsdWdJbkRhdGEpKQogICAgICAgICBbd2tXZWJzaXRlRGF0YVR5cGVzIGFkZE9i
amVjdDpfV0tXZWJzaXRlRGF0YVR5cGVQbHVnSW5EYXRhXTsKICNlbmRpZgorICAgIGlmICh3ZWJz
aXRlRGF0YVR5cGVzICYgV2Vic2l0ZURhdGFUeXBlczo6V2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VM
b2FkU3RhdGlzdGljcykKKyAgICAgICAgW3drV2Vic2l0ZURhdGFUeXBlcyBhZGRPYmplY3Q6X1dL
V2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljc107CiAKICAgICByZXR1cm4gd2tX
ZWJzaXRlRGF0YVR5cGVzOwogfQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D
b2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X
ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZFByaXZhdGUuaAko
cmV2aXNpb24gMTk3MzgzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X
S1dlYnNpdGVEYXRhUmVjb3JkUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBA
QAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2
ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz
ZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy
eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg
cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTM0LDYgKzM0LDggQEAg
TlNfQVNTVU1FX05PTk5VTExfQkVHSU4KIFdLX0VYVEVSTiBOU1N0cmluZyAqIGNvbnN0IF9XS1dl
YnNpdGVEYXRhVHlwZUhTVFNDYWNoZSBXS19BVkFJTEFCTEUoMTBfMTEsIDlfMCk7CiBXS19FWFRF
Uk4gTlNTdHJpbmcgKiBjb25zdCBfV0tXZWJzaXRlRGF0YVR5cGVNZWRpYUtleXMgV0tfQVZBSUxB
QkxFKDEwXzExLCA5XzApOwogV0tfRVhURVJOIE5TU3RyaW5nICogY29uc3QgX1dLV2Vic2l0ZURh
dGFUeXBlU2VhcmNoRmllbGRSZWNlbnRTZWFyY2hlcyBXS19BVkFJTEFCTEUoV0tfTUFDX1RCQSwg
V0tfSU9TX1RCQSk7CitXS19FWFRFUk4gTlNTdHJpbmcgKiBjb25zdCBfV0tXZWJzaXRlRGF0YVR5
cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIFdLX0FWQUlMQUJMRShXS19NQUNfVEJBLCBXS19JT1Nf
VEJBKTsKKwogCiAjaWYgIVRBUkdFVF9PU19JUEhPTkUKIFdLX0VYVEVSTiBOU1N0cmluZyAqIGNv
bnN0IF9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGEgV0tfQVZBSUxBQkxFKDEwXzExLCBOQSk7
Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>272548</attachid>
            <date>2016-02-29 21:35:26 -0800</date>
            <delta_ts>2016-03-01 16:19:03 -0800</delta_ts>
            <desc>Patch (revised per Sam, rebaselined).</desc>
            <filename>bug-154689-20160229213511.patch</filename>
            <type>text/plain</type>
            <size>5479</size>
            <attacher name="Brent Fulgham">bfulgham</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzM4MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE2LTAyLTI5ICBCcmVudCBG
dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIFN0dWIgc3VwcG9y
dCBmb3IgV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljcworICAgICAgICBodHRw
czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0Njg5CisgICAgICAgIDxyZGFy
Oi8vcHJvYmxlbS8yNDcwMjU3Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICAqIFNoYXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGUuaDogQWRk
IG5ldyBXZWJzaXRlRGF0YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLgorICAgICAgICAqIFVJ
UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZC5tbToKKyAgICAgICAgKGRhdGFU
eXBlc1RvU3RyaW5nKTogSGFuZGxlIG5ldyB0eXBlLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv
Q29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZEludGVybmFsLmg6CisgICAgICAgIChXZWJLaXQ6OnRv
V2Vic2l0ZURhdGFUeXBlcyk6IERpdHRvLgorICAgICAgICAoV2ViS2l0Ojp0b1dLV2Vic2l0ZURh
dGFUeXBlcyk6IERpdHRvLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRl
RGF0YVJlY29yZFByaXZhdGUuaDogQWRkIG5ldyBfV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2Fk
U3RhdGlzdGljcy4KKwogMjAxNi0wMi0yOSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFw
cGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdGhlIGV4cGVyaW1lbnRhbCBmZWF0dXJlIG9mIGFu
dGlhbGlhc2VkIGZvbnQgZGlsYXRpb24KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJz
aXRlRGF0YS9XZWJzaXRlRGF0YVR5cGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9T
aGFyZWQvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFUeXBlLmgJKHJldmlzaW9uIDE5NzM4MykKKysr
IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVR5cGUuaAkod29y
a2luZyBjb3B5KQpAQCAtNDYsNiArNDYsNyBAQCBlbnVtIGNsYXNzIFdlYnNpdGVEYXRhVHlwZSB7
CiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKICAgICBNZWRpYURldmljZUlkZW50aWZpZXIgPSAx
IDw8IDEyLAogI2VuZGlmCisgICAgV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGlj
cyA9IDEgPDwgMTMsCiB9OwogCiB9OwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ
SS9Db2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZC5tbQkocmV2aXNpb24g
MTk3MzgzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVE
YXRhUmVjb3JkLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHly
aWdodCAoQykgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln
aHQgKEMpIDIwMTUtMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICog
UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv
ciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0
aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTQ0LDYgKzQ0LDcgQEAgTlNTdHJpbmcgKiBjb25z
dCBXS1dlYnNpdGVEYXRhVHlwZUluZGV4ZQogTlNTdHJpbmcgKiBjb25zdCBfV0tXZWJzaXRlRGF0
YVR5cGVNZWRpYUtleXMgPSBAIl9XS1dlYnNpdGVEYXRhVHlwZU1lZGlhS2V5cyI7CiBOU1N0cmlu
ZyAqIGNvbnN0IF9XS1dlYnNpdGVEYXRhVHlwZUhTVFNDYWNoZSA9IEAiX1dLV2Vic2l0ZURhdGFU
eXBlSFNUU0NhY2hlIjsKIE5TU3RyaW5nICogY29uc3QgX1dLV2Vic2l0ZURhdGFUeXBlU2VhcmNo
RmllbGRSZWNlbnRTZWFyY2hlcyA9IEAiX1dLV2Vic2l0ZURhdGFUeXBlU2VhcmNoRmllbGRSZWNl
bnRTZWFyY2hlcyI7CitOU1N0cmluZyAqIGNvbnN0IF9XS1dlYnNpdGVEYXRhVHlwZVJlc291cmNl
TG9hZFN0YXRpc3RpY3MgPSBAIldLV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGlj
cyI7CiAKICNpZiBQTEFURk9STShNQUMpCiBOU1N0cmluZyAqIGNvbnN0IF9XS1dlYnNpdGVEYXRh
VHlwZVBsdWdJbkRhdGEgPSBAIl9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGEiOwpAQCAtODgs
NiArODksOCBAQCBzdGF0aWMgTlNTdHJpbmcgKmRhdGFUeXBlc1RvU3RyaW5nKE5TU2V0CiAgICAg
aWYgKFtkYXRhVHlwZXMgY29udGFpbnNPYmplY3Q6X1dLV2Vic2l0ZURhdGFUeXBlUGx1Z0luRGF0
YV0pCiAgICAgICAgIFthcnJheSBhZGRPYmplY3Q6QCJQbHVnLWluIERhdGEiXTsKICNlbmRpZgor
ICAgIGlmIChbZGF0YVR5cGVzIGNvbnRhaW5zT2JqZWN0Ol9XS1dlYnNpdGVEYXRhVHlwZVJlc291
cmNlTG9hZFN0YXRpc3RpY3NdKQorICAgICAgICBbYXJyYXkgYWRkT2JqZWN0OkAiUmVzb3VyY2Ug
TG9hZCBTdGF0aXN0aWNzIl07CiAKICAgICByZXR1cm4gW2FycmF5IGNvbXBvbmVudHNKb2luZWRC
eVN0cmluZzpAIiwgIl07CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv
Y29hL1dLV2Vic2l0ZURhdGFSZWNvcmRJbnRlcm5hbC5oCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X
ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZEludGVybmFsLmgJ
KHJldmlzaW9uIDE5NzM4MykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev
V0tXZWJzaXRlRGF0YVJlY29yZEludGVybmFsLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1
IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl
cnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNS0yMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy
ZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu
YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl
ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNjgsNiArNjgsOCBA
QCBzdGF0aWMgaW5saW5lIE9wdGlvbmFsPFdlYnNpdGVEYXRhVHlwZT4gCiAgICAgaWYgKFt3ZWJz
aXRlRGF0YVR5cGUgaXNFcXVhbFRvU3RyaW5nOl9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGFd
KQogICAgICAgICByZXR1cm4gV2Vic2l0ZURhdGFUeXBlOjpQbHVnSW5EYXRhOwogI2VuZGlmCisg
ICAgaWYgKFt3ZWJzaXRlRGF0YVR5cGUgaXNFcXVhbFRvU3RyaW5nOl9XS1dlYnNpdGVEYXRhVHlw
ZVJlc291cmNlTG9hZFN0YXRpc3RpY3NdKQorICAgICAgICByZXR1cm4gV2Vic2l0ZURhdGFUeXBl
OjpXZWJzaXRlRGF0YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOwogCiAgICAgcmV0dXJuIE51
bGxvcHQ7CiB9CkBAIC0xMTQsNiArMTE2LDggQEAgc3RhdGljIGlubGluZSBSZXRhaW5QdHI8TlNT
ZXQ+IHRvV0tXZWJzaQogICAgIGlmICh3ZWJzaXRlRGF0YVR5cGVzLmNvbnRhaW5zKFdlYnNpdGVE
YXRhVHlwZTo6UGx1Z0luRGF0YSkpCiAgICAgICAgIFt3a1dlYnNpdGVEYXRhVHlwZXMgYWRkT2Jq
ZWN0Ol9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGFdOwogI2VuZGlmCisgICAgaWYgKHdlYnNp
dGVEYXRhVHlwZXMuY29udGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpXZWJzaXRlRGF0YVR5cGVSZXNv
dXJjZUxvYWRTdGF0aXN0aWNzKSkKKyAgICAgICAgW3drV2Vic2l0ZURhdGFUeXBlcyBhZGRPYmpl
Y3Q6X1dLV2Vic2l0ZURhdGFUeXBlUmVzb3VyY2VMb2FkU3RhdGlzdGljc107CiAKICAgICByZXR1
cm4gd2tXZWJzaXRlRGF0YVR5cGVzOwogfQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz
L0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv
dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZFByaXZh
dGUuaAkocmV2aXNpb24gMTk3MzgzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D
b2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUg
KzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdodHMg
cmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdo
dHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k
IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt
aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTM0LDYgKzM0
LDggQEAgTlNfQVNTVU1FX05PTk5VTExfQkVHSU4KIFdLX0VYVEVSTiBOU1N0cmluZyAqIGNvbnN0
IF9XS1dlYnNpdGVEYXRhVHlwZUhTVFNDYWNoZSBXS19BVkFJTEFCTEUoMTBfMTEsIDlfMCk7CiBX
S19FWFRFUk4gTlNTdHJpbmcgKiBjb25zdCBfV0tXZWJzaXRlRGF0YVR5cGVNZWRpYUtleXMgV0tf
QVZBSUxBQkxFKDEwXzExLCA5XzApOwogV0tfRVhURVJOIE5TU3RyaW5nICogY29uc3QgX1dLV2Vi
c2l0ZURhdGFUeXBlU2VhcmNoRmllbGRSZWNlbnRTZWFyY2hlcyBXS19BVkFJTEFCTEUoV0tfTUFD
X1RCQSwgV0tfSU9TX1RCQSk7CitXS19FWFRFUk4gTlNTdHJpbmcgKiBjb25zdCBfV0tXZWJzaXRl
RGF0YVR5cGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIFdLX0FWQUlMQUJMRShXS19NQUNfVEJBLCBX
S19JT1NfVEJBKTsKKwogCiAjaWYgIVRBUkdFVF9PU19JUEhPTkUKIFdLX0VYVEVSTiBOU1N0cmlu
ZyAqIGNvbnN0IF9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGEgV0tfQVZBSUxBQkxFKDEwXzEx
LCBOQSk7Cg==
</data>
<flag name="review"
          id="297318"
          type_id="1"
          status="+"
          setter="sam"
    />
          </attachment>
      

    </bug>

</bugzilla>