<?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>87672</bug_id>
          
          <creation_ts>2012-05-28 09:56:41 -0700</creation_ts>
          <short_desc>[Qt] Add quirks for running the web process in a profiler shell, like valgrind</short_desc>
          <delta_ts>2012-07-24 06:15:09 -0700</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>528+ (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>Qt, QtTriaged</keywords>
          <priority>P3</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Balazs Kelemen">kbalazs</reporter>
          <assigned_to name="Balazs Kelemen">kbalazs</assigned_to>
          <cc>cmarcelo</cc>
    
    <cc>jturcotte</cc>
    
    <cc>menard</cc>
    
    <cc>vestbo</cc>
    
    <cc>webkit.review.bot</cc>
    
    <cc>zherczeg</cc>
    
    <cc>zoltan</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>635299</commentid>
    <comment_count>0</comment_count>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-05-28 09:56:41 -0700</bug_when>
    <thetext>The only reliable way to run the web process in valgrind is to change ProcessLauncherQt.cpp.
I think it&apos;s worth to add an env var quirk for this.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>635306</commentid>
    <comment_count>1</comment_count>
      <attachid>144381</attachid>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-05-28 10:18:32 -0700</bug_when>
    <thetext>Created attachment 144381
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>635708</commentid>
    <comment_count>2</comment_count>
      <attachid>144381</attachid>
    <who name="Caio Marcelo de Oliveira Filho">cmarcelo</who>
    <bug_when>2012-05-29 01:25:50 -0700</bug_when>
    <thetext>Comment on attachment 144381
Patch

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

Cool! :-)  I have some comments. I wish these debugging features / environment variables were more discoverable, maybe we could add a --help to our main.cpp to describe them?

&gt; Source/WebKit2/ChangeLog:9
&gt; +        Consider the enironment variables QT_WEB_PROCESS_COMMAND_PREFIX
&gt; +        and QT_PLUGIN_PROCESS_COMMAND_PREFIX. If set use their values as

Typo &quot;environment&quot;. I think it would be clearer to just say: &quot;If environment variables QT_WEB_... and QT_PLUGIN_... are set, use their values...&quot;.

Also other environment variables use QT_WEBKIT_ prefix, maybe we should follow the same here.

&gt; Tools/ChangeLog:8
&gt; +        Add a dedicated environment variable quirk (QT_WTR_NO_TIMEOUT)

Why existing --no-timeout option is not enough?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>635894</commentid>
    <comment_count>3</comment_count>
      <attachid>144525</attachid>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-05-29 04:55:17 -0700</bug_when>
    <thetext>Created attachment 144525
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>635896</commentid>
    <comment_count>4</comment_count>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-05-29 04:58:00 -0700</bug_when>
    <thetext>(In reply to comment #2)
&gt; (From update of attachment 144381 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=144381&amp;action=review
&gt; 
&gt; Cool! :-)  I have some comments. I wish these debugging features / environment variables were more discoverable, maybe we could add a --help to our main.cpp to describe them?

I don&apos;t think it belongs to either MiniBrowser or WebKitTestRunner. I will update the wiki with these ;)

&gt; 
&gt; &gt; Source/WebKit2/ChangeLog:9
&gt; &gt; +        Consider the enironment variables QT_WEB_PROCESS_COMMAND_PREFIX
&gt; &gt; +        and QT_PLUGIN_PROCESS_COMMAND_PREFIX. If set use their values as
&gt; 
&gt; Typo &quot;environment&quot;. I think it would be clearer to just say: &quot;If environment variables QT_WEB_... and QT_PLUGIN_... are set, use their values...&quot;.
&gt; 
&gt; Also other environment variables use QT_WEBKIT_ prefix, maybe we should follow the same here.

Fixed both.

&gt; 
&gt; &gt; Tools/ChangeLog:8
&gt; &gt; +        Add a dedicated environment variable quirk (QT_WTR_NO_TIMEOUT)
&gt; 
&gt; Why existing --no-timeout option is not enough?

Good point, I removed that.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>635951</commentid>
    <comment_count>5</comment_count>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-05-29 06:26:22 -0700</bug_when>
    <thetext>&gt; 
&gt; &gt; 
&gt; &gt; &gt; Tools/ChangeLog:8
&gt; &gt; &gt; +        Add a dedicated environment variable quirk (QT_WTR_NO_TIMEOUT)
&gt; &gt; 
&gt; &gt; Why existing --no-timeout option is not enough?
&gt; 
&gt; Good point, I removed that.

Hm, actually it is not enough, because it only disables the watchdog timer, not the runloop timer. But it&apos;s another bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>639964</commentid>
    <comment_count>6</comment_count>
      <attachid>144525</attachid>
    <who name="Simon Hausmann">hausmann</who>
    <bug_when>2012-06-01 23:43:09 -0700</bug_when>
    <thetext>Comment on attachment 144525
Patch

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

I think this is a very good idea (r+). But please fix the string handling before landing. Just call qgetenv() every time and remember to use constData() if you can.

In this case I would even argue that the use of arg() is overkill, this is merely about concatenating a bunch of strings, so perhaps it would make sense to use the string builder in Qt with the % operator:

http://doc-snapshot.qt-project.org/5.0/qstring.html#more-efficient-string-construction

&gt; Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:105
&gt; +    static QByteArray webProcessPrefix = qgetenv(&quot;QT_WEBKIT_WEB_PROCESS_COMMAND_PREFIX&quot;);
&gt; +    static QByteArray pluginProcessPrefix = qgetenv(&quot;QT_WEBKIT_PLUGIN_PROCESS_COMMAND_PREFIX&quot;);

I wouldn&apos;t simply bother with making those global variables. The strings are already global in the environment and we don&apos;t launch processes often enough to IMHO justify the time we &quot;save&quot; by not extracting the strings again out of the environment. At the same time the _copy_ of the string uses memory for no reason :)

&gt; Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:118
&gt; +    QString commandLine = prefix.isEmpty() ? QStringLiteral(&quot;%1 %2&quot;) : QString(QStringLiteral(&quot;%1 %2 %3&quot;)).arg(QLatin1String(prefix.data()));

By calling data() instead of constData() you&apos;ll end up creating a copy of the QByteArray for no reason. The non-const data() calls detach() and will detach because the refcount will be 2 (the original prefix variable holds one ref, the local prefix variable another one).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>640023</commentid>
    <comment_count>7</comment_count>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-06-02 07:02:50 -0700</bug_when>
    <thetext>(In reply to comment #5)
&gt; &gt; 
&gt; &gt; &gt; 
&gt; &gt; &gt; &gt; Tools/ChangeLog:8
&gt; &gt; &gt; &gt; +        Add a dedicated environment variable quirk (QT_WTR_NO_TIMEOUT)
&gt; &gt; &gt; 
&gt; &gt; &gt; Why existing --no-timeout option is not enough?
&gt; &gt; 
&gt; &gt; Good point, I removed that.
&gt; 
&gt; Hm, actually it is not enough, because it only disables the watchdog timer, not the runloop timer. But it&apos;s another bug.

No, I misread it. It should be enough.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>640039</commentid>
    <comment_count>8</comment_count>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-06-02 10:17:17 -0700</bug_when>
    <thetext>(In reply to comment #6)
&gt; (From update of attachment 144525 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=144525&amp;action=review
&gt; 
&gt; I think this is a very good idea (r+). But please fix the string handling before landing. Just call qgetenv() every time and remember to use constData() if you can.
&gt; 
&gt; In this case I would even argue that the use of arg() is overkill, this is merely about concatenating a bunch of strings, so perhaps it would make sense to use the string builder in Qt with the % operator:

Thanks for the detailed review. It&apos;s enough for another round, so I&apos;m going to upload a new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>640040</commentid>
    <comment_count>9</comment_count>
      <attachid>145449</attachid>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-06-02 10:20:11 -0700</bug_when>
    <thetext>Created attachment 145449
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>642528</commentid>
    <comment_count>10</comment_count>
      <attachid>145449</attachid>
    <who name="Tor Arne Vestbø">vestbo</who>
    <bug_when>2012-06-06 09:09:52 -0700</bug_when>
    <thetext>Comment on attachment 145449
Patch

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

&gt; Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:110
&gt; +        commandLine = commandLine % static_cast&lt;QString&gt;(executablePathOfWebProcess());

static_cast?

&gt; Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:115
&gt; +        commandLine = commandLine % static_cast&lt;QString&gt;(executablePathOfPluginProcess());

??</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>642576</commentid>
    <comment_count>11</comment_count>
      <attachid>146057</attachid>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-06-06 10:19:04 -0700</bug_when>
    <thetext>Created attachment 146057
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>646926</commentid>
    <comment_count>12</comment_count>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-06-12 07:40:18 -0700</bug_when>
    <thetext>(In reply to comment #7)
&gt; (In reply to comment #5)
&gt; &gt; &gt; 
&gt; &gt; &gt; &gt; 
&gt; &gt; &gt; &gt; &gt; Tools/ChangeLog:8
&gt; &gt; &gt; &gt; &gt; +        Add a dedicated environment variable quirk (QT_WTR_NO_TIMEOUT)
&gt; &gt; &gt; &gt; 
&gt; &gt; &gt; &gt; Why existing --no-timeout option is not enough?
&gt; &gt; &gt; 
&gt; &gt; &gt; Good point, I removed that.
&gt; &gt; 
&gt; &gt; Hm, actually it is not enough, because it only disables the watchdog timer, not the runloop timer. But it&apos;s another bug.
&gt; 
&gt; No, I misread it. It should be enough.

D&apos;oh, misread again. It&apos;s enough with QT_WEBKIT2_DEBUG but we don&apos;t want this with valgrind. I&apos;m going to add a switch for the responsiveness timer.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>646941</commentid>
    <comment_count>13</comment_count>
      <attachid>147087</attachid>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-06-12 07:59:05 -0700</bug_when>
    <thetext>Created attachment 147087
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>647987</commentid>
    <comment_count>14</comment_count>
      <attachid>147087</attachid>
    <who name="Tor Arne Vestbø">vestbo</who>
    <bug_when>2012-06-13 07:22:33 -0700</bug_when>
    <thetext>Comment on attachment 147087
Patch

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

&gt; Tools/WebKitTestRunner/TestController.cpp:569
&gt; +    if (!m_useRensponsivityTimer) {
&gt; +        platformRunUntil(done, m_noTimeout);
&gt; +        return;
&gt; +    }
&gt; +

Why don&apos;t we just call runUntil() with NoTimeout ?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>648010</commentid>
    <comment_count>15</comment_count>
      <attachid>147315</attachid>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-06-13 07:56:27 -0700</bug_when>
    <thetext>Created attachment 147315
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>666730</commentid>
    <comment_count>16</comment_count>
      <attachid>147315</attachid>
    <who name="Jocelyn Turcotte">jturcotte</who>
    <bug_when>2012-07-11 07:09:14 -0700</bug_when>
    <thetext>Comment on attachment 147315
Patch

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

&gt; Source/WebKit2/ChangeLog:9
&gt; +        and/or QT_WEBKIT_PLUGIN_PROCESS_COMMAND_PREFIX set, use their

*are* set,

&gt; Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:107
&gt; +        QByteArray webProcessPrefix = qgetenv(&quot;QT_WEBKIT_WEB_PROCESS_COMMAND_PREFIX&quot;);

1. This is pretty long
2. It would be nice if this name would align with QT_WEBKIT2_DEBUG since their use cases are related.
So maybe we could name them QT_WEBKIT2_WP_CMD_PREFIX and QT_WEBKIT2_PP_CMD_PREFIX?

&gt; Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:110
&gt; +        if (!webProcessPrefix.isEmpty())
&gt; +            commandLine = QLatin1String(webProcessPrefix.constData()) % QLatin1Char(&apos; &apos;);
&gt; +        commandLine = commandLine % QString(executablePathOfWebProcess());

This can be simplified to:
commandLine = QLatin1String(webProcessPrefix.constData()) % QLatin1Char(&apos; &apos;) % QString(executablePathOfWebProcess());

&gt; Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:153
&gt; -    commandLine = commandLine.arg(sockets[0]);
&gt; +    commandLine = commandLine % QLatin1Char(&apos; &apos;) % QString::number(sockets[0]);

You can leave that one as it is, arg() is perfect for this and reads better if you have to convert to numbers anyway.

&gt; Tools/ChangeLog:11
&gt; +        profiling purposes because it only effects the timeout

it only *affects*

&gt; Tools/WebKitTestRunner/TestController.cpp:264
&gt; +        if (argument == &quot;--no-runloop-timeout&quot;) {

I&apos;m wondering if it wouldn&apos;t be better to just also avoid the timer in TestControllerQt if m_useWaitToDumpWatchdogTimer is false. Please try it and if it works I would avoid adding an extra command line argument which might cause confusion. A lot of people that tried to run this into valgrind probably tried --no-timout because it sounds right from that point of view.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>666777</commentid>
    <comment_count>17</comment_count>
      <attachid>147315</attachid>
    <who name="Jocelyn Turcotte">jturcotte</who>
    <bug_when>2012-07-11 08:41:41 -0700</bug_when>
    <thetext>Comment on attachment 147315
Patch

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

&gt;&gt; Tools/WebKitTestRunner/TestController.cpp:264
&gt;&gt; +        if (argument == &quot;--no-runloop-timeout&quot;) {
&gt; 
&gt; I&apos;m wondering if it wouldn&apos;t be better to just also avoid the timer in TestControllerQt if m_useWaitToDumpWatchdogTimer is false. Please try it and if it works I would avoid adding an extra command line argument which might cause confusion. A lot of people that tried to run this into valgrind probably tried --no-timout because it sounds right from that point of view.

Ok talked on IRC and that would probably break performance tests, so let&apos;s add a switch and maybe rename it to something clearer to those not wanting to read the code.

&gt; Tools/WebKitTestRunner/TestController.cpp:571
&gt; +    if (!m_useRunloopTimer) {
&gt; +        platformRunUntil(done, m_noTimeout);
&gt; +        return;
&gt; +    }
&gt; +
&gt;      double timeout;
&gt;      switch (timeoutDuration) {

Try to avoid the duplicate call to platformRunUntil.
Something like:

double timeout = m_noTimeout;
if (m_useRunLoopTimer) {
    switch (timeoutDuration) {
    ....

&gt; Tools/WebKitTestRunner/TestController.h:132
&gt; +    bool m_useRunloopTimer;

Maybe rename this to m_forceNoTimeout.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>666790</commentid>
    <comment_count>18</comment_count>
      <attachid>151715</attachid>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-07-11 09:17:48 -0700</bug_when>
    <thetext>Created attachment 151715
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>666794</commentid>
    <comment_count>19</comment_count>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-07-11 09:20:44 -0700</bug_when>
    <thetext>(In reply to comment #16)
&gt; (From update of attachment 147315 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=147315&amp;action=review
&gt; 
&gt; &gt; Source/WebKit2/ChangeLog:9
&gt; &gt; +        and/or QT_WEBKIT_PLUGIN_PROCESS_COMMAND_PREFIX set, use their
&gt; 
&gt; *are* set,
&gt; 
&gt; &gt; Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:107
&gt; &gt; +        QByteArray webProcessPrefix = qgetenv(&quot;QT_WEBKIT_WEB_PROCESS_COMMAND_PREFIX&quot;);
&gt; 
&gt; 1. This is pretty long
&gt; 2. It would be nice if this name would align with QT_WEBKIT2_DEBUG since their use cases are related.
&gt; So maybe we could name them QT_WEBKIT2_WP_CMD_PREFIX and QT_WEBKIT2_PP_CMD_PREFIX?

Done, done.

&gt; 
&gt; &gt; Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:110
&gt; &gt; +        if (!webProcessPrefix.isEmpty())
&gt; &gt; +            commandLine = QLatin1String(webProcessPrefix.constData()) % QLatin1Char(&apos; &apos;);
&gt; &gt; +        commandLine = commandLine % QString(executablePathOfWebProcess());
&gt; 
&gt; This can be simplified to:
&gt; commandLine = QLatin1String(webProcessPrefix.constData()) % QLatin1Char(&apos; &apos;) % QString(executablePathOfWebProcess());
&gt; 
&gt; &gt; Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:153
&gt; &gt; -    commandLine = commandLine.arg(sockets[0]);
&gt; &gt; +    commandLine = commandLine % QLatin1Char(&apos; &apos;) % QString::number(sockets[0]);
&gt; 
&gt; You can leave that one as it is, arg() is perfect for this and reads better if you have to convert to numbers anyway.

Simplified and changed back to use QString::arg as discussed on irc since it is more readable and it only runs once so we should not bother optmising it.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>666795</commentid>
    <comment_count>20</comment_count>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-07-11 09:21:10 -0700</bug_when>
    <thetext>(In reply to comment #17)
&gt; (From update of attachment 147315 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=147315&amp;action=review
&gt; 
&gt; &gt;&gt; Tools/WebKitTestRunner/TestController.cpp:264
&gt; &gt;&gt; +        if (argument == &quot;--no-runloop-timeout&quot;) {
&gt; &gt; 
&gt; &gt; I&apos;m wondering if it wouldn&apos;t be better to just also avoid the timer in TestControllerQt if m_useWaitToDumpWatchdogTimer is false. Please try it and if it works I would avoid adding an extra command line argument which might cause confusion. A lot of people that tried to run this into valgrind probably tried --no-timout because it sounds right from that point of view.
&gt; 
&gt; Ok talked on IRC and that would probably break performance tests, so let&apos;s add a switch and maybe rename it to something clearer to those not wanting to read the code.
&gt; 
&gt; &gt; Tools/WebKitTestRunner/TestController.cpp:571
&gt; &gt; +    if (!m_useRunloopTimer) {
&gt; &gt; +        platformRunUntil(done, m_noTimeout);
&gt; &gt; +        return;
&gt; &gt; +    }
&gt; &gt; +
&gt; &gt;      double timeout;
&gt; &gt;      switch (timeoutDuration) {
&gt; 
&gt; Try to avoid the duplicate call to platformRunUntil.
&gt; Something like:
&gt; 
&gt; double timeout = m_noTimeout;
&gt; if (m_useRunLoopTimer) {
&gt;     switch (timeoutDuration) {
&gt;     ....
&gt; 
&gt; &gt; Tools/WebKitTestRunner/TestController.h:132
&gt; &gt; +    bool m_useRunloopTimer;
&gt; 
&gt; Maybe rename this to m_forceNoTimeout.

Done, done.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>668907</commentid>
    <comment_count>21</comment_count>
      <attachid>151715</attachid>
    <who name="Jocelyn Turcotte">jturcotte</who>
    <bug_when>2012-07-13 05:24:03 -0700</bug_when>
    <thetext>Comment on attachment 151715
Patch

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

&gt; Tools/ChangeLog:12
&gt; +        profiling purposes because it only affects the timeout
&gt; +        for running the actual test and we should keep this

&quot;for running the actual test&quot; could read something like &quot;when waiting for the end of a test&quot; to be clearer.

&gt; Tools/WebKitTestRunner/TestController.cpp:264
&gt; +        if (argument == &quot;--no-timeout-for-all&quot;) {

&quot;No timeout for all&quot; doesn&apos;t read so well with my limited english skills. Maybe --no-timeout-at-all or --no-timeout-ever or --no-timeout-for-debugging?

&gt; Tools/WebKitTestRunner/TestController.cpp:265
&gt; +            m_useWaitToDumpWatchdogTimer = false;

That line won&apos;t have any effect as far as I know, since both ShortTimeout and LongTimeout will be the same as NoTimeout with your changes to runUntil.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>669091</commentid>
    <comment_count>22</comment_count>
      <attachid>152271</attachid>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-07-13 08:55:09 -0700</bug_when>
    <thetext>Created attachment 152271
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>669101</commentid>
    <comment_count>23</comment_count>
      <attachid>152272</attachid>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-07-13 09:02:06 -0700</bug_when>
    <thetext>Created attachment 152272
Patch

synced changelog</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>669103</commentid>
    <comment_count>24</comment_count>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-07-13 09:02:43 -0700</bug_when>
    <thetext>(In reply to comment #21)
&gt; (From update of attachment 151715 [details])
&gt; View in context: https://bugs.webkit.org/attachment.cgi?id=151715&amp;action=review
&gt; 
&gt; &gt; Tools/ChangeLog:12
&gt; &gt; +        profiling purposes because it only affects the timeout
&gt; &gt; +        for running the actual test and we should keep this
&gt; 
&gt; &quot;for running the actual test&quot; could read something like &quot;when waiting for the end of a test&quot; to be clearer.

Fixed, and expanded the explanation so hopefully it is more understandable now.

&gt; 
&gt; &gt; Tools/WebKitTestRunner/TestController.cpp:264
&gt; &gt; +        if (argument == &quot;--no-timeout-for-all&quot;) {
&gt; 
&gt; &quot;No timeout for all&quot; doesn&apos;t read so well with my limited english skills. Maybe --no-timeout-at-all or --no-timeout-ever or --no-timeout-for-debugging?

Fixed, I choose --no-timeout-at-all.

&gt; 
&gt; &gt; Tools/WebKitTestRunner/TestController.cpp:265
&gt; &gt; +            m_useWaitToDumpWatchdogTimer = false;
&gt; 
&gt; That line won&apos;t have any effect as far as I know, since both ShortTimeout and LongTimeout will be the same as NoTimeout with your changes to runUntil.

It is also used by the injected bundle, it is passed to it in TestInvocation::invoke.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>676732</commentid>
    <comment_count>25</comment_count>
      <attachid>152272</attachid>
    <who name="Jocelyn Turcotte">jturcotte</who>
    <bug_when>2012-07-24 06:08:56 -0700</bug_when>
    <thetext>Comment on attachment 152272
Patch

(In reply to comment #24)
&gt; It is also used by the injected bundle, it is passed to it in TestInvocation::invoke.

Yep you&apos;re right, ok looks good!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>676735</commentid>
    <comment_count>26</comment_count>
      <attachid>152272</attachid>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-07-24 06:15:02 -0700</bug_when>
    <thetext>Comment on attachment 152272
Patch

Clearing flags on attachment: 152272

Committed r123464: &lt;http://trac.webkit.org/changeset/123464&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>676736</commentid>
    <comment_count>27</comment_count>
    <who name="Balazs Kelemen">kbalazs</who>
    <bug_when>2012-07-24 06:15:09 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>144381</attachid>
            <date>2012-05-28 10:18:32 -0700</date>
            <delta_ts>2012-05-29 04:55:10 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-87672-20120528191830.patch</filename>
            <type>text/plain</type>
            <size>4448</size>
            <attacher name="Balazs Kelemen">kbalazs</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NjMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOWM4ZWZhODllYmI5YWE5
ZGFiNTI3NTU0NWYwY2RjZGExM2YyYThhOS4uYWQ1MjEwMGZmNGVmNTk5ODJmMjJmMmMwMGQwMDVi
MzRmOTAwMjkwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA1LTI4ICBCYWxh
enMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRdIEFkZCBxdWly
a3MgZm9yIHJ1bm5pbmcgdGhlIHdlYiBwcm9jZXNzIGluIGEgcHJvZmlsZXIgc2hlbGwsIGxpa2Ug
dmFsZ3JpbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTg3NjcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
Q29uc2lkZXIgdGhlIGVuaXJvbm1lbnQgdmFyaWFibGVzIFFUX1dFQl9QUk9DRVNTX0NPTU1BTkRf
UFJFRklYCisgICAgICAgIGFuZCBRVF9QTFVHSU5fUFJPQ0VTU19DT01NQU5EX1BSRUZJWC4gSWYg
c2V0IHVzZSB0aGVpciB2YWx1ZXMgYXMKKyAgICAgICAgdGhlIHByZWZpeCBvZiB0aGUgY29tbWFu
ZCB3aGVuIGxhdW5jaGluZyB0aGUgY2hpbGQgcHJvY2Vzcy4KKyAgICAgICAgRXhhbXBsZSB1c2Fn
ZToKKyAgICAgICAgICAgIFFUX1dFQl9QUk9DRVNTX0NPTU1BTkRfUFJFRklYPSJ2YWxncmluZCAt
LXNtYy1jaGVjaz1hbGwiIC4vTWluaUJyb3dzZXIKKworICAgICAgICAqIFVJUHJvY2Vzcy9MYXVu
Y2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NM
YXVuY2hlcjo6bGF1bmNoUHJvY2Vzcyk6CisKIDIwMTItMDUtMjYgIEdlb2ZmcmV5IEdhcmVuICA8
Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJLaXQgc2hvdWxkIGJlIGxhenktZmluYWxp
emF0aW9uLXNhZmUgKGVzcC4gdGhlIERPTSkgdjIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy
L1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5jcHAgYi9Tb3VyY2UvV2Vi
S2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwCmluZGV4IGM1
YzNmNzE0NWRlNmM4OTFjNDVhMmQ1NjYwMDA4MjQ5MGE4NzVmZDEuLmM4MDhkYjAwNjM1MzgzZDlh
Yjc5NGI1YzgyMDA4OTljNTEyYjE1N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv
Y2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5jcHAKKysrIGIvU291cmNlL1dlYktp
dDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcApAQCAtMTAxLDkg
KzEwMSwyMiBAQCB2b2lkIFF0V2ViUHJvY2Vzczo6c2V0dXBDaGlsZFByb2Nlc3MoKQogCiB2b2lk
IFByb2Nlc3NMYXVuY2hlcjo6bGF1bmNoUHJvY2VzcygpCiB7Ci0gICAgUVN0cmluZyBjb21tYW5k
TGluZSA9IFFMYXRpbjFTdHJpbmcoIiUxICUyIik7Ci0gICAgY29tbWFuZExpbmUgPSBjb21tYW5k
TGluZS5hcmcobV9sYXVuY2hPcHRpb25zLnByb2Nlc3NUeXBlID09IFdlYlByb2Nlc3MgPwotICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV4ZWN1dGFibGVQYXRoT2ZXZWJQcm9jZXNz
KCkgOiBleGVjdXRhYmxlUGF0aE9mUGx1Z2luUHJvY2VzcygpKTsKKyAgICBzdGF0aWMgUUJ5dGVB
cnJheSB3ZWJQcm9jZXNzUHJlZml4ID0gcWdldGVudigiUVRfV0VCX1BST0NFU1NfQ09NTUFORF9Q
UkVGSVgiKTsKKyAgICBzdGF0aWMgUUJ5dGVBcnJheSBwbHVnaW5Qcm9jZXNzUHJlZml4ID0gcWdl
dGVudigiUVRfUExVR0lOX1BST0NFU1NfQ09NTUFORF9QUkVGSVgiKTsKKworICAgIFFTdHJpbmcg
ZXhlY3V0YWJsZVBhdGg7CisgICAgUUJ5dGVBcnJheSBwcmVmaXg7CisgICAgaWYgKG1fbGF1bmNo
T3B0aW9ucy5wcm9jZXNzVHlwZSA9PSBXZWJQcm9jZXNzKSB7CisgICAgICAgIHByZWZpeCA9IHdl
YlByb2Nlc3NQcmVmaXg7CisgICAgICAgIGV4ZWN1dGFibGVQYXRoID0gZXhlY3V0YWJsZVBhdGhP
ZldlYlByb2Nlc3MoKTsKKyAgICB9IGVsc2UgaWYgKG1fbGF1bmNoT3B0aW9ucy5wcm9jZXNzVHlw
ZSA9PSBQbHVnaW5Qcm9jZXNzKSB7CisgICAgICAgIHByZWZpeCA9IHBsdWdpblByb2Nlc3NQcmVm
aXg7CisgICAgICAgIGV4ZWN1dGFibGVQYXRoID0gZXhlY3V0YWJsZVBhdGhPZlBsdWdpblByb2Nl
c3MoKTsKKyAgICB9IGVsc2UKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisKKyAgICBR
U3RyaW5nIGNvbW1hbmRMaW5lID0gcHJlZml4LmlzRW1wdHkoKSA/IFFTdHJpbmdMaXRlcmFsKCIl
MSAlMiIpIDogUVN0cmluZyhRU3RyaW5nTGl0ZXJhbCgiJTEgJTIgJTMiKSkuYXJnKFFMYXRpbjFT
dHJpbmcocHJlZml4LmRhdGEoKSkpOworICAgIGNvbW1hbmRMaW5lID0gY29tbWFuZExpbmUuYXJn
KGV4ZWN1dGFibGVQYXRoKTsKIAogI2lmIE9TKERBUldJTikKICAgICAvLyBDcmVhdGUgdGhlIGxp
c3RlbmluZyBwb3J0LgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl
TG9nCmluZGV4IGU4NjkwMGZlNTVkMWZmY2IyMDUzNDQ1OGZjNTdjMTg1OTQxYTMzMmUuLjViOTcy
NWQ5Y2MzMTk2MGEwNTFjYTM5YTM3MmFkN2NmNmZkYmRlMTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No
YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wNS0y
OCAgQmFsYXpzIEtlbGVtZW4gIDxrYmFsYXpzQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1F0XSBB
ZGQgcXVpcmtzIGZvciBydW5uaW5nIHRoZSB3ZWIgcHJvY2VzcyBpbiBhIHByb2ZpbGVyIHNoZWxs
LCBsaWtlIHZhbGdyaW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn
LmNnaT9pZD04NzY3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIEFkZCBhIGRlZGljYXRlZCBlbnZpcm9ubWVudCB2YXJpYWJsZSBxdWlyayAoUVRfV1RS
X05PX1RJTUVPVVQpCisgICAgICAgIGZvciBkaXNhYmxpbmcgdGhlIHRpbWVvdXQgY2hlY2suIFdl
IGRvbid0IHdhbnQgdG8gc2V0IFFUX1dFQktJVDJfREVCVUcKKyAgICAgICAgd2hlbiBjaGVja2lu
ZyBhIHNsb3cgdGVzdCBvciBydW5uaW5nIHRlc3RzIGluIHZhbGdyaW5kIGJlY2F1c2UgaXQKKyAg
ICAgICAgYWxzbyBleHBlY3RzIHVzIHRvIGF0dGFjaCB0byB0aGUgd2ViIHByb2Nlc3Mgd2l0aCB0
aGUgZGVidWdnZXIuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL3F0L1Rlc3RDb250cm9s
bGVyUXQuY3BwOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1SdW5VbnRp
bCk6CisKIDIwMTItMDUtMjcgIERhdmlkIEJhcnRvbiAgPGRiYXJ0b25AbWF0aHNjcmliZS5jb20+
CiAKICAgICAgICAgW3dhdGNobGlzdF0gSW1wcm92ZSBNYXRoTUwgcnVsZQpkaWZmIC0tZ2l0IGEv
VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9UZXN0Q29udHJvbGxlclF0LmNwcCBiL1Rvb2xzL1dl
YktpdFRlc3RSdW5uZXIvcXQvVGVzdENvbnRyb2xsZXJRdC5jcHAKaW5kZXggMTU4ZTgwODlhYzg2
YmJkOTU1NzVlM2JmODA5YmI3ODk3NmQ2NWRjMi4uNjc5OWVjMGYyNTA4Y2ZiOTY0NTJmZmViOThl
ZmNjMTcxYjBkZWVjMyAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9UZXN0
Q29udHJvbGxlclF0LmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL3F0L1Rlc3RDb250
cm9sbGVyUXQuY3BwCkBAIC01NSw3ICs1NSwxMCBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpwbGF0
Zm9ybUluaXRpYWxpemUoKQogCiB2b2lkIFRlc3RDb250cm9sbGVyOjpwbGF0Zm9ybVJ1blVudGls
KGJvb2wmIGNvbmRpdGlvbiwgZG91YmxlIHRpbWVvdXQpCiB7Ci0gICAgaWYgKHFnZXRlbnYoIlFU
X1dFQktJVDJfREVCVUciKSA9PSAiMSIgfHwgdGltZW91dCA9PSBtX25vVGltZW91dCkgeworICAg
IHN0YXRpYyBib29sIGlzU2V0V2ViS2l0MkRlYnVnID0gcWdldGVudigiUVRfV0VCS0lUMl9ERUJV
RyIpID09ICIxIjsKKyAgICBzdGF0aWMgYm9vbCBpc1NldE5vVGltZW91dCA9IHFnZXRlbnYoIlFU
X1dUUl9OT19USU1FT1VUIikgPT0gIjEiOworCisgICAgaWYgKGlzU2V0V2ViS2l0MkRlYnVnIHx8
IGlzU2V0Tm9UaW1lb3V0IHx8IHRpbWVvdXQgPT0gbV9ub1RpbWVvdXQpIHsKICAgICAgICAgLy8g
TmV2ZXIgdGltZW91dCBpZiB3ZSBhcmUgZGVidWdnaW5nIG9yIG5vdCBtZWFudCB0byB0aW1lb3V0
LgogICAgICAgICB3aGlsZSAoIWNvbmRpdGlvbikKICAgICAgICAgICAgIFFDb3JlQXBwbGljYXRp
b246OnByb2Nlc3NFdmVudHMoUUV2ZW50TG9vcDo6RXhjbHVkZVVzZXJJbnB1dEV2ZW50cywgNTAp
Owo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>144525</attachid>
            <date>2012-05-29 04:55:17 -0700</date>
            <delta_ts>2012-06-02 10:20:05 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-87672-20120529135510.patch</filename>
            <type>text/plain</type>
            <size>2634</size>
            <attacher name="Balazs Kelemen">kbalazs</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDA5YjJjNTY0MDkyOTUz
MTQ4MWRlODk0MmYwMmNhMTc2ZTNkMThmMC4uNzc5YmI0YzcxZWUyNjhlNDU5NjI3ZWZmN2ViMTg4
OTgwMmRjYjI2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA1LTI5ICBCYWxh
enMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRdIEFkZCBxdWly
a3MgZm9yIHJ1bm5pbmcgdGhlIHdlYiBwcm9jZXNzIGluIGEgcHJvZmlsZXIgc2hlbGwsIGxpa2Ug
dmFsZ3JpbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTg3NjcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
SWYgZW52aXJvbm1lbnQgdmFyaWFibGVzIFFUX1dFQktJVF9XRUJfUFJPQ0VTU19DT01NQU5EX1BS
RUZJWAorICAgICAgICBhbmQvb3IgUVRfV0VCS0lUX1BMVUdJTl9QUk9DRVNTX0NPTU1BTkRfUFJF
RklYIHNldCwgdXNlIHRoZWlyCisgICAgICAgIHZhbHVlcyBhcyB0aGUgcHJlZml4IG9mIHRoZSBj
b21tYW5kIHdoZW4gbGF1bmNoaW5nIHRoZSBjaGlsZCBwcm9jZXNzLgorICAgICAgICBFeGFtcGxl
IHVzYWdlOgorICAgICAgICAgICAgUVRfV0VCX1BST0NFU1NfQ09NTUFORF9QUkVGSVg9InZhbGdy
aW5kIC0tc21jLWNoZWNrPWFsbCIgLi9NaW5pQnJvd3NlcgorCisgICAgICAgICogVUlQcm9jZXNz
L0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJv
Y2Vzc0xhdW5jaGVyOjpsYXVuY2hQcm9jZXNzKToKKwogMjAxMi0wNS0yOSAgQ2FybG9zIEdhcmNp
YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIHJldHVy
biB2YWx1ZSBpbmZvcm1hdGlvbiB0byBXZWJLaXRXZWJWaWV3Ojpsb2FkLWZhaWxlZCBzaWduYWwg
ZG9jdW1lbnRhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5j
aGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9M
YXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5jcHAKaW5kZXggYzVjM2Y3MTQ1ZGU2Yzg5MWM0
NWEyZDU2NjAwMDgyNDkwYTg3NWZkMS4uNzI5ZGMxNjYwNGVlY2ZiYTcwNjljYWZlMmRmYmU1ZWU2
MTIyMzIwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0
L1Byb2Nlc3NMYXVuY2hlclF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1
bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwCkBAIC0xMDEsOSArMTAxLDIyIEBAIHZvaWQg
UXRXZWJQcm9jZXNzOjpzZXR1cENoaWxkUHJvY2VzcygpCiAKIHZvaWQgUHJvY2Vzc0xhdW5jaGVy
OjpsYXVuY2hQcm9jZXNzKCkKIHsKLSAgICBRU3RyaW5nIGNvbW1hbmRMaW5lID0gUUxhdGluMVN0
cmluZygiJTEgJTIiKTsKLSAgICBjb21tYW5kTGluZSA9IGNvbW1hbmRMaW5lLmFyZyhtX2xhdW5j
aE9wdGlvbnMucHJvY2Vzc1R5cGUgPT0gV2ViUHJvY2VzcyA/Ci0gICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgZXhlY3V0YWJsZVBhdGhPZldlYlByb2Nlc3MoKSA6IGV4ZWN1dGFibGVQ
YXRoT2ZQbHVnaW5Qcm9jZXNzKCkpOworICAgIHN0YXRpYyBRQnl0ZUFycmF5IHdlYlByb2Nlc3NQ
cmVmaXggPSBxZ2V0ZW52KCJRVF9XRUJLSVRfV0VCX1BST0NFU1NfQ09NTUFORF9QUkVGSVgiKTsK
KyAgICBzdGF0aWMgUUJ5dGVBcnJheSBwbHVnaW5Qcm9jZXNzUHJlZml4ID0gcWdldGVudigiUVRf
V0VCS0lUX1BMVUdJTl9QUk9DRVNTX0NPTU1BTkRfUFJFRklYIik7CisKKyAgICBRU3RyaW5nIGV4
ZWN1dGFibGVQYXRoOworICAgIFFCeXRlQXJyYXkgcHJlZml4OworICAgIGlmIChtX2xhdW5jaE9w
dGlvbnMucHJvY2Vzc1R5cGUgPT0gV2ViUHJvY2VzcykgeworICAgICAgICBwcmVmaXggPSB3ZWJQ
cm9jZXNzUHJlZml4OworICAgICAgICBleGVjdXRhYmxlUGF0aCA9IGV4ZWN1dGFibGVQYXRoT2ZX
ZWJQcm9jZXNzKCk7CisgICAgfSBlbHNlIGlmIChtX2xhdW5jaE9wdGlvbnMucHJvY2Vzc1R5cGUg
PT0gUGx1Z2luUHJvY2VzcykgeworICAgICAgICBwcmVmaXggPSBwbHVnaW5Qcm9jZXNzUHJlZml4
OworICAgICAgICBleGVjdXRhYmxlUGF0aCA9IGV4ZWN1dGFibGVQYXRoT2ZQbHVnaW5Qcm9jZXNz
KCk7CisgICAgfSBlbHNlCisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworCisgICAgUVN0
cmluZyBjb21tYW5kTGluZSA9IHByZWZpeC5pc0VtcHR5KCkgPyBRU3RyaW5nTGl0ZXJhbCgiJTEg
JTIiKSA6IFFTdHJpbmcoUVN0cmluZ0xpdGVyYWwoIiUxICUyICUzIikpLmFyZyhRTGF0aW4xU3Ry
aW5nKHByZWZpeC5kYXRhKCkpKTsKKyAgICBjb21tYW5kTGluZSA9IGNvbW1hbmRMaW5lLmFyZyhl
eGVjdXRhYmxlUGF0aCk7CiAKICNpZiBPUyhEQVJXSU4pCiAgICAgLy8gQ3JlYXRlIHRoZSBsaXN0
ZW5pbmcgcG9ydC4K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>145449</attachid>
            <date>2012-06-02 10:20:11 -0700</date>
            <delta_ts>2012-06-06 10:18:46 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-87672-20120602192010.patch</filename>
            <type>text/plain</type>
            <size>3137</size>
            <attacher name="Balazs Kelemen">kbalazs</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5MzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDNmMjQ1NTQwMzUyYzcx
YzU1OTllZGVkODMxNmM5MTczZDI1NzgxMS4uNjk4NDkxN2QzNjA1NWNlODYyNTcyZjEwOWYyMGNm
MjQ4OGU5MTFhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA2LTAyICBCYWxh
enMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRdIEFkZCBxdWly
a3MgZm9yIHJ1bm5pbmcgdGhlIHdlYiBwcm9jZXNzIGluIGEgcHJvZmlsZXIgc2hlbGwsIGxpa2Ug
dmFsZ3JpbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTg3NjcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
SWYgZW52aXJvbm1lbnQgdmFyaWFibGVzIFFUX1dFQktJVF9XRUJfUFJPQ0VTU19DT01NQU5EX1BS
RUZJWAorICAgICAgICBhbmQvb3IgUVRfV0VCS0lUX1BMVUdJTl9QUk9DRVNTX0NPTU1BTkRfUFJF
RklYIHNldCwgdXNlIHRoZWlyCisgICAgICAgIHZhbHVlcyBhcyB0aGUgcHJlZml4IG9mIHRoZSBj
b21tYW5kIHdoZW4gbGF1bmNoaW5nIHRoZSBjaGlsZCBwcm9jZXNzLgorICAgICAgICBFeGFtcGxl
IHVzYWdlOgorICAgICAgICAgICAgUVRfV0VCX1BST0NFU1NfQ09NTUFORF9QUkVGSVg9InZhbGdy
aW5kIC0tc21jLWNoZWNrPWFsbCIgLi9NaW5pQnJvd3NlcgorCisgICAgICAgICogVUlQcm9jZXNz
L0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJv
Y2Vzc0xhdW5jaGVyOjpsYXVuY2hQcm9jZXNzKToKKwogMjAxMi0wNi0wMSAgQnJhZHkgRWlkc29u
ICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzExMzM1NjIy
PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4MTE5CmRpZmYg
LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5j
aGVyUXQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NM
YXVuY2hlclF0LmNwcAppbmRleCBjNWMzZjcxNDVkZTZjODkxYzQ1YTJkNTY2MDAwODI0OTBhODc1
ZmQxLi4wN2ExYTJmYmJiNGU1YTBkMmUyMzNhNDQwNzUzYjQzMGNhMDQyMDBkIDEwMDY0NAotLS0g
YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQu
Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1
bmNoZXJRdC5jcHAKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlIDxRTWV0YVR5cGU+CiAjaW5j
bHVkZSA8UVByb2Nlc3M+CiAjaW5jbHVkZSA8UVN0cmluZz4KKyNpbmNsdWRlIDxRU3RyaW5nQnVp
bGRlcj4KICNpbmNsdWRlIDxRdENvcmUvcWdsb2JhbC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvTm90
SW1wbGVtZW50ZWQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1J1bkxvb3AuaD4KQEAgLTEwMSw5ICsx
MDIsMTkgQEAgdm9pZCBRdFdlYlByb2Nlc3M6OnNldHVwQ2hpbGRQcm9jZXNzKCkKIAogdm9pZCBQ
cm9jZXNzTGF1bmNoZXI6OmxhdW5jaFByb2Nlc3MoKQogewotICAgIFFTdHJpbmcgY29tbWFuZExp
bmUgPSBRTGF0aW4xU3RyaW5nKCIlMSAlMiIpOwotICAgIGNvbW1hbmRMaW5lID0gY29tbWFuZExp
bmUuYXJnKG1fbGF1bmNoT3B0aW9ucy5wcm9jZXNzVHlwZSA9PSBXZWJQcm9jZXNzID8KLSAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleGVjdXRhYmxlUGF0aE9mV2ViUHJvY2Vzcygp
IDogZXhlY3V0YWJsZVBhdGhPZlBsdWdpblByb2Nlc3MoKSk7CisgICAgUVN0cmluZyBjb21tYW5k
TGluZTsKKyAgICBpZiAobV9sYXVuY2hPcHRpb25zLnByb2Nlc3NUeXBlID09IFdlYlByb2Nlc3Mp
IHsKKyAgICAgICAgUUJ5dGVBcnJheSB3ZWJQcm9jZXNzUHJlZml4ID0gcWdldGVudigiUVRfV0VC
S0lUX1dFQl9QUk9DRVNTX0NPTU1BTkRfUFJFRklYIik7CisgICAgICAgIGlmICghd2ViUHJvY2Vz
c1ByZWZpeC5pc0VtcHR5KCkpCisgICAgICAgICAgICBjb21tYW5kTGluZSA9IFFMYXRpbjFTdHJp
bmcod2ViUHJvY2Vzc1ByZWZpeC5jb25zdERhdGEoKSkgJSBRTGF0aW4xQ2hhcignICcpOworICAg
ICAgICBjb21tYW5kTGluZSA9IGNvbW1hbmRMaW5lICUgc3RhdGljX2Nhc3Q8UVN0cmluZz4oZXhl
Y3V0YWJsZVBhdGhPZldlYlByb2Nlc3MoKSk7CisgICAgfSBlbHNlIGlmIChtX2xhdW5jaE9wdGlv
bnMucHJvY2Vzc1R5cGUgPT0gUGx1Z2luUHJvY2VzcykgeworICAgICAgICBRQnl0ZUFycmF5IHBs
dWdpblByb2Nlc3NQcmVmaXggPSBxZ2V0ZW52KCJRVF9XRUJLSVRfUExVR0lOX1BST0NFU1NfQ09N
TUFORF9QUkVGSVgiKTsKKyAgICAgICAgaWYgKCFwbHVnaW5Qcm9jZXNzUHJlZml4LmlzRW1wdHko
KSkKKyAgICAgICAgICAgIGNvbW1hbmRMaW5lID0gUUxhdGluMVN0cmluZyhwbHVnaW5Qcm9jZXNz
UHJlZml4LmNvbnN0RGF0YSgpKSAlIFFMYXRpbjFDaGFyKCcgJyk7CisgICAgICAgIGNvbW1hbmRM
aW5lID0gY29tbWFuZExpbmUgJSBzdGF0aWNfY2FzdDxRU3RyaW5nPihleGVjdXRhYmxlUGF0aE9m
UGx1Z2luUHJvY2VzcygpKTsKKyAgICB9IGVsc2UKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE
KCk7CiAKICNpZiBPUyhEQVJXSU4pCiAgICAgLy8gQ3JlYXRlIHRoZSBsaXN0ZW5pbmcgcG9ydC4K
QEAgLTEzOSw3ICsxNTAsNyBAQCB2b2lkIFByb2Nlc3NMYXVuY2hlcjo6bGF1bmNoUHJvY2Vzcygp
CiAgICAgfQogCiAgICAgaW50IGNvbm5lY3RvciA9IHNvY2tldHNbMV07Ci0gICAgY29tbWFuZExp
bmUgPSBjb21tYW5kTGluZS5hcmcoc29ja2V0c1swXSk7CisgICAgY29tbWFuZExpbmUgPSBjb21t
YW5kTGluZSAlIFFMYXRpbjFDaGFyKCcgJykgJSBRU3RyaW5nOjpudW1iZXIoc29ja2V0c1swXSk7
CiAjZW5kaWYKIAogICAgIFFQcm9jZXNzKiB3ZWJQcm9jZXNzID0gbmV3IFF0V2ViUHJvY2Vzcygp
Owo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>146057</attachid>
            <date>2012-06-06 10:19:04 -0700</date>
            <delta_ts>2012-06-12 07:58:58 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-87672-20120606191901.patch</filename>
            <type>text/plain</type>
            <size>3110</size>
            <attacher name="Balazs Kelemen">kbalazs</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzdhYzk0ZTdmOTNkMzQ0
ZjE0ZjdjNzY2NDAzODUwM2YxMjE0M2MxNC4uYjBlYzExMmY4MThhY2FhOGFkMGYxNDU3NGE4NWFm
Njg2M2NlYjNlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA2LTA2ICBCYWxh
enMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRdIEFkZCBxdWly
a3MgZm9yIHJ1bm5pbmcgdGhlIHdlYiBwcm9jZXNzIGluIGEgcHJvZmlsZXIgc2hlbGwsIGxpa2Ug
dmFsZ3JpbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTg3NjcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
SWYgZW52aXJvbm1lbnQgdmFyaWFibGVzIFFUX1dFQktJVF9XRUJfUFJPQ0VTU19DT01NQU5EX1BS
RUZJWAorICAgICAgICBhbmQvb3IgUVRfV0VCS0lUX1BMVUdJTl9QUk9DRVNTX0NPTU1BTkRfUFJF
RklYIHNldCwgdXNlIHRoZWlyCisgICAgICAgIHZhbHVlcyBhcyB0aGUgcHJlZml4IG9mIHRoZSBj
b21tYW5kIHdoZW4gbGF1bmNoaW5nIHRoZSBjaGlsZCBwcm9jZXNzLgorICAgICAgICBFeGFtcGxl
IHVzYWdlOgorICAgICAgICAgICAgUVRfV0VCX1BST0NFU1NfQ09NTUFORF9QUkVGSVg9InZhbGdy
aW5kIC0tc21jLWNoZWNrPWFsbCIgLi9NaW5pQnJvd3NlcgorCisgICAgICAgICogVUlQcm9jZXNz
L0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJv
Y2Vzc0xhdW5jaGVyOjpsYXVuY2hQcm9jZXNzKToKKwogMjAxMi0wNi0wNiAgY2hhbmRyYSBTaGVr
YXIgVmFsbGFsYSAgPGNoYW5kcmEudmFsbGFsYUBtb3Rvcm9sYS5jb20+CiAKICAgICAgICAgW1dL
Mi1HdGtdQ29tcGlsYXRpb24gZXJyb3JzIHdpdGggZmxhZyBDT05URVhUX01FTlVTPTAKZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNo
ZXJRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xh
dW5jaGVyUXQuY3BwCmluZGV4IGM1YzNmNzE0NWRlNmM4OTFjNDVhMmQ1NjYwMDA4MjQ5MGE4NzVm
ZDEuLmVhNjQ0NjUwNDA0MmMwYTFkMTBiNzY3NTBhZjI3NTkzMjZiYTllMDYgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5j
cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVu
Y2hlclF0LmNwcApAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1ZGUgPFFNZXRhVHlwZT4KICNpbmNs
dWRlIDxRUHJvY2Vzcz4KICNpbmNsdWRlIDxRU3RyaW5nPgorI2luY2x1ZGUgPFFTdHJpbmdCdWls
ZGVyPgogI2luY2x1ZGUgPFF0Q29yZS9xZ2xvYmFsLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Ob3RJ
bXBsZW1lbnRlZC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUnVuTG9vcC5oPgpAQCAtMTAxLDkgKzEw
MiwxOSBAQCB2b2lkIFF0V2ViUHJvY2Vzczo6c2V0dXBDaGlsZFByb2Nlc3MoKQogCiB2b2lkIFBy
b2Nlc3NMYXVuY2hlcjo6bGF1bmNoUHJvY2VzcygpCiB7Ci0gICAgUVN0cmluZyBjb21tYW5kTGlu
ZSA9IFFMYXRpbjFTdHJpbmcoIiUxICUyIik7Ci0gICAgY29tbWFuZExpbmUgPSBjb21tYW5kTGlu
ZS5hcmcobV9sYXVuY2hPcHRpb25zLnByb2Nlc3NUeXBlID09IFdlYlByb2Nlc3MgPwotICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV4ZWN1dGFibGVQYXRoT2ZXZWJQcm9jZXNzKCkg
OiBleGVjdXRhYmxlUGF0aE9mUGx1Z2luUHJvY2VzcygpKTsKKyAgICBRU3RyaW5nIGNvbW1hbmRM
aW5lOworICAgIGlmIChtX2xhdW5jaE9wdGlvbnMucHJvY2Vzc1R5cGUgPT0gV2ViUHJvY2Vzcykg
eworICAgICAgICBRQnl0ZUFycmF5IHdlYlByb2Nlc3NQcmVmaXggPSBxZ2V0ZW52KCJRVF9XRUJL
SVRfV0VCX1BST0NFU1NfQ09NTUFORF9QUkVGSVgiKTsKKyAgICAgICAgaWYgKCF3ZWJQcm9jZXNz
UHJlZml4LmlzRW1wdHkoKSkKKyAgICAgICAgICAgIGNvbW1hbmRMaW5lID0gUUxhdGluMVN0cmlu
Zyh3ZWJQcm9jZXNzUHJlZml4LmNvbnN0RGF0YSgpKSAlIFFMYXRpbjFDaGFyKCcgJyk7CisgICAg
ICAgIGNvbW1hbmRMaW5lID0gY29tbWFuZExpbmUgJSBRU3RyaW5nKGV4ZWN1dGFibGVQYXRoT2ZX
ZWJQcm9jZXNzKCkpOworICAgIH0gZWxzZSBpZiAobV9sYXVuY2hPcHRpb25zLnByb2Nlc3NUeXBl
ID09IFBsdWdpblByb2Nlc3MpIHsKKyAgICAgICAgUUJ5dGVBcnJheSBwbHVnaW5Qcm9jZXNzUHJl
Zml4ID0gcWdldGVudigiUVRfV0VCS0lUX1BMVUdJTl9QUk9DRVNTX0NPTU1BTkRfUFJFRklYIik7
CisgICAgICAgIGlmICghcGx1Z2luUHJvY2Vzc1ByZWZpeC5pc0VtcHR5KCkpCisgICAgICAgICAg
ICBjb21tYW5kTGluZSA9IFFMYXRpbjFTdHJpbmcocGx1Z2luUHJvY2Vzc1ByZWZpeC5jb25zdERh
dGEoKSkgJSBRTGF0aW4xQ2hhcignICcpOworICAgICAgICBjb21tYW5kTGluZSA9IGNvbW1hbmRM
aW5lICUgUVN0cmluZyhleGVjdXRhYmxlUGF0aE9mUGx1Z2luUHJvY2VzcygpKTsKKyAgICB9IGVs
c2UKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAKICNpZiBPUyhEQVJXSU4pCiAgICAg
Ly8gQ3JlYXRlIHRoZSBsaXN0ZW5pbmcgcG9ydC4KQEAgLTEzOSw3ICsxNTAsNyBAQCB2b2lkIFBy
b2Nlc3NMYXVuY2hlcjo6bGF1bmNoUHJvY2VzcygpCiAgICAgfQogCiAgICAgaW50IGNvbm5lY3Rv
ciA9IHNvY2tldHNbMV07Ci0gICAgY29tbWFuZExpbmUgPSBjb21tYW5kTGluZS5hcmcoc29ja2V0
c1swXSk7CisgICAgY29tbWFuZExpbmUgPSBjb21tYW5kTGluZSAlIFFMYXRpbjFDaGFyKCcgJykg
JSBRU3RyaW5nOjpudW1iZXIoc29ja2V0c1swXSk7CiAjZW5kaWYKIAogICAgIFFQcm9jZXNzKiB3
ZWJQcm9jZXNzID0gbmV3IFF0V2ViUHJvY2VzcygpOwo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>147087</attachid>
            <date>2012-06-12 07:59:05 -0700</date>
            <delta_ts>2012-06-13 07:56:20 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-87672-20120612165855.patch</filename>
            <type>text/plain</type>
            <size>6184</size>
            <attacher name="Balazs Kelemen">kbalazs</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDgyOWE1ODg3YjUwMTBi
NWM2N2RlZjFhYjZiMjdlNzI2MTFlY2UyMy4uMGQwNTBkNTI4MzUwYmZkNTJkNmViZjgzZjZjMmIx
ZGMwMjQzMThjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA2LTEyICBCYWxh
enMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRdIEFkZCBxdWly
a3MgZm9yIHJ1bm5pbmcgdGhlIHdlYiBwcm9jZXNzIGluIGEgcHJvZmlsZXIgc2hlbGwsIGxpa2Ug
dmFsZ3JpbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTg3NjcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
SWYgZW52aXJvbm1lbnQgdmFyaWFibGVzIFFUX1dFQktJVF9XRUJfUFJPQ0VTU19DT01NQU5EX1BS
RUZJWAorICAgICAgICBhbmQvb3IgUVRfV0VCS0lUX1BMVUdJTl9QUk9DRVNTX0NPTU1BTkRfUFJF
RklYIHNldCwgdXNlIHRoZWlyCisgICAgICAgIHZhbHVlcyBhcyB0aGUgcHJlZml4IG9mIHRoZSBj
b21tYW5kIHdoZW4gbGF1bmNoaW5nIHRoZSBjaGlsZCBwcm9jZXNzLgorICAgICAgICBFeGFtcGxl
IHVzYWdlOgorICAgICAgICAgICAgZXhwb3J0IFFUX1dFQl9QUk9DRVNTX0NPTU1BTkRfUFJFRklY
PSJ2YWxncmluZCAtLXNtYy1jaGVjaz1hbGwiCisgICAgICAgICAgICAuL01pbmlCcm93c2VyIGh0
dHA6Ly9zb21lcGFnZS5odG1sCisgICAgICAgICAgICAuL1dlYktpdFRlc3RSdW5uZXIgLS1uby10
aW1lb3V0IC0tbm8tcmVuc3BvbnNpdml0eS10aW1lb3V0IHNvbWVfbGF5b3V0dGVzdC5odG1sCisK
KyAgICAgICAgKiBVSVByb2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwOgor
ICAgICAgICAoV2ViS2l0OjpQcm9jZXNzTGF1bmNoZXI6OmxhdW5jaFByb2Nlc3MpOgorCiAyMDEy
LTA2LTExICBLYXVzdHViaCBBdHJhd2Fsa2FyICA8a2F1c3R1YmhAbW90b3JvbGEuY29tPgogCiAg
ICAgICAgIFtEUlRdIExUQzo6IGNvdW50ZXJWYWx1ZUZvckVsZW1lbnRCeUlkKCkgY291bGQgYmUg
bW92ZWQgdG8gSW50ZXJuYWxzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz
L0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv
Y2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5jcHAKaW5kZXggYzVjM2Y3MTQ1ZGU2
Yzg5MWM0NWEyZDU2NjAwMDgyNDkwYTg3NWZkMS4uZWE2NDQ2NTA0MDQyYzBhMWQxMGI3Njc1MGFm
Mjc1OTMyNmJhOWUwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5j
aGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl
c3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwCkBAIC0zNSw2ICszNSw3IEBACiAj
aW5jbHVkZSA8UU1ldGFUeXBlPgogI2luY2x1ZGUgPFFQcm9jZXNzPgogI2luY2x1ZGUgPFFTdHJp
bmc+CisjaW5jbHVkZSA8UVN0cmluZ0J1aWxkZXI+CiAjaW5jbHVkZSA8UXRDb3JlL3FnbG9iYWwu
aD4KICNpbmNsdWRlIDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+CiAjaW5jbHVkZSA8V2ViQ29y
ZS9SdW5Mb29wLmg+CkBAIC0xMDEsOSArMTAyLDE5IEBAIHZvaWQgUXRXZWJQcm9jZXNzOjpzZXR1
cENoaWxkUHJvY2VzcygpCiAKIHZvaWQgUHJvY2Vzc0xhdW5jaGVyOjpsYXVuY2hQcm9jZXNzKCkK
IHsKLSAgICBRU3RyaW5nIGNvbW1hbmRMaW5lID0gUUxhdGluMVN0cmluZygiJTEgJTIiKTsKLSAg
ICBjb21tYW5kTGluZSA9IGNvbW1hbmRMaW5lLmFyZyhtX2xhdW5jaE9wdGlvbnMucHJvY2Vzc1R5
cGUgPT0gV2ViUHJvY2VzcyA/Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXhl
Y3V0YWJsZVBhdGhPZldlYlByb2Nlc3MoKSA6IGV4ZWN1dGFibGVQYXRoT2ZQbHVnaW5Qcm9jZXNz
KCkpOworICAgIFFTdHJpbmcgY29tbWFuZExpbmU7CisgICAgaWYgKG1fbGF1bmNoT3B0aW9ucy5w
cm9jZXNzVHlwZSA9PSBXZWJQcm9jZXNzKSB7CisgICAgICAgIFFCeXRlQXJyYXkgd2ViUHJvY2Vz
c1ByZWZpeCA9IHFnZXRlbnYoIlFUX1dFQktJVF9XRUJfUFJPQ0VTU19DT01NQU5EX1BSRUZJWCIp
OworICAgICAgICBpZiAoIXdlYlByb2Nlc3NQcmVmaXguaXNFbXB0eSgpKQorICAgICAgICAgICAg
Y29tbWFuZExpbmUgPSBRTGF0aW4xU3RyaW5nKHdlYlByb2Nlc3NQcmVmaXguY29uc3REYXRhKCkp
ICUgUUxhdGluMUNoYXIoJyAnKTsKKyAgICAgICAgY29tbWFuZExpbmUgPSBjb21tYW5kTGluZSAl
IFFTdHJpbmcoZXhlY3V0YWJsZVBhdGhPZldlYlByb2Nlc3MoKSk7CisgICAgfSBlbHNlIGlmICht
X2xhdW5jaE9wdGlvbnMucHJvY2Vzc1R5cGUgPT0gUGx1Z2luUHJvY2VzcykgeworICAgICAgICBR
Qnl0ZUFycmF5IHBsdWdpblByb2Nlc3NQcmVmaXggPSBxZ2V0ZW52KCJRVF9XRUJLSVRfUExVR0lO
X1BST0NFU1NfQ09NTUFORF9QUkVGSVgiKTsKKyAgICAgICAgaWYgKCFwbHVnaW5Qcm9jZXNzUHJl
Zml4LmlzRW1wdHkoKSkKKyAgICAgICAgICAgIGNvbW1hbmRMaW5lID0gUUxhdGluMVN0cmluZyhw
bHVnaW5Qcm9jZXNzUHJlZml4LmNvbnN0RGF0YSgpKSAlIFFMYXRpbjFDaGFyKCcgJyk7CisgICAg
ICAgIGNvbW1hbmRMaW5lID0gY29tbWFuZExpbmUgJSBRU3RyaW5nKGV4ZWN1dGFibGVQYXRoT2ZQ
bHVnaW5Qcm9jZXNzKCkpOworICAgIH0gZWxzZQorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo
KTsKIAogI2lmIE9TKERBUldJTikKICAgICAvLyBDcmVhdGUgdGhlIGxpc3RlbmluZyBwb3J0LgpA
QCAtMTM5LDcgKzE1MCw3IEBAIHZvaWQgUHJvY2Vzc0xhdW5jaGVyOjpsYXVuY2hQcm9jZXNzKCkK
ICAgICB9CiAKICAgICBpbnQgY29ubmVjdG9yID0gc29ja2V0c1sxXTsKLSAgICBjb21tYW5kTGlu
ZSA9IGNvbW1hbmRMaW5lLmFyZyhzb2NrZXRzWzBdKTsKKyAgICBjb21tYW5kTGluZSA9IGNvbW1h
bmRMaW5lICUgUUxhdGluMUNoYXIoJyAnKSAlIFFTdHJpbmc6Om51bWJlcihzb2NrZXRzWzBdKTsK
ICNlbmRpZgogCiAgICAgUVByb2Nlc3MqIHdlYlByb2Nlc3MgPSBuZXcgUXRXZWJQcm9jZXNzKCk7
CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWY3
NDRiNzdmODFhOThkOWI5MGExMTY4M2Y0M2RkNTBhYzY4Y2JiYy4uMzBjMDk4OGE4MjQyMjIxYTk0
M2U0YzQzMmJiMWMwYjI0NDMwM2YwYyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi
L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDEyLTA2LTEyICBCYWxhenMgS2Vs
ZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KIAorICAgICAgICBbUXRdIEFkZCBxdWlya3MgZm9y
IHJ1bm5pbmcgdGhlIHdlYiBwcm9jZXNzIGluIGEgcHJvZmlsZXIgc2hlbGwsIGxpa2UgdmFsZ3Jp
bmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3Njcy
CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIC0t
bm8tcmVzcG9uc2l2aXR5LXRpbWVvdXQgY29tbWFuZCBsaW5lIHN3aXRjaCB0bworICAgICAgICBk
aXNhYmxlIHRoZSB0aW1lciB0aGF0IGNhdGNoZXMgd2hlbiB0aGUgd2ViIHByb2Nlc3MKKyAgICAg
ICAgYmVjb21lIHVuc3ByZXNwb25zaXZlLiBJdCBjYW4gYmUgdW5jb25mb3J0YWJsZSB3aGVuCisg
ICAgICAgIHJ1bm5pbmcgdW5kZXIgYSBwcm9maWxlci4KKworICAgICAgICAqIFdlYktpdFRlc3RS
dW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6
VGVzdENvbnRyb2xsZXIpOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6
ZSk6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpydW5VbnRpbCk6CisgICAgICAgICog
V2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oOgorCisyMDEyLTA2LTEyICBCYWxhenMg
S2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKwogICAgICAgICBbUkVHUkVTU0lPTl1bV1RS
XSBCdWlsZCBmYWlsIHdpdGggd2Vycm9yIGFmdGVyIHIxMjAwNTQKICAgICAgICAgaHR0cHM6Ly9i
dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4ODYyCiAKZGlmZiAtLWdpdCBhL1Rvb2xz
L1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1
bm5lci9UZXN0Q29udHJvbGxlci5jcHAKaW5kZXggZmZkYzJjYzY2ZWVkYzIzOGIyZGFkM2VkZmI4
NzcyNGVkNDQ1ZGJiNS4uMmIxZjIxZGNkN2Y5NTIxZjI0OGI1MzNkNGNmOWE1NTdiMzgwY2M5YSAx
MDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKKysr
IGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKQEAgLTc4LDYgKzc4
LDcgQEAgVGVzdENvbnRyb2xsZXI6OlRlc3RDb250cm9sbGVyKGludCBhcmdjLCBjb25zdCBjaGFy
KiBhcmd2W10pCiAgICAgLCBtX3Nob3J0VGltZW91dChkZWZhdWx0U2hvcnRUaW1lb3V0KQogICAg
ICwgbV9ub1RpbWVvdXQoZGVmYXVsdE5vVGltZW91dCkKICAgICAsIG1fdXNlV2FpdFRvRHVtcFdh
dGNoZG9nVGltZXIodHJ1ZSkKKyAgICAsIG1fdXNlUmVuc3BvbnNpdml0eVRpbWVyKHRydWUpCiAg
ICAgLCBtX2RpZFByaW50V2ViUHJvY2Vzc0NyYXNoZWRNZXNzYWdlKGZhbHNlKQogICAgICwgbV9z
aG91bGRFeGl0V2hlbldlYlByb2Nlc3NDcmFzaGVzKHRydWUpCiAgICAgLCBtX2JlZm9yZVVubG9h
ZFJldHVyblZhbHVlKHRydWUpCkBAIC0yNjAsNiArMjYxLDExIEBAIHZvaWQgVGVzdENvbnRyb2xs
ZXI6OmluaXRpYWxpemUoaW50IGFyZ2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkKICAgICAgICAgICAg
IGNvbnRpbnVlOwogICAgICAgICB9CiAKKyAgICAgICAgaWYgKGFyZ3VtZW50ID09ICItLW5vLXJl
c3BvbnNpdml0eS10aW1lb3V0IikgeworICAgICAgICAgICAgbV91c2VSZW5zcG9uc2l2aXR5VGlt
ZXIgPSBmYWxzZTsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisKICAgICAgICAg
aWYgKGFyZ3VtZW50ID09ICItLXBpeGVsLXRlc3RzIikgewogICAgICAgICAgICAgbV9kdW1wUGl4
ZWxzID0gdHJ1ZTsKICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtNTU2LDYgKzU2MiwxMSBAQCB2
b2lkIFRlc3RDb250cm9sbGVyOjpydW4oKQogCiB2b2lkIFRlc3RDb250cm9sbGVyOjpydW5VbnRp
bChib29sJiBkb25lLCBUaW1lb3V0RHVyYXRpb24gdGltZW91dER1cmF0aW9uKQogeworICAgIGlm
ICghbV91c2VSZW5zcG9uc2l2aXR5VGltZXIpIHsKKyAgICAgICAgcGxhdGZvcm1SdW5VbnRpbChk
b25lLCBtX25vVGltZW91dCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBkb3VibGUg
dGltZW91dDsKICAgICBzd2l0Y2ggKHRpbWVvdXREdXJhdGlvbikgewogICAgIGNhc2UgU2hvcnRU
aW1lb3V0OgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxl
ci5oIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oCmluZGV4IGI5NDY1
ZWY5NmU1N2U3MzVjNDEwNDQ3ODU0MTkzODY3ZjBiMDVjYjAuLmRkNTViYjI1YTZmOWM0NzhhM2Y1
MjQwMWVkMzI5YjAwNGEzYmU4NDcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv
VGVzdENvbnRyb2xsZXIuaAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9s
bGVyLmgKQEAgLTEyOSw2ICsxMjksNyBAQCBwcml2YXRlOgogICAgIGRvdWJsZSBtX3Nob3J0VGlt
ZW91dDsKICAgICBkb3VibGUgbV9ub1RpbWVvdXQ7CiAgICAgYm9vbCBtX3VzZVdhaXRUb0R1bXBX
YXRjaGRvZ1RpbWVyOworICAgIGJvb2wgbV91c2VSZW5zcG9uc2l2aXR5VGltZXI7CiAKICAgICBi
b29sIG1fZGlkUHJpbnRXZWJQcm9jZXNzQ3Jhc2hlZE1lc3NhZ2U7CiAgICAgYm9vbCBtX3Nob3Vs
ZEV4aXRXaGVuV2ViUHJvY2Vzc0NyYXNoZXM7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>147315</attachid>
            <date>2012-06-13 07:56:27 -0700</date>
            <delta_ts>2012-07-11 09:17:41 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-87672-20120613165616.patch</filename>
            <type>text/plain</type>
            <size>6244</size>
            <attacher name="Balazs Kelemen">kbalazs</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTc3Yzg5ODk2YjI2OGZk
YmY3OGFlYzQ2MmViMDQ1Yzk5ZGFiY2IwOS4uY2YyNDA3NzVmYzEwNmFhN2I1YzE2NjQ2ZTc2YWEz
ZjA4MDAyYzNhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDEyLTA2LTEzICBCYWxh
enMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KIAorICAgICAgICBbUXRdIEFkZCBxdWly
a3MgZm9yIHJ1bm5pbmcgdGhlIHdlYiBwcm9jZXNzIGluIGEgcHJvZmlsZXIgc2hlbGwsIGxpa2Ug
dmFsZ3JpbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTg3NjcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
SWYgZW52aXJvbm1lbnQgdmFyaWFibGVzIFFUX1dFQktJVF9XRUJfUFJPQ0VTU19DT01NQU5EX1BS
RUZJWAorICAgICAgICBhbmQvb3IgUVRfV0VCS0lUX1BMVUdJTl9QUk9DRVNTX0NPTU1BTkRfUFJF
RklYIHNldCwgdXNlIHRoZWlyCisgICAgICAgIHZhbHVlcyBhcyB0aGUgcHJlZml4IG9mIHRoZSBj
b21tYW5kIHdoZW4gbGF1bmNoaW5nIHRoZSBjaGlsZCBwcm9jZXNzLgorICAgICAgICBFeGFtcGxl
IHVzYWdlOgorICAgICAgICAgICAgZXhwb3J0IFFUX1dFQl9QUk9DRVNTX0NPTU1BTkRfUFJFRklY
PSJ2YWxncmluZCAtLXNtYy1jaGVjaz1hbGwiCisgICAgICAgICAgICAuL01pbmlCcm93c2VyIGh0
dHA6Ly9zb21lcGFnZS5odG1sCisgICAgICAgICAgICAuL1dlYktpdFRlc3RSdW5uZXIgLS1uby1y
dW5sb29wLXRpbWVvdXQgc29tZV9sYXlvdXR0ZXN0Lmh0bWwKKworICAgICAgICAqIFVJUHJvY2Vz
cy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBy
b2Nlc3NMYXVuY2hlcjo6bGF1bmNoUHJvY2Vzcyk6CisKKzIwMTItMDYtMTMgIEJhbGF6cyBLZWxl
bWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgorCiAgICAgICAgIFtRdF1bV0syXSBTY2FubmluZyBw
bHVnaW5zIGJsb2NrcyB0aGUgVUkgZm9yIGEgbG9uZyB0aW1lCiAgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODUzNQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwIGIvU291
cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcApp
bmRleCBjNWMzZjcxNDVkZTZjODkxYzQ1YTJkNTY2MDAwODI0OTBhODc1ZmQxLi5lYTY0NDY1MDQw
NDJjMGExZDEwYjc2NzUwYWYyNzU5MzI2YmE5ZTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0
Mi9VSVByb2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwCisrKyBiL1NvdXJj
ZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5jcHAKQEAg
LTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlIDxRTWV0YVR5cGU+CiAjaW5jbHVkZSA8UVByb2Nlc3M+
CiAjaW5jbHVkZSA8UVN0cmluZz4KKyNpbmNsdWRlIDxRU3RyaW5nQnVpbGRlcj4KICNpbmNsdWRl
IDxRdENvcmUvcWdsb2JhbC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvTm90SW1wbGVtZW50ZWQuaD4K
ICNpbmNsdWRlIDxXZWJDb3JlL1J1bkxvb3AuaD4KQEAgLTEwMSw5ICsxMDIsMTkgQEAgdm9pZCBR
dFdlYlByb2Nlc3M6OnNldHVwQ2hpbGRQcm9jZXNzKCkKIAogdm9pZCBQcm9jZXNzTGF1bmNoZXI6
OmxhdW5jaFByb2Nlc3MoKQogewotICAgIFFTdHJpbmcgY29tbWFuZExpbmUgPSBRTGF0aW4xU3Ry
aW5nKCIlMSAlMiIpOwotICAgIGNvbW1hbmRMaW5lID0gY29tbWFuZExpbmUuYXJnKG1fbGF1bmNo
T3B0aW9ucy5wcm9jZXNzVHlwZSA9PSBXZWJQcm9jZXNzID8KLSAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICBleGVjdXRhYmxlUGF0aE9mV2ViUHJvY2VzcygpIDogZXhlY3V0YWJsZVBh
dGhPZlBsdWdpblByb2Nlc3MoKSk7CisgICAgUVN0cmluZyBjb21tYW5kTGluZTsKKyAgICBpZiAo
bV9sYXVuY2hPcHRpb25zLnByb2Nlc3NUeXBlID09IFdlYlByb2Nlc3MpIHsKKyAgICAgICAgUUJ5
dGVBcnJheSB3ZWJQcm9jZXNzUHJlZml4ID0gcWdldGVudigiUVRfV0VCS0lUX1dFQl9QUk9DRVNT
X0NPTU1BTkRfUFJFRklYIik7CisgICAgICAgIGlmICghd2ViUHJvY2Vzc1ByZWZpeC5pc0VtcHR5
KCkpCisgICAgICAgICAgICBjb21tYW5kTGluZSA9IFFMYXRpbjFTdHJpbmcod2ViUHJvY2Vzc1By
ZWZpeC5jb25zdERhdGEoKSkgJSBRTGF0aW4xQ2hhcignICcpOworICAgICAgICBjb21tYW5kTGlu
ZSA9IGNvbW1hbmRMaW5lICUgUVN0cmluZyhleGVjdXRhYmxlUGF0aE9mV2ViUHJvY2VzcygpKTsK
KyAgICB9IGVsc2UgaWYgKG1fbGF1bmNoT3B0aW9ucy5wcm9jZXNzVHlwZSA9PSBQbHVnaW5Qcm9j
ZXNzKSB7CisgICAgICAgIFFCeXRlQXJyYXkgcGx1Z2luUHJvY2Vzc1ByZWZpeCA9IHFnZXRlbnYo
IlFUX1dFQktJVF9QTFVHSU5fUFJPQ0VTU19DT01NQU5EX1BSRUZJWCIpOworICAgICAgICBpZiAo
IXBsdWdpblByb2Nlc3NQcmVmaXguaXNFbXB0eSgpKQorICAgICAgICAgICAgY29tbWFuZExpbmUg
PSBRTGF0aW4xU3RyaW5nKHBsdWdpblByb2Nlc3NQcmVmaXguY29uc3REYXRhKCkpICUgUUxhdGlu
MUNoYXIoJyAnKTsKKyAgICAgICAgY29tbWFuZExpbmUgPSBjb21tYW5kTGluZSAlIFFTdHJpbmco
ZXhlY3V0YWJsZVBhdGhPZlBsdWdpblByb2Nlc3MoKSk7CisgICAgfSBlbHNlCisgICAgICAgIEFT
U0VSVF9OT1RfUkVBQ0hFRCgpOwogCiAjaWYgT1MoREFSV0lOKQogICAgIC8vIENyZWF0ZSB0aGUg
bGlzdGVuaW5nIHBvcnQuCkBAIC0xMzksNyArMTUwLDcgQEAgdm9pZCBQcm9jZXNzTGF1bmNoZXI6
OmxhdW5jaFByb2Nlc3MoKQogICAgIH0KIAogICAgIGludCBjb25uZWN0b3IgPSBzb2NrZXRzWzFd
OwotICAgIGNvbW1hbmRMaW5lID0gY29tbWFuZExpbmUuYXJnKHNvY2tldHNbMF0pOworICAgIGNv
bW1hbmRMaW5lID0gY29tbWFuZExpbmUgJSBRTGF0aW4xQ2hhcignICcpICUgUVN0cmluZzo6bnVt
YmVyKHNvY2tldHNbMF0pOwogI2VuZGlmCiAKICAgICBRUHJvY2Vzcyogd2ViUHJvY2VzcyA9IG5l
dyBRdFdlYlByb2Nlc3MoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No
YW5nZUxvZwppbmRleCBjMDAyZGZlZjUyYWYxMjBmNzA2NWEyYjM4ODVjNTM0ZGFlYWJjZThkLi43
ODEyMDExNjcwZjZiZjRjZjdiZmY3OWZhZjRlOTE0MThmNWVkMGQ3IDEwMDY0NAotLS0gYS9Ub29s
cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTIt
MDYtMTMgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgorCisgICAgICAgIFtR
dF0gQWRkIHF1aXJrcyBmb3IgcnVubmluZyB0aGUgd2ViIHByb2Nlc3MgaW4gYSBwcm9maWxlciBz
aGVsbCwgbGlrZSB2YWxncmluZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9ODc2NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBBZGQgLS1uby1ydW5sb29wLXRpbWVvdXQgY29tbWFuZCBsaW5lIHN3aXRjaCB0
bworICAgICAgICBub3QgdGltZSBvdXQgbm8gbWF0dGVyIGhvdyBsb25nIHRoZSB3ZWIgcHJvY2Vz
cworICAgICAgICBkb2VzIGl0J3Mgam9iLiAtLW5vLXRpbWVvdXQgaXMgbm90IGVub3VnaCBmb3IK
KyAgICAgICAgcHJvZmlsaW5nIHB1cnBvc2VzIGJlY2F1c2UgaXQgb25seSBlZmZlY3RzIHRoZSB0
aW1lb3V0CisgICAgICAgIGZvciBydW5uaW5nIHRoZSBhY3R1YWwgdGVzdCBhbmQgd2Ugc2hvdWxk
IGtlZXAgdGhpcworICAgICAgICBiZWhhdmlvciBmb3IgcGVyZm9ybWFuY2UgdGVzdHMuCisKKyAg
ICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdU
Ujo6VGVzdENvbnRyb2xsZXI6OlRlc3RDb250cm9sbGVyKToKKyAgICAgICAgKFdUUjo6VGVzdENv
bnRyb2xsZXI6OmluaXRpYWxpemUpOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6cnVu
VW50aWwpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaDoKKwog
MjAxMi0wNi0xMyAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAK
ICAgICAgICAgW1F0XSBNYWtlIGl0IHBvc3NpYmxlIHRvIGRpc2FibGUgLVdlcnJvciBpbiBwcm9k
dWN0aW9uIGJ1aWxkcwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29u
dHJvbGxlci5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcApp
bmRleCBmZmRjMmNjNjZlZWRjMjM4YjJkYWQzZWRmYjg3NzI0ZWQ0NDVkYmI1Li4yNWVlYmQ4Yzgx
NjQyNGVkNmE5MDk4MGQ0MGU3Y2RiZjM4YThhNWRlIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRU
ZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVy
L1Rlc3RDb250cm9sbGVyLmNwcApAQCAtNzgsNiArNzgsNyBAQCBUZXN0Q29udHJvbGxlcjo6VGVz
dENvbnRyb2xsZXIoaW50IGFyZ2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkKICAgICAsIG1fc2hvcnRU
aW1lb3V0KGRlZmF1bHRTaG9ydFRpbWVvdXQpCiAgICAgLCBtX25vVGltZW91dChkZWZhdWx0Tm9U
aW1lb3V0KQogICAgICwgbV91c2VXYWl0VG9EdW1wV2F0Y2hkb2dUaW1lcih0cnVlKQorICAgICwg
bV91c2VSdW5sb29wVGltZXIodHJ1ZSkKICAgICAsIG1fZGlkUHJpbnRXZWJQcm9jZXNzQ3Jhc2hl
ZE1lc3NhZ2UoZmFsc2UpCiAgICAgLCBtX3Nob3VsZEV4aXRXaGVuV2ViUHJvY2Vzc0NyYXNoZXMo
dHJ1ZSkKICAgICAsIG1fYmVmb3JlVW5sb2FkUmV0dXJuVmFsdWUodHJ1ZSkKQEAgLTI2MCw2ICsy
NjEsMTEgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZShpbnQgYXJnYywgY29uc3Qg
Y2hhciogYXJndltdKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAorICAgICAg
ICBpZiAoYXJndW1lbnQgPT0gIi0tbm8tcnVubG9vcC10aW1lb3V0IikgeworICAgICAgICAgICAg
bV91c2VSdW5sb29wVGltZXIgPSBmYWxzZTsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAg
ICB9CisKICAgICAgICAgaWYgKGFyZ3VtZW50ID09ICItLXBpeGVsLXRlc3RzIikgewogICAgICAg
ICAgICAgbV9kdW1wUGl4ZWxzID0gdHJ1ZTsKICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtNTU2
LDYgKzU2MiwxMSBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpydW4oKQogCiB2b2lkIFRlc3RDb250
cm9sbGVyOjpydW5VbnRpbChib29sJiBkb25lLCBUaW1lb3V0RHVyYXRpb24gdGltZW91dER1cmF0
aW9uKQogeworICAgIGlmICghbV91c2VSdW5sb29wVGltZXIpIHsKKyAgICAgICAgcGxhdGZvcm1S
dW5VbnRpbChkb25lLCBtX25vVGltZW91dCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAg
ICBkb3VibGUgdGltZW91dDsKICAgICBzd2l0Y2ggKHRpbWVvdXREdXJhdGlvbikgewogICAgIGNh
c2UgU2hvcnRUaW1lb3V0OgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0
Q29udHJvbGxlci5oIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oCmlu
ZGV4IGI5NDY1ZWY5NmU1N2U3MzVjNDEwNDQ3ODU0MTkzODY3ZjBiMDVjYjAuLjVmMDk1MGEwNzdm
YWU1YjhkMGY1ZGFmYTA4OWFmYmI1Yzc5OWE1ZmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRl
c3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rl
c3RDb250cm9sbGVyLmgKQEAgLTEyOSw2ICsxMjksNyBAQCBwcml2YXRlOgogICAgIGRvdWJsZSBt
X3Nob3J0VGltZW91dDsKICAgICBkb3VibGUgbV9ub1RpbWVvdXQ7CiAgICAgYm9vbCBtX3VzZVdh
aXRUb0R1bXBXYXRjaGRvZ1RpbWVyOworICAgIGJvb2wgbV91c2VSdW5sb29wVGltZXI7CiAKICAg
ICBib29sIG1fZGlkUHJpbnRXZWJQcm9jZXNzQ3Jhc2hlZE1lc3NhZ2U7CiAgICAgYm9vbCBtX3No
b3VsZEV4aXRXaGVuV2ViUHJvY2Vzc0NyYXNoZXM7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>151715</attachid>
            <date>2012-07-11 09:17:48 -0700</date>
            <delta_ts>2012-07-13 08:55:01 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-87672-20120711181735.patch</filename>
            <type>text/plain</type>
            <size>6087</size>
            <attacher name="Balazs Kelemen">kbalazs</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWI2Y2I0MzRmMmMyY2Q4
YmQ5MzQ2ZTZjMjA1Yjk0MGRiODM1MWM4MS4uNWNmMjQxODljOWFmNTM2ZDk1MTRlNzlkNWVjNjNh
MmRjM2RmYmVhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA3LTExICBCYWxh
enMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRdIEFkZCBxdWly
a3MgZm9yIHJ1bm5pbmcgdGhlIHdlYiBwcm9jZXNzIGluIGEgcHJvZmlsZXIgc2hlbGwsIGxpa2Ug
dmFsZ3JpbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTg3NjcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
SWYgZW52aXJvbm1lbnQgdmFyaWFibGVzIFFUX1dFQktJVF9XRUJfUFJPQ0VTU19DT01NQU5EX1BS
RUZJWAorICAgICAgICBhbmQvb3IgUVRfV0VCS0lUX1BMVUdJTl9QUk9DRVNTX0NPTU1BTkRfUFJF
RklYIGFyZSBzZXQsIHVzZSB0aGVpcgorICAgICAgICB2YWx1ZXMgYXMgdGhlIHByZWZpeCBvZiB0
aGUgY29tbWFuZCB3aGVuIGxhdW5jaGluZyB0aGUgY2hpbGQgcHJvY2Vzcy4KKyAgICAgICAgRXhh
bXBsZSB1c2FnZToKKyAgICAgICAgICAgIGV4cG9ydCBRVF9XRUJfUFJPQ0VTU19DT01NQU5EX1BS
RUZJWD0idmFsZ3JpbmQgLS1zbWMtY2hlY2s9YWxsIgorICAgICAgICAgICAgLi9NaW5pQnJvd3Nl
ciBodHRwOi8vc29tZXBhZ2UuaHRtbAorICAgICAgICAgICAgLi9XZWJLaXRUZXN0UnVubmVyIC0t
bm8tdGltZW91dC1mb3ItYWxsIHNvbWVfbGF5b3V0dGVzdC5odG1sCisKKyAgICAgICAgKiBVSVBy
b2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwOgorICAgICAgICAoV2ViS2l0
OjpQcm9jZXNzTGF1bmNoZXI6OmxhdW5jaFByb2Nlc3MpOgorCiAyMDEyLTA3LTEwICBTaGVyaWZm
IEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk
LCByb2xsaW5nIG91dCByMTIyMTc4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j
ZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ
UHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5jcHAKaW5kZXggYzVjM2Y3MTQ1
ZGU2Yzg5MWM0NWEyZDU2NjAwMDgyNDkwYTg3NWZkMS4uZjA5OWQ2MjgzN2JkNzU0NmI5MDZjNWVm
OTIyZDA4YTMzMTQxM2UxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xh
dW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy
b2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwCkBAIC0xMDEsOSArMTAxLDE1
IEBAIHZvaWQgUXRXZWJQcm9jZXNzOjpzZXR1cENoaWxkUHJvY2VzcygpCiAKIHZvaWQgUHJvY2Vz
c0xhdW5jaGVyOjpsYXVuY2hQcm9jZXNzKCkKIHsKLSAgICBRU3RyaW5nIGNvbW1hbmRMaW5lID0g
UUxhdGluMVN0cmluZygiJTEgJTIiKTsKLSAgICBjb21tYW5kTGluZSA9IGNvbW1hbmRMaW5lLmFy
ZyhtX2xhdW5jaE9wdGlvbnMucHJvY2Vzc1R5cGUgPT0gV2ViUHJvY2VzcyA/Ci0gICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgZXhlY3V0YWJsZVBhdGhPZldlYlByb2Nlc3MoKSA6IGV4
ZWN1dGFibGVQYXRoT2ZQbHVnaW5Qcm9jZXNzKCkpOworICAgIFFTdHJpbmcgY29tbWFuZExpbmUg
PSBRTGF0aW4xU3RyaW5nKCIlMSAlMiAlMyIpOworICAgIGlmIChtX2xhdW5jaE9wdGlvbnMucHJv
Y2Vzc1R5cGUgPT0gV2ViUHJvY2VzcykgeworICAgICAgICBRQnl0ZUFycmF5IHdlYlByb2Nlc3NQ
cmVmaXggPSBxZ2V0ZW52KCJRVF9XRUJLSVQyX1dQX0NNRF9QUkVGSVgiKTsKKyAgICAgICAgY29t
bWFuZExpbmUgPSBjb21tYW5kTGluZS5hcmcoUUxhdGluMVN0cmluZyh3ZWJQcm9jZXNzUHJlZml4
LmNvbnN0RGF0YSgpKSkuYXJnKFFTdHJpbmcoZXhlY3V0YWJsZVBhdGhPZldlYlByb2Nlc3MoKSkp
OworICAgIH0gZWxzZSBpZiAobV9sYXVuY2hPcHRpb25zLnByb2Nlc3NUeXBlID09IFBsdWdpblBy
b2Nlc3MpIHsKKyAgICAgICAgUUJ5dGVBcnJheSBwbHVnaW5Qcm9jZXNzUHJlZml4ID0gcWdldGVu
digiUVRfV0VCS0lUMl9QUF9DTURfUFJFRklYIik7CisgICAgICAgIGNvbW1hbmRMaW5lID0gY29t
bWFuZExpbmUuYXJnKFFMYXRpbjFTdHJpbmcocGx1Z2luUHJvY2Vzc1ByZWZpeC5jb25zdERhdGEo
KSkpLmFyZyhRU3RyaW5nKGV4ZWN1dGFibGVQYXRoT2ZQbHVnaW5Qcm9jZXNzKCkpKTsKKyAgICB9
IGVsc2UKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAKICNpZiBPUyhEQVJXSU4pCiAg
ICAgLy8gQ3JlYXRlIHRoZSBsaXN0ZW5pbmcgcG9ydC4KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5n
ZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjNTk4ZTZjNDNiMWIxZmU2N2RkNDA3NmQ3Y2Rl
MjgwYjgzMjliZTZlLi4xOWM5NzYwYjRhZWIxNmFkZGEyODU5NzZiNGM3MGI5YWRjZWVhYjk5IDEw
MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMg
KzEsMjMgQEAKKzIwMTItMDctMTEgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3Jn
PgorCisgICAgICAgIFtRdF0gQWRkIHF1aXJrcyBmb3IgcnVubmluZyB0aGUgd2ViIHByb2Nlc3Mg
aW4gYSBwcm9maWxlciBzaGVsbCwgbGlrZSB2YWxncmluZAorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODc2NzIKKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgLS1uby10aW1lb3V0LWZvci1hbGwgY29tbWFu
ZCBsaW5lIHN3aXRjaCB0bworICAgICAgICBub3QgdGltZSBvdXQgbm8gbWF0dGVyIGhvdyBsb25n
IHRoZSB3ZWIgcHJvY2VzcworICAgICAgICBkb2VzIGl0J3Mgam9iLiAtLW5vLXRpbWVvdXQgaXMg
bm90IGVub3VnaCBmb3IKKyAgICAgICAgcHJvZmlsaW5nIHB1cnBvc2VzIGJlY2F1c2UgaXQgb25s
eSBhZmZlY3RzIHRoZSB0aW1lb3V0CisgICAgICAgIGZvciBydW5uaW5nIHRoZSBhY3R1YWwgdGVz
dCBhbmQgd2Ugc2hvdWxkIGtlZXAgdGhpcworICAgICAgICBiZWhhdmlvciBmb3IgcGVyZm9ybWFu
Y2UgdGVzdHMuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNw
cDoKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OlRlc3RDb250cm9sbGVyKToKKyAgICAg
ICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUpOgorICAgICAgICAoV1RSOjpUZXN0
Q29udHJvbGxlcjo6cnVuVW50aWwpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvVGVzdENv
bnRyb2xsZXIuaDoKKwogMjAxMi0wNy0xMCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJr
aXQub3JnPgogCiAgICAgICAgIFtRdF0gUkVHUkVTU0lPTihyMTIyMTc1KTogSXQgYnJva2UgdGhl
IFdpbmRvd3MgYnVpbGQKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENv
bnRyb2xsZXIuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAK
aW5kZXggM2MxMGFjMTcwZjBjNTA1N2U5NzZlZDJhYzY5MTBhZTVmOTMzYzg3Mi4uY2MzZDlhNjEz
MGE0MDljMzM5ZjRlNTczNjUzY2M5NmUwNTliNGQzOCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0
VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l
ci9UZXN0Q29udHJvbGxlci5jcHAKQEAgLTc4LDYgKzc4LDcgQEAgVGVzdENvbnRyb2xsZXI6OlRl
c3RDb250cm9sbGVyKGludCBhcmdjLCBjb25zdCBjaGFyKiBhcmd2W10pCiAgICAgLCBtX3Nob3J0
VGltZW91dChkZWZhdWx0U2hvcnRUaW1lb3V0KQogICAgICwgbV9ub1RpbWVvdXQoZGVmYXVsdE5v
VGltZW91dCkKICAgICAsIG1fdXNlV2FpdFRvRHVtcFdhdGNoZG9nVGltZXIodHJ1ZSkKKyAgICAs
IG1fZm9yY2VOb1RpbWVvdXQoZmFsc2UpCiAgICAgLCBtX2RpZFByaW50V2ViUHJvY2Vzc0NyYXNo
ZWRNZXNzYWdlKGZhbHNlKQogICAgICwgbV9zaG91bGRFeGl0V2hlbldlYlByb2Nlc3NDcmFzaGVz
KHRydWUpCiAgICAgLCBtX2JlZm9yZVVubG9hZFJldHVyblZhbHVlKHRydWUpCkBAIC0yNjAsNiAr
MjYxLDEyIEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUoaW50IGFyZ2MsIGNvbnN0
IGNoYXIqIGFyZ3ZbXSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKKyAgICAg
ICAgaWYgKGFyZ3VtZW50ID09ICItLW5vLXRpbWVvdXQtZm9yLWFsbCIpIHsKKyAgICAgICAgICAg
IG1fdXNlV2FpdFRvRHVtcFdhdGNoZG9nVGltZXIgPSBmYWxzZTsKKyAgICAgICAgICAgIG1fZm9y
Y2VOb1RpbWVvdXQgPSB0cnVlOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKwog
ICAgICAgICBpZiAoYXJndW1lbnQgPT0gIi0tcGl4ZWwtdGVzdHMiKSB7CiAgICAgICAgICAgICBt
X2R1bXBQaXhlbHMgPSB0cnVlOwogICAgICAgICAgICAgY29udGludWU7CkBAIC01NTksMTggKzU2
NiwyMCBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpydW4oKQogCiB2b2lkIFRlc3RDb250cm9sbGVy
OjpydW5VbnRpbChib29sJiBkb25lLCBUaW1lb3V0RHVyYXRpb24gdGltZW91dER1cmF0aW9uKQog
ewotICAgIGRvdWJsZSB0aW1lb3V0OwotICAgIHN3aXRjaCAodGltZW91dER1cmF0aW9uKSB7Ci0g
ICAgY2FzZSBTaG9ydFRpbWVvdXQ6Ci0gICAgICAgIHRpbWVvdXQgPSBtX3Nob3J0VGltZW91dDsK
LSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBMb25nVGltZW91dDoKLSAgICAgICAgdGltZW91dCA9
IG1fbG9uZ1RpbWVvdXQ7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgTm9UaW1lb3V0OgotICAg
IGRlZmF1bHQ6Ci0gICAgICAgIHRpbWVvdXQgPSBtX25vVGltZW91dDsKLSAgICAgICAgYnJlYWs7
CisgICAgZG91YmxlIHRpbWVvdXQgPSBtX25vVGltZW91dDsKKyAgICBpZiAoIW1fZm9yY2VOb1Rp
bWVvdXQpIHsKKyAgICAgICAgc3dpdGNoICh0aW1lb3V0RHVyYXRpb24pIHsKKyAgICAgICAgY2Fz
ZSBTaG9ydFRpbWVvdXQ6CisgICAgICAgICAgICB0aW1lb3V0ID0gbV9zaG9ydFRpbWVvdXQ7Cisg
ICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBMb25nVGltZW91dDoKKyAgICAgICAgICAg
IHRpbWVvdXQgPSBtX2xvbmdUaW1lb3V0OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNh
c2UgTm9UaW1lb3V0OgorICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgdGltZW91dCA9IG1f
bm9UaW1lb3V0OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICB9CiAKICAgICBw
bGF0Zm9ybVJ1blVudGlsKGRvbmUsIHRpbWVvdXQpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0
VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0
Q29udHJvbGxlci5oCmluZGV4IGI5NDY1ZWY5NmU1N2U3MzVjNDEwNDQ3ODU0MTkzODY3ZjBiMDVj
YjAuLjIwMTg4YWQ1NTVkNGI3ZTkxZjk0ZDgzM2ZmZmQ1M2I3ZjEwOTYyMjcgMTAwNjQ0Ci0tLSBh
L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaAorKysgYi9Ub29scy9XZWJL
aXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmgKQEAgLTEyOSw2ICsxMjksNyBAQCBwcml2YXRl
OgogICAgIGRvdWJsZSBtX3Nob3J0VGltZW91dDsKICAgICBkb3VibGUgbV9ub1RpbWVvdXQ7CiAg
ICAgYm9vbCBtX3VzZVdhaXRUb0R1bXBXYXRjaGRvZ1RpbWVyOworICAgIGJvb2wgbV9mb3JjZU5v
VGltZW91dDsKIAogICAgIGJvb2wgbV9kaWRQcmludFdlYlByb2Nlc3NDcmFzaGVkTWVzc2FnZTsK
ICAgICBib29sIG1fc2hvdWxkRXhpdFdoZW5XZWJQcm9jZXNzQ3Jhc2hlczsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>152271</attachid>
            <date>2012-07-13 08:55:09 -0700</date>
            <delta_ts>2012-07-13 09:01:59 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-87672-20120713175454.patch</filename>
            <type>text/plain</type>
            <size>6495</size>
            <attacher name="Balazs Kelemen">kbalazs</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWNmZDMxZTQyN2E5N2Uy
MDY1OTllM2VjNmEwZDk1OTYxMGY1M2RmMi4uY2ZlMTNlOGRiNTAwYWU0NmZmYWFlMjI2MjE2NmI1
OGY0MGFlZDMzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA3LTEzICBCYWxh
enMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRdIEFkZCBxdWly
a3MgZm9yIHJ1bm5pbmcgdGhlIHdlYiBwcm9jZXNzIGluIGEgcHJvZmlsZXIgc2hlbGwsIGxpa2Ug
dmFsZ3JpbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTg3NjcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
SWYgZW52aXJvbm1lbnQgdmFyaWFibGVzIFFUX1dFQktJVF9XRUJfUFJPQ0VTU19DT01NQU5EX1BS
RUZJWAorICAgICAgICBhbmQvb3IgUVRfV0VCS0lUX1BMVUdJTl9QUk9DRVNTX0NPTU1BTkRfUFJF
RklYIGFyZSBzZXQsIHVzZSB0aGVpcgorICAgICAgICB2YWx1ZXMgYXMgdGhlIHByZWZpeCBvZiB0
aGUgY29tbWFuZCB3aGVuIGxhdW5jaGluZyB0aGUgY2hpbGQgcHJvY2Vzcy4KKyAgICAgICAgRXhh
bXBsZSB1c2FnZToKKyAgICAgICAgICAgIGV4cG9ydCBRVF9XRUJfUFJPQ0VTU19DT01NQU5EX1BS
RUZJWD0idmFsZ3JpbmQgLS1zbWMtY2hlY2s9YWxsIgorICAgICAgICAgICAgLi9NaW5pQnJvd3Nl
ciBodHRwOi8vc29tZXBhZ2UuaHRtbAorICAgICAgICAgICAgLi9XZWJLaXRUZXN0UnVubmVyIC0t
bm8tdGltZW91dC1mb3ItYWxsIHNvbWVfbGF5b3V0dGVzdC5odG1sCisKKyAgICAgICAgKiBVSVBy
b2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwOgorICAgICAgICAoV2ViS2l0
OjpQcm9jZXNzTGF1bmNoZXI6OmxhdW5jaFByb2Nlc3MpOgorCiAyMDEyLTA3LTEzICBHeXV5b3Vu
ZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0gQWRkICpl
eHBsaWNpdCoga2V5d29yZCB0byBjb25zdHJ1Y3RvciB3aGljaCBoYXMgYSBwYXJhbWV0ZXIKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1
bmNoZXJRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vz
c0xhdW5jaGVyUXQuY3BwCmluZGV4IGM1YzNmNzE0NWRlNmM4OTFjNDVhMmQ1NjYwMDA4MjQ5MGE4
NzVmZDEuLmYwOTlkNjI4MzdiZDc1NDZiOTA2YzVlZjkyMmQwOGEzMzE0MTNlMWMgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJR
dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NM
YXVuY2hlclF0LmNwcApAQCAtMTAxLDkgKzEwMSwxNSBAQCB2b2lkIFF0V2ViUHJvY2Vzczo6c2V0
dXBDaGlsZFByb2Nlc3MoKQogCiB2b2lkIFByb2Nlc3NMYXVuY2hlcjo6bGF1bmNoUHJvY2Vzcygp
CiB7Ci0gICAgUVN0cmluZyBjb21tYW5kTGluZSA9IFFMYXRpbjFTdHJpbmcoIiUxICUyIik7Ci0g
ICAgY29tbWFuZExpbmUgPSBjb21tYW5kTGluZS5hcmcobV9sYXVuY2hPcHRpb25zLnByb2Nlc3NU
eXBlID09IFdlYlByb2Nlc3MgPwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV4
ZWN1dGFibGVQYXRoT2ZXZWJQcm9jZXNzKCkgOiBleGVjdXRhYmxlUGF0aE9mUGx1Z2luUHJvY2Vz
cygpKTsKKyAgICBRU3RyaW5nIGNvbW1hbmRMaW5lID0gUUxhdGluMVN0cmluZygiJTEgJTIgJTMi
KTsKKyAgICBpZiAobV9sYXVuY2hPcHRpb25zLnByb2Nlc3NUeXBlID09IFdlYlByb2Nlc3MpIHsK
KyAgICAgICAgUUJ5dGVBcnJheSB3ZWJQcm9jZXNzUHJlZml4ID0gcWdldGVudigiUVRfV0VCS0lU
Ml9XUF9DTURfUFJFRklYIik7CisgICAgICAgIGNvbW1hbmRMaW5lID0gY29tbWFuZExpbmUuYXJn
KFFMYXRpbjFTdHJpbmcod2ViUHJvY2Vzc1ByZWZpeC5jb25zdERhdGEoKSkpLmFyZyhRU3RyaW5n
KGV4ZWN1dGFibGVQYXRoT2ZXZWJQcm9jZXNzKCkpKTsKKyAgICB9IGVsc2UgaWYgKG1fbGF1bmNo
T3B0aW9ucy5wcm9jZXNzVHlwZSA9PSBQbHVnaW5Qcm9jZXNzKSB7CisgICAgICAgIFFCeXRlQXJy
YXkgcGx1Z2luUHJvY2Vzc1ByZWZpeCA9IHFnZXRlbnYoIlFUX1dFQktJVDJfUFBfQ01EX1BSRUZJ
WCIpOworICAgICAgICBjb21tYW5kTGluZSA9IGNvbW1hbmRMaW5lLmFyZyhRTGF0aW4xU3RyaW5n
KHBsdWdpblByb2Nlc3NQcmVmaXguY29uc3REYXRhKCkpKS5hcmcoUVN0cmluZyhleGVjdXRhYmxl
UGF0aE9mUGx1Z2luUHJvY2VzcygpKSk7CisgICAgfSBlbHNlCisgICAgICAgIEFTU0VSVF9OT1Rf
UkVBQ0hFRCgpOwogCiAjaWYgT1MoREFSV0lOKQogICAgIC8vIENyZWF0ZSB0aGUgbGlzdGVuaW5n
IHBvcnQuCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k
ZXggYTQ4ZDNmNDBjOTAzM2FhMTk0YjQzMTkzM2Y5YWJjOGVkZWE0ZjBmYy4uMjdhM2RhNGVhMTU0
NDA2ODRjMGNiMDc4ZjkwYTQyYzdjZjgzZmY4MiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9n
CisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA3LTEzICBCYWxh
enMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRdIEFkZCBxdWly
a3MgZm9yIHJ1bm5pbmcgdGhlIHdlYiBwcm9jZXNzIGluIGEgcHJvZmlsZXIgc2hlbGwsIGxpa2Ug
dmFsZ3JpbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTg3NjcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
QWRkIC0tbm8tdGltZW91dC1hdC1hbGwgY29tbWFuZCBsaW5lIHN3aXRjaCB0byBub3QgdGltZSBv
dXQgbm8gbWF0dGVyIGhvdworICAgICAgICBsb25nIHRoZSB3ZWIgcHJvY2VzcyBkb2VzIGl0J3Mg
am9iLiAtLW5vLXRpbWVvdXQgaXMgbm90IGVub3VnaCBmb3IgcHJvZmlsaW5nCisgICAgICAgIHB1
cnBvc2VzIGJlY2F1c2UgaXQgb25seSBhZmZlY3RzIHRoZSB0aW1lb3V0IHdoZW4gd2UgYXJlIHdh
aXRpbmcgZm9yIHRoZSBlbmQKKyAgICAgICAgb2YgdGhlIHRlc3QuIFdlIHVzZSBhbm90aGVyIHRp
bWVvdXQgdG8gY29udHJvbCBob3cgbXVjaCB3ZSB3YWl0IGZvciB0aGUgd2ViCisgICAgICAgIHBy
b2Nlc3MgdG8gaW5pdGlhbGl6ZSBiZWZvcmUgYW5kIHJlc2V0IGFmdGVyIHRoZSB0ZXN0IGFuZCBp
dCBjb3VsZCBhbHNvIGVhc2lseQorICAgICAgICBleHBpcmUgd2hlbiBydW5uaW5nIHVuZGVyIHZh
bGdyaW5kLiBXZSBzaG91bGQga2VlcCB0aGUgYmVoYXZpb3Igb2YgLS1uby10aW1lb3V0CisgICAg
ICAgIHRvIG5vdCBkaXNhYmxlIHRoaXMgdGltb3V0IGNoZWNrIGJlY2F1c2UgLS1uby10aW1lb3V0
IGlzIHVzZWQgYnkgcGVyZm9ybWFjZSB0ZXN0cworICAgICAgICBhbmQgdGhvc2Ugc2hvdWxkIG5v
dCB3YWl0IGZvciB0aGUgd2ViIHByb2Nlc3MgdG8gaW5pdGlhbGl6ZSBhbmQgcmVzZXQgbW9yZSB0
aGFuCisgICAgICAgIG5vcm1hbCB0ZXN0cy4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIv
VGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6VGVzdENv
bnRyb2xsZXIpOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZSk6Cisg
ICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpydW5VbnRpbCk6CisgICAgICAgICogV2ViS2l0
VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oOgorCiAyMDEyLTA3LTEzICBaZW5vIEFsYmlzc2Vy
ICA8emVub0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF1bV0syXSBJbXBsZW1lbnQgR3JhcGhp
Y3NTdXJmYWNlIGZvciBMaW51eC9HTFguCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVu
bmVyL1Rlc3RDb250cm9sbGVyLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRy
b2xsZXIuY3BwCmluZGV4IDNjMTBhYzE3MGYwYzUwNTdlOTc2ZWQyYWM2OTEwYWU1ZjkzM2M4NzIu
LmIyZjlmZjVkMTNlMmIzMzM1NTU0ZTcxMzEwNjVhM2E1YTc1ZjY3NDIgMTAwNjQ0Ci0tLSBhL1Rv
b2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCisrKyBiL1Rvb2xzL1dlYktp
dFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCkBAIC03OCw2ICs3OCw3IEBAIFRlc3RDb250
cm9sbGVyOjpUZXN0Q29udHJvbGxlcihpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltdKQogICAg
ICwgbV9zaG9ydFRpbWVvdXQoZGVmYXVsdFNob3J0VGltZW91dCkKICAgICAsIG1fbm9UaW1lb3V0
KGRlZmF1bHROb1RpbWVvdXQpCiAgICAgLCBtX3VzZVdhaXRUb0R1bXBXYXRjaGRvZ1RpbWVyKHRy
dWUpCisgICAgLCBtX2ZvcmNlTm9UaW1lb3V0KGZhbHNlKQogICAgICwgbV9kaWRQcmludFdlYlBy
b2Nlc3NDcmFzaGVkTWVzc2FnZShmYWxzZSkKICAgICAsIG1fc2hvdWxkRXhpdFdoZW5XZWJQcm9j
ZXNzQ3Jhc2hlcyh0cnVlKQogICAgICwgbV9iZWZvcmVVbmxvYWRSZXR1cm5WYWx1ZSh0cnVlKQpA
QCAtMjYwLDYgKzI2MSwxMiBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjppbml0aWFsaXplKGludCBh
cmdjLCBjb25zdCBjaGFyKiBhcmd2W10pCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg
fQogCisgICAgICAgIGlmIChhcmd1bWVudCA9PSAiLS1uby10aW1lb3V0LWF0LWFsbCIpIHsKKyAg
ICAgICAgICAgIG1fdXNlV2FpdFRvRHVtcFdhdGNoZG9nVGltZXIgPSBmYWxzZTsKKyAgICAgICAg
ICAgIG1fZm9yY2VOb1RpbWVvdXQgPSB0cnVlOworICAgICAgICAgICAgY29udGludWU7CisgICAg
ICAgIH0KKwogICAgICAgICBpZiAoYXJndW1lbnQgPT0gIi0tcGl4ZWwtdGVzdHMiKSB7CiAgICAg
ICAgICAgICBtX2R1bXBQaXhlbHMgPSB0cnVlOwogICAgICAgICAgICAgY29udGludWU7CkBAIC01
NTksMTggKzU2NiwyMCBAQCB2b2lkIFRlc3RDb250cm9sbGVyOjpydW4oKQogCiB2b2lkIFRlc3RD
b250cm9sbGVyOjpydW5VbnRpbChib29sJiBkb25lLCBUaW1lb3V0RHVyYXRpb24gdGltZW91dER1
cmF0aW9uKQogewotICAgIGRvdWJsZSB0aW1lb3V0OwotICAgIHN3aXRjaCAodGltZW91dER1cmF0
aW9uKSB7Ci0gICAgY2FzZSBTaG9ydFRpbWVvdXQ6Ci0gICAgICAgIHRpbWVvdXQgPSBtX3Nob3J0
VGltZW91dDsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBMb25nVGltZW91dDoKLSAgICAgICAg
dGltZW91dCA9IG1fbG9uZ1RpbWVvdXQ7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgTm9UaW1l
b3V0OgotICAgIGRlZmF1bHQ6Ci0gICAgICAgIHRpbWVvdXQgPSBtX25vVGltZW91dDsKLSAgICAg
ICAgYnJlYWs7CisgICAgZG91YmxlIHRpbWVvdXQgPSBtX25vVGltZW91dDsKKyAgICBpZiAoIW1f
Zm9yY2VOb1RpbWVvdXQpIHsKKyAgICAgICAgc3dpdGNoICh0aW1lb3V0RHVyYXRpb24pIHsKKyAg
ICAgICAgY2FzZSBTaG9ydFRpbWVvdXQ6CisgICAgICAgICAgICB0aW1lb3V0ID0gbV9zaG9ydFRp
bWVvdXQ7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBMb25nVGltZW91dDoKKyAg
ICAgICAgICAgIHRpbWVvdXQgPSBtX2xvbmdUaW1lb3V0OworICAgICAgICAgICAgYnJlYWs7Cisg
ICAgICAgIGNhc2UgTm9UaW1lb3V0OgorICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgdGlt
ZW91dCA9IG1fbm9UaW1lb3V0OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KICAgICB9
CiAKICAgICBwbGF0Zm9ybVJ1blVudGlsKGRvbmUsIHRpbWVvdXQpOwpkaWZmIC0tZ2l0IGEvVG9v
bHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oIGIvVG9vbHMvV2ViS2l0VGVzdFJ1
bm5lci9UZXN0Q29udHJvbGxlci5oCmluZGV4IGI5NDY1ZWY5NmU1N2U3MzVjNDEwNDQ3ODU0MTkz
ODY3ZjBiMDVjYjAuLjIwMTg4YWQ1NTVkNGI3ZTkxZjk0ZDgzM2ZmZmQ1M2I3ZjEwOTYyMjcgMTAw
NjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaAorKysgYi9U
b29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmgKQEAgLTEyOSw2ICsxMjksNyBA
QCBwcml2YXRlOgogICAgIGRvdWJsZSBtX3Nob3J0VGltZW91dDsKICAgICBkb3VibGUgbV9ub1Rp
bWVvdXQ7CiAgICAgYm9vbCBtX3VzZVdhaXRUb0R1bXBXYXRjaGRvZ1RpbWVyOworICAgIGJvb2wg
bV9mb3JjZU5vVGltZW91dDsKIAogICAgIGJvb2wgbV9kaWRQcmludFdlYlByb2Nlc3NDcmFzaGVk
TWVzc2FnZTsKICAgICBib29sIG1fc2hvdWxkRXhpdFdoZW5XZWJQcm9jZXNzQ3Jhc2hlczsK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>152272</attachid>
            <date>2012-07-13 09:02:06 -0700</date>
            <delta_ts>2012-07-24 06:15:02 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-87672-20120713180150.patch</filename>
            <type>text/plain</type>
            <size>6494</size>
            <attacher name="Balazs Kelemen">kbalazs</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWNmZDMxZTQyN2E5N2Uy
MDY1OTllM2VjNmEwZDk1OTYxMGY1M2RmMi4uNmRlYjU5NjZjOWZiMDc0ODVkMDY5NDUyOTU1MjAw
YjMxYmQ3ODk5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA3LTEzICBCYWxh
enMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRdIEFkZCBxdWly
a3MgZm9yIHJ1bm5pbmcgdGhlIHdlYiBwcm9jZXNzIGluIGEgcHJvZmlsZXIgc2hlbGwsIGxpa2Ug
dmFsZ3JpbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk
PTg3NjcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
SWYgZW52aXJvbm1lbnQgdmFyaWFibGVzIFFUX1dFQktJVF9XRUJfUFJPQ0VTU19DT01NQU5EX1BS
RUZJWAorICAgICAgICBhbmQvb3IgUVRfV0VCS0lUX1BMVUdJTl9QUk9DRVNTX0NPTU1BTkRfUFJF
RklYIGFyZSBzZXQsIHVzZSB0aGVpcgorICAgICAgICB2YWx1ZXMgYXMgdGhlIHByZWZpeCBvZiB0
aGUgY29tbWFuZCB3aGVuIGxhdW5jaGluZyB0aGUgY2hpbGQgcHJvY2Vzcy4KKyAgICAgICAgRXhh
bXBsZSB1c2FnZToKKyAgICAgICAgICAgIGV4cG9ydCBRVF9XRUJfUFJPQ0VTU19DT01NQU5EX1BS
RUZJWD0idmFsZ3JpbmQgLS1zbWMtY2hlY2s9YWxsIgorICAgICAgICAgICAgLi9NaW5pQnJvd3Nl
ciBodHRwOi8vc29tZXBhZ2UuaHRtbAorICAgICAgICAgICAgLi9XZWJLaXRUZXN0UnVubmVyIC0t
bm8tdGltZW91dC1hdC1hbGwgc29tZV9sYXlvdXR0ZXN0Lmh0bWwKKworICAgICAgICAqIFVJUHJv
Y2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6
OlByb2Nlc3NMYXVuY2hlcjo6bGF1bmNoUHJvY2Vzcyk6CisKIDIwMTItMDctMTMgIEd5dXlvdW5n
IEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXSBBZGQgKmV4
cGxpY2l0KiBrZXl3b3JkIHRvIGNvbnN0cnVjdG9yIHdoaWNoIGhhcyBhIHBhcmFtZXRlcgpkaWZm
IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVu
Y2hlclF0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNz
TGF1bmNoZXJRdC5jcHAKaW5kZXggYzVjM2Y3MTQ1ZGU2Yzg5MWM0NWEyZDU2NjAwMDgyNDkwYTg3
NWZkMS4uZjA5OWQ2MjgzN2JkNzU0NmI5MDZjNWVmOTIyZDA4YTMzMTQxM2UxYyAxMDA2NDQKLS0t
IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0
LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xh
dW5jaGVyUXQuY3BwCkBAIC0xMDEsOSArMTAxLDE1IEBAIHZvaWQgUXRXZWJQcm9jZXNzOjpzZXR1
cENoaWxkUHJvY2VzcygpCiAKIHZvaWQgUHJvY2Vzc0xhdW5jaGVyOjpsYXVuY2hQcm9jZXNzKCkK
IHsKLSAgICBRU3RyaW5nIGNvbW1hbmRMaW5lID0gUUxhdGluMVN0cmluZygiJTEgJTIiKTsKLSAg
ICBjb21tYW5kTGluZSA9IGNvbW1hbmRMaW5lLmFyZyhtX2xhdW5jaE9wdGlvbnMucHJvY2Vzc1R5
cGUgPT0gV2ViUHJvY2VzcyA/Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXhl
Y3V0YWJsZVBhdGhPZldlYlByb2Nlc3MoKSA6IGV4ZWN1dGFibGVQYXRoT2ZQbHVnaW5Qcm9jZXNz
KCkpOworICAgIFFTdHJpbmcgY29tbWFuZExpbmUgPSBRTGF0aW4xU3RyaW5nKCIlMSAlMiAlMyIp
OworICAgIGlmIChtX2xhdW5jaE9wdGlvbnMucHJvY2Vzc1R5cGUgPT0gV2ViUHJvY2Vzcykgewor
ICAgICAgICBRQnl0ZUFycmF5IHdlYlByb2Nlc3NQcmVmaXggPSBxZ2V0ZW52KCJRVF9XRUJLSVQy
X1dQX0NNRF9QUkVGSVgiKTsKKyAgICAgICAgY29tbWFuZExpbmUgPSBjb21tYW5kTGluZS5hcmco
UUxhdGluMVN0cmluZyh3ZWJQcm9jZXNzUHJlZml4LmNvbnN0RGF0YSgpKSkuYXJnKFFTdHJpbmco
ZXhlY3V0YWJsZVBhdGhPZldlYlByb2Nlc3MoKSkpOworICAgIH0gZWxzZSBpZiAobV9sYXVuY2hP
cHRpb25zLnByb2Nlc3NUeXBlID09IFBsdWdpblByb2Nlc3MpIHsKKyAgICAgICAgUUJ5dGVBcnJh
eSBwbHVnaW5Qcm9jZXNzUHJlZml4ID0gcWdldGVudigiUVRfV0VCS0lUMl9QUF9DTURfUFJFRklY
Iik7CisgICAgICAgIGNvbW1hbmRMaW5lID0gY29tbWFuZExpbmUuYXJnKFFMYXRpbjFTdHJpbmco
cGx1Z2luUHJvY2Vzc1ByZWZpeC5jb25zdERhdGEoKSkpLmFyZyhRU3RyaW5nKGV4ZWN1dGFibGVQ
YXRoT2ZQbHVnaW5Qcm9jZXNzKCkpKTsKKyAgICB9IGVsc2UKKyAgICAgICAgQVNTRVJUX05PVF9S
RUFDSEVEKCk7CiAKICNpZiBPUyhEQVJXSU4pCiAgICAgLy8gQ3JlYXRlIHRoZSBsaXN0ZW5pbmcg
cG9ydC4KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRl
eCBhNDhkM2Y0MGM5MDMzYWExOTRiNDMxOTMzZjlhYmM4ZWRlYTRmMGZjLi4yN2EzZGE0ZWExNTQ0
MDY4NGMwY2IwNzhmOTBhNDJjN2NmODNmZjgyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK
KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTItMDctMTMgIEJhbGF6
cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgorCisgICAgICAgIFtRdF0gQWRkIHF1aXJr
cyBmb3IgcnVubmluZyB0aGUgd2ViIHByb2Nlc3MgaW4gYSBwcm9maWxlciBzaGVsbCwgbGlrZSB2
YWxncmluZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9
ODc2NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB
ZGQgLS1uby10aW1lb3V0LWF0LWFsbCBjb21tYW5kIGxpbmUgc3dpdGNoIHRvIG5vdCB0aW1lIG91
dCBubyBtYXR0ZXIgaG93CisgICAgICAgIGxvbmcgdGhlIHdlYiBwcm9jZXNzIGRvZXMgaXQncyBq
b2IuIC0tbm8tdGltZW91dCBpcyBub3QgZW5vdWdoIGZvciBwcm9maWxpbmcKKyAgICAgICAgcHVy
cG9zZXMgYmVjYXVzZSBpdCBvbmx5IGFmZmVjdHMgdGhlIHRpbWVvdXQgd2hlbiB3ZSBhcmUgd2Fp
dGluZyBmb3IgdGhlIGVuZAorICAgICAgICBvZiB0aGUgdGVzdC4gV2UgdXNlIGFub3RoZXIgdGlt
ZW91dCB0byBjb250cm9sIGhvdyBtdWNoIHdlIHdhaXQgZm9yIHRoZSB3ZWIKKyAgICAgICAgcHJv
Y2VzcyB0byBpbml0aWFsaXplIGJlZm9yZSBhbmQgcmVzZXQgYWZ0ZXIgdGhlIHRlc3QgYW5kIGl0
IGNvdWxkIGFsc28gZWFzaWx5CisgICAgICAgIGV4cGlyZSB3aGVuIHJ1bm5pbmcgdW5kZXIgdmFs
Z3JpbmQuIFdlIHNob3VsZCBrZWVwIHRoZSBiZWhhdmlvciBvZiAtLW5vLXRpbWVvdXQKKyAgICAg
ICAgdG8gbm90IGRpc2FibGUgdGhpcyB0aW1vdXQgY2hlY2sgYmVjYXVzZSAtLW5vLXRpbWVvdXQg
aXMgdXNlZCBieSBwZXJmb3JtYWNlIHRlc3RzCisgICAgICAgIGFuZCB0aG9zZSBzaG91bGQgbm90
IHdhaXQgZm9yIHRoZSB3ZWIgcHJvY2VzcyB0byBpbml0aWFsaXplIGFuZCByZXNldCBtb3JlIHRo
YW4KKyAgICAgICAgbm9ybWFsIHRlc3RzLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9U
ZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpUZXN0Q29u
dHJvbGxlcik6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjppbml0aWFsaXplKToKKyAg
ICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OnJ1blVudGlsKToKKyAgICAgICAgKiBXZWJLaXRU
ZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmg6CisKIDIwMTItMDctMTMgIFplbm8gQWxiaXNzZXIg
IDx6ZW5vQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XVtXSzJdIEltcGxlbWVudCBHcmFwaGlj
c1N1cmZhY2UgZm9yIExpbnV4L0dMWC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5u
ZXIvVGVzdENvbnRyb2xsZXIuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJv
bGxlci5jcHAKaW5kZXggM2MxMGFjMTcwZjBjNTA1N2U5NzZlZDJhYzY5MTBhZTVmOTMzYzg3Mi4u
YjJmOWZmNWQxM2UyYjMzMzU1NTRlNzEzMTA2NWEzYTVhNzVmNjc0MiAxMDA2NDQKLS0tIGEvVG9v
bHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKKysrIGIvVG9vbHMvV2ViS2l0
VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKQEAgLTc4LDYgKzc4LDcgQEAgVGVzdENvbnRy
b2xsZXI6OlRlc3RDb250cm9sbGVyKGludCBhcmdjLCBjb25zdCBjaGFyKiBhcmd2W10pCiAgICAg
LCBtX3Nob3J0VGltZW91dChkZWZhdWx0U2hvcnRUaW1lb3V0KQogICAgICwgbV9ub1RpbWVvdXQo
ZGVmYXVsdE5vVGltZW91dCkKICAgICAsIG1fdXNlV2FpdFRvRHVtcFdhdGNoZG9nVGltZXIodHJ1
ZSkKKyAgICAsIG1fZm9yY2VOb1RpbWVvdXQoZmFsc2UpCiAgICAgLCBtX2RpZFByaW50V2ViUHJv
Y2Vzc0NyYXNoZWRNZXNzYWdlKGZhbHNlKQogICAgICwgbV9zaG91bGRFeGl0V2hlbldlYlByb2Nl
c3NDcmFzaGVzKHRydWUpCiAgICAgLCBtX2JlZm9yZVVubG9hZFJldHVyblZhbHVlKHRydWUpCkBA
IC0yNjAsNiArMjYxLDEyIEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUoaW50IGFy
Z2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9
CiAKKyAgICAgICAgaWYgKGFyZ3VtZW50ID09ICItLW5vLXRpbWVvdXQtYXQtYWxsIikgeworICAg
ICAgICAgICAgbV91c2VXYWl0VG9EdW1wV2F0Y2hkb2dUaW1lciA9IGZhbHNlOworICAgICAgICAg
ICAgbV9mb3JjZU5vVGltZW91dCA9IHRydWU7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAg
ICAgfQorCiAgICAgICAgIGlmIChhcmd1bWVudCA9PSAiLS1waXhlbC10ZXN0cyIpIHsKICAgICAg
ICAgICAgIG1fZHVtcFBpeGVscyA9IHRydWU7CiAgICAgICAgICAgICBjb250aW51ZTsKQEAgLTU1
OSwxOCArNTY2LDIwIEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OnJ1bigpCiAKIHZvaWQgVGVzdENv
bnRyb2xsZXI6OnJ1blVudGlsKGJvb2wmIGRvbmUsIFRpbWVvdXREdXJhdGlvbiB0aW1lb3V0RHVy
YXRpb24pCiB7Ci0gICAgZG91YmxlIHRpbWVvdXQ7Ci0gICAgc3dpdGNoICh0aW1lb3V0RHVyYXRp
b24pIHsKLSAgICBjYXNlIFNob3J0VGltZW91dDoKLSAgICAgICAgdGltZW91dCA9IG1fc2hvcnRU
aW1lb3V0OwotICAgICAgICBicmVhazsKLSAgICBjYXNlIExvbmdUaW1lb3V0OgotICAgICAgICB0
aW1lb3V0ID0gbV9sb25nVGltZW91dDsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBOb1RpbWVv
dXQ6Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgdGltZW91dCA9IG1fbm9UaW1lb3V0OwotICAgICAg
ICBicmVhazsKKyAgICBkb3VibGUgdGltZW91dCA9IG1fbm9UaW1lb3V0OworICAgIGlmICghbV9m
b3JjZU5vVGltZW91dCkgeworICAgICAgICBzd2l0Y2ggKHRpbWVvdXREdXJhdGlvbikgeworICAg
ICAgICBjYXNlIFNob3J0VGltZW91dDoKKyAgICAgICAgICAgIHRpbWVvdXQgPSBtX3Nob3J0VGlt
ZW91dDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIExvbmdUaW1lb3V0OgorICAg
ICAgICAgICAgdGltZW91dCA9IG1fbG9uZ1RpbWVvdXQ7CisgICAgICAgICAgICBicmVhazsKKyAg
ICAgICAgY2FzZSBOb1RpbWVvdXQ6CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICB0aW1l
b3V0ID0gbV9ub1RpbWVvdXQ7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQogICAgIH0K
IAogICAgIHBsYXRmb3JtUnVuVW50aWwoZG9uZSwgdGltZW91dCk7CmRpZmYgLS1naXQgYS9Ub29s
cy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmggYi9Ub29scy9XZWJLaXRUZXN0UnVu
bmVyL1Rlc3RDb250cm9sbGVyLmgKaW5kZXggYjk0NjVlZjk2ZTU3ZTczNWM0MTA0NDc4NTQxOTM4
NjdmMGIwNWNiMC4uMjAxODhhZDU1NWQ0YjdlOTFmOTRkODMzZmZmZDUzYjdmMTA5NjIyNyAxMDA2
NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oCisrKyBiL1Rv
b2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaApAQCAtMTI5LDYgKzEyOSw3IEBA
IHByaXZhdGU6CiAgICAgZG91YmxlIG1fc2hvcnRUaW1lb3V0OwogICAgIGRvdWJsZSBtX25vVGlt
ZW91dDsKICAgICBib29sIG1fdXNlV2FpdFRvRHVtcFdhdGNoZG9nVGltZXI7CisgICAgYm9vbCBt
X2ZvcmNlTm9UaW1lb3V0OwogCiAgICAgYm9vbCBtX2RpZFByaW50V2ViUHJvY2Vzc0NyYXNoZWRN
ZXNzYWdlOwogICAgIGJvb2wgbV9zaG91bGRFeGl0V2hlbldlYlByb2Nlc3NDcmFzaGVzOwo=
</data>

          </attachment>
      

    </bug>

</bugzilla>