<?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>57796</bug_id>
          
          <creation_ts>2011-04-04 15:33:48 -0700</creation_ts>
          <short_desc>[Qt] [WK2] Add method to disable plugins under WK2</short_desc>
          <delta_ts>2011-05-05 15:04:37 -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>Other</rep_platform>
          <op_sys>Linux</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>Enhancement</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>0</everconfirmed>
          <reporter name="Keith Kyzivat">kamaji</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>benjamin</cc>
    
    <cc>commit-queue</cc>
    
    <cc>cshu</cc>
    
    <cc>laszlo.gombos</cc>
    
    <cc>ossy</cc>
    
    <cc>yael</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>379141</commentid>
    <comment_count>0</comment_count>
    <who name="Keith Kyzivat">kamaji</who>
    <bug_when>2011-04-04 15:33:48 -0700</bug_when>
    <thetext>When compiling WK2 in non-X11 unix environments, the compilation of the Netscape plugin support fails due to X11 dependencies.
Furthermore, if one wishes to just disable this functionality with ENABLE_NETSCAPE_PLUGIN_API=0 , it doesn&apos;t work, as it still tries to link with the Netscape Plugin code, which depends on X11.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>379190</commentid>
    <comment_count>1</comment_count>
      <attachid>88152</attachid>
    <who name="Keith Kyzivat">kamaji</who>
    <bug_when>2011-04-04 16:27:11 -0700</bug_when>
    <thetext>Created attachment 88152
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>379453</commentid>
    <comment_count>2</comment_count>
      <attachid>88152</attachid>
    <who name="Benjamin Poulain">benjamin</who>
    <bug_when>2011-04-05 05:03:23 -0700</bug_when>
    <thetext>Comment on attachment 88152
Patch

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

Why the guard #elif (PLATFORM(QT) || (PLATFORM(GTK))) &amp;&amp; (OS(UNIX) &amp;&amp; !OS(MAC_OS_X)) is not enough for your issue?
Your fix looks weird to me, the plugin architecture seems more general than just NPAPI.

&gt; Tools/Tools.pro:14
&gt; +        exists($$PWD/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro): SUBDIRS += DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro

Why do you change the indentation?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>379636</commentid>
    <comment_count>3</comment_count>
      <attachid>88152</attachid>
    <who name="Keith Kyzivat">kamaji</who>
    <bug_when>2011-04-05 09:28:16 -0700</bug_when>
    <thetext>Comment on attachment 88152
Patch

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

What I&apos;ve come across is - I have a Linux install that contains Qt (Lighthouse), but no X11.  The WK2 NPAPI code currently has dependencies on X11, so I&apos;d like to be able to disable it. 
It appears that WK2 does not honor ENABLE_NETSCAPE_PLUGIN_API=0, so I put this in here as an easy way to make this particular case work.

Right now, the only files that use PLUGIN_ARCHITECTURE_XXX are all relating to NPAPI (that I can see).
I do see what you&apos;re saying though - that &quot;PLUGIN_ARCHITECTURE_&quot; indicates this applies to more than just NPAPI.

Maybe the answer is an ENABLE_PLUGIN_ARCHITECTURE=0 define?

&gt;&gt; Tools/Tools.pro:14
&gt;&gt; +        exists($$PWD/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro): SUBDIRS += DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
&gt; 
&gt; Why do you change the indentation?

This is leftover from a prior iteration, and I missed cleaning it up.  Will fix in an updated patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>380579</commentid>
    <comment_count>4</comment_count>
    <who name="Keith Kyzivat">kamaji</who>
    <bug_when>2011-04-06 10:37:50 -0700</bug_when>
    <thetext>Change title from:
[Qt] [WK2] Allow WK2 ENABLE_NETSCAPE_PLUGIN_API=0 to work in non-X11 unix environments
to:
[Qt] [WK2] Add feature to disable all plugins under WK2</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>380728</commentid>
    <comment_count>5</comment_count>
      <attachid>88487</attachid>
    <who name="Keith Kyzivat">kamaji</who>
    <bug_when>2011-04-06 12:35:53 -0700</bug_when>
    <thetext>Created attachment 88487
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>380840</commentid>
    <comment_count>6</comment_count>
      <attachid>88487</attachid>
    <who name="Benjamin Poulain">benjamin</who>
    <bug_when>2011-04-06 14:29:08 -0700</bug_when>
    <thetext>Comment on attachment 88487
Patch

This looks reasonable but there is something I don&apos;t get.
Why add a new define for plugins, instead of adding a new define for X11 (if there is no such thing already)?

I have not checked, but I would think there are other cases of Unix but !X11. Or is X11 really used by WebCore only for plugins? I would think window surface sharing is another area where such cases happen.

I would think (Linux &amp;&amp; !X11) has other applications we could share with other ports like Android.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>380898</commentid>
    <comment_count>7</comment_count>
    <who name="Keith Kyzivat">kamaji</who>
    <bug_when>2011-04-06 15:21:19 -0700</bug_when>
    <thetext>I had originally thought to check against X11, however I was unsure if implicitly turning off Netscape Plugin support for !X11 Unix environments was the right thing to do.

Right now the Netscape Plugin API relies on X11 constructs, however, we may eventually want to add support for this.

I tried yesterday to do just that, but I was unable to figure out a good way to determine if there is X11 available at Platform.h time without including qglobal.h (to get access to Q_WS_X11) - and that&apos;s a bad idea - If done there, it means qglobal.h will be included for all things including Platform.h -- most of Webkit I think (?).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>392878</commentid>
    <comment_count>8</comment_count>
      <attachid>88487</attachid>
    <who name="Tor Arne Vestbø">vestbo</who>
    <bug_when>2011-04-26 15:51:36 -0700</bug_when>
    <thetext>Comment on attachment 88487
Patch

I agree with Benjamin. If there&apos;s a dependency on X11, we should check for that using stuff like the HAVE() macro, not another global ENABLE() macro that just maps to the NPAPI enable.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>394971</commentid>
    <comment_count>9</comment_count>
    <who name="Keith Kyzivat">kamaji</who>
    <bug_when>2011-04-28 17:24:00 -0700</bug_when>
    <thetext>(In reply to comment #8)
&gt; (From update of attachment 88487 [details])
&gt; I agree with Benjamin. If there&apos;s a dependency on X11, we should check for that using stuff like the HAVE() macro, not another global ENABLE() macro that just maps to the NPAPI enable.

Unfortunately, I have not found a way to add a HAVE(X11) without including qglobal.h in platform.h -- and that would mask a lot of errors if we did that.

I have a solution forthcoming.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>394972</commentid>
    <comment_count>10</comment_count>
      <attachid>91602</attachid>
    <who name="Keith Kyzivat">kamaji</who>
    <bug_when>2011-04-28 17:28:40 -0700</bug_when>
    <thetext>Created attachment 91602
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>399019</commentid>
    <comment_count>11</comment_count>
      <attachid>91602</attachid>
    <who name="Laszlo Gombos">laszlo.gombos</who>
    <bug_when>2011-05-05 14:13:33 -0700</bug_when>
    <thetext>Comment on attachment 91602
Patch

I find it useful to have an option to disable plugins for WK2 independently of X11 support. We might still need an independent HAVE(X11) switch later on for reasons discussed above.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>399081</commentid>
    <comment_count>12</comment_count>
      <attachid>91602</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2011-05-05 15:04:31 -0700</bug_when>
    <thetext>Comment on attachment 91602
Patch

Clearing flags on attachment: 91602

Committed r85887: &lt;http://trac.webkit.org/changeset/85887&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>399082</commentid>
    <comment_count>13</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2011-05-05 15:04:37 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>88152</attachid>
            <date>2011-04-04 16:27:11 -0700</date>
            <delta_ts>2011-04-06 12:35:49 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-57796-20110404192827.patch</filename>
            <type>text/plain</type>
            <size>2586</size>
            <attacher name="Keith Kyzivat">kamaji</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogODI4MzkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAwNDQ3ZmNhOGUwZjY2Y2Ji
MWNlMGE3ZjhlZTZhZjVlOGQ2Yjg2M2QzLi42NGE2MDIwZGQxMDFjZTZlNzA4OGM2YjY5Y2Y1ZWFj
NjdjNWEyOWM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291
cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDQtMDQgIEtlaXRo
IEt5eml2YXQgIDxrZWl0aC5reXppdmF0QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFtXSzJdIEFsbG93IFdLMiBFTkFCTEVf
TkVUU0NBUEVfUExVR0lOX0FQST0wIHRvIHdvcmsgaW4gbm9uLVgxMSB1bml4IGVudmlyb25tZW50
cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc3OTYK
KworICAgICAgICAqIGNvbmZpZy5oOgorCiAyMDExLTA0LTA0ICBCcmFkeSBFaWRzb24gIDxiZWlk
c29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAt
LWdpdCBhL1NvdXJjZS9XZWJLaXQyL2NvbmZpZy5oIGIvU291cmNlL1dlYktpdDIvY29uZmlnLmgK
aW5kZXggNGQwYWNiZTJmNTA5MzhkMGY0NTEzZDZkZmNjYzAwYmRjMWJmNTg3My4uYjQ1MGY5MTE2
YzE2ZWNiMDQ1MjkwYjE1OTdmNTg3MTE0ZjAzMTM1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp
dDIvY29uZmlnLmgKKysrIGIvU291cmNlL1dlYktpdDIvY29uZmlnLmgKQEAgLTE0MSw2ICsxNDEs
NyBAQCBzdGF0aWMgY29uc3QgdHlwZSYgbmFtZSgpIFwKIAogI2VuZGlmCiAKKyNpZiBFTkFCTEUo
TkVUU0NBUEVfUExVR0lOX0FQSSkKICNpZiBQTEFURk9STShNQUMpCiAjZGVmaW5lIFBMVUdJTl9B
UkNISVRFQ1RVUkVfTUFDIDEKICNlbGlmIFBMQVRGT1JNKFdJTikKQEAgLTE1MCw1ICsxNTEsOCBA
QCBzdGF0aWMgY29uc3QgdHlwZSYgbmFtZSgpIFwKICNlbHNlCiAjZGVmaW5lIFBMVUdJTl9BUkNI
SVRFQ1RVUkVfVU5TVVBQT1JURUQgMQogI2VuZGlmCisjZWxzZQorI2RlZmluZSBQTFVHSU5fQVJD
SElURUNUVVJFX1VOU1VQUE9SVEVEIDEKKyNlbmRpZgogCiAjZGVmaW5lIFBMVUdJTl9BUkNISVRF
Q1RVUkUoQVJDSCkgKGRlZmluZWQgUExVR0lOX0FSQ0hJVEVDVFVSRV8jI0FSQ0ggJiYgUExVR0lO
X0FSQ0hJVEVDVFVSRV8jI0FSQ0gpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s
cy9DaGFuZ2VMb2cKaW5kZXggNjFjZTBkZjk2ZjJjN2VkNGYyZTA2NzE4ODgzYjM1OTVjOWE0ZTkw
YS4uZTI0ODY2NzVmZTZiZDFhZGY0ODlmNDQ4NjkzNzk5Y2Y2MTdmMzU4NiAxMDA2NDQKLS0tIGEv
VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisy
MDExLTA0LTA0ICBLZWl0aCBLeXppdmF0ICA8a2VpdGgua3l6aXZhdEBub2tpYS5jb20+CisKKyAg
ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBbV0syXSBB
bGxvdyBXSzIgRU5BQkxFX05FVFNDQVBFX1BMVUdJTl9BUEk9MCB0byB3b3JrIGluIG5vbi1YMTEg
dW5peCBlbnZpcm9ubWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i
dWcuY2dpP2lkPTU3Nzk2CisKKyAgICAgICAgKiBUb29scy5wcm86CisKIDIwMTEtMDQtMDQgIFBh
dmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZp
ZXdlZCwgZml4IGV4Y2VwdGlvbiBpbiByZWJhc2VsaW5lIHRvb2wuCmRpZmYgLS1naXQgYS9Ub29s
cy9Ub29scy5wcm8gYi9Ub29scy9Ub29scy5wcm8KaW5kZXggY2E0YmEzZGUxZWY1MmUzOGI2ZjMx
MjY3ZWZkMDQ2MTI2OTI1YjYzNC4uZGE0ZjcxMGJmNDM4Y2Q3NDg0NDhkOGUzMzgzNWQ0MDQwMjVi
OTkyMCAxMDA2NDQKLS0tIGEvVG9vbHMvVG9vbHMucHJvCisrKyBiL1Rvb2xzL1Rvb2xzLnBybwpA
QCAtMTAsNiArMTAsNiBAQCB3ZWJraXQyIHsKICAgICBleGlzdHMoJCRQV0QvV2ViS2l0VGVzdFJ1
bm5lci9XZWJLaXRUZXN0UnVubmVyLnBybyk6IFNVQkRJUlMgKz0gV2ViS2l0VGVzdFJ1bm5lci9X
ZWJLaXRUZXN0UnVubmVyLnBybwogfQogCi0hd2luMzI6IXN5bWJpYW4gewotICAgIGV4aXN0cygk
JFBXRC9EdW1wUmVuZGVyVHJlZS9xdC9UZXN0TmV0c2NhcGVQbHVnaW4vVGVzdE5ldHNjYXBlUGx1
Z2luLnBybyk6IFNVQkRJUlMgKz0gRHVtcFJlbmRlclRyZWUvcXQvVGVzdE5ldHNjYXBlUGx1Z2lu
L1Rlc3ROZXRzY2FwZVBsdWdpbi5wcm8KK2NvbnRhaW5zKERFRklORVMsIEVOQUJMRV9ORVRTQ0FQ
RV9QTFVHSU5fQVBJPTEpOiF3aW4zMjohc3ltYmlhbiB7CisgICAgICAgIGV4aXN0cygkJFBXRC9E
dW1wUmVuZGVyVHJlZS9xdC9UZXN0TmV0c2NhcGVQbHVnaW4vVGVzdE5ldHNjYXBlUGx1Z2luLnBy
byk6IFNVQkRJUlMgKz0gRHVtcFJlbmRlclRyZWUvcXQvVGVzdE5ldHNjYXBlUGx1Z2luL1Rlc3RO
ZXRzY2FwZVBsdWdpbi5wcm8KIH0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>88487</attachid>
            <date>2011-04-06 12:35:53 -0700</date>
            <delta_ts>2011-04-28 17:28:31 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-57796-20110406153708.patch</filename>
            <type>text/plain</type>
            <size>5158</size>
            <attacher name="Keith Kyzivat">kamaji</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogODMwNjkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0
Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGI4
MTI1NzRlMjQ4ZGVmZmQwZDFjM2Q4NTgxODliZjhmMTllNjg3OTMuLjQwN2NiZWUwYzJlZWYzMzBi
MGExYzRkMmQ0ZThiNmZiYWQ0MGM0ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y
ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz
ICsxLDEyIEBACisyMDExLTA0LTA2ICBLZWl0aCBLeXppdmF0ICA8a2VpdGgua3l6aXZhdEBub2tp
YS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg
W1F0XSBbV0syXSBBZGQgZmVhdHVyZSB0byBkaXNhYmxlIGFsbCBwbHVnaW5zIHVuZGVyIFdLMgor
ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc3OTYKKwor
ICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgorCiAyMDExLTA0LTA2ICBMdWNhcyBEZSBNYXJjaGkg
IDxsdWNhcy5kZW1hcmNoaUBwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBjbWFrZTogRml4IGJ1
aWxkIGZvciBBUk12NwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9QbGF0
Zm9ybS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9QbGF0Zm9ybS5oCmluZGV4IGU0MGIx
YTZkZjM5MzUyMzU1YmFkNWMxNjk4OWY2YTRhMGFlYjkxZWEuLmMyMWFlYmJiODg2ZjMzMmMxMzk4
MTlhZTBkYjFjZWEyYmE1NmQxZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93
dGYvUGxhdGZvcm0uaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL1BsYXRmb3JtLmgK
QEAgLTkyNyw2ICs5MjcsMTMgQEAKICNkZWZpbmUgRU5BQkxFX05FVFNDQVBFX1BMVUdJTl9NRVRB
REFUQV9DQUNIRSAwCiAjZW5kaWYKIAorI2lmICFkZWZpbmVkKEVOQUJMRV9QTFVHSU4pCisjZGVm
aW5lIEVOQUJMRV9QTFVHSU4gMQorI2VsaWYgIUVOQUJMRShQTFVHSU4pCisjdW5kZWYgRU5BQkxF
X05FVFNDQVBFX1BMVUdJTl9BUEkKKyNkZWZpbmUgRU5BQkxFX05FVFNDQVBFX1BMVUdJTl9BUEkg
MAorI2VuZGlmCisKICNpZiAhZGVmaW5lZChFTkFCTEVfUFVSR0VBQkxFX01FTU9SWSkKICNkZWZp
bmUgRU5BQkxFX1BVUkdFQUJMRV9NRU1PUlkgMAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2Uv
V2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDYyMDk5
YzMwNmNjZTVkOGJiMTZhODFkZTU4MmZhMTUxOTUwYmQxMi4uYzRkM2U3MTk1OGM3NDhjOTNmZWUx
MDhiZmI3MDQ3ZDMxZTlmMWE4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n
CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDExLTA0
LTA2ICBLZWl0aCBLeXppdmF0ICA8a2VpdGgua3l6aXZhdEBub2tpYS5jb20+CisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBbV0syXSBBZGQgZmVh
dHVyZSB0byBkaXNhYmxlIGFsbCBwbHVnaW5zIHVuZGVyIFdLMgorICAgICAgICBodHRwczovL2J1
Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTc3OTYKKworICAgICAgICBCdWlsZCBjaGFu
Z2UgKG5vIG5ldyB0ZXN0cykuCisKKyAgICAgICAgKiBmZWF0dXJlcy5wcmk6CisKIDIwMTEtMDQt
MDYgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbi5wb3VsYWluQG5va2lhLmNvbT4KIAogICAg
ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl
L2ZlYXR1cmVzLnByaSBiL1NvdXJjZS9XZWJDb3JlL2ZlYXR1cmVzLnByaQppbmRleCA4ZmJjZmVl
OGI3YTI0YzhjMzQ0MzE1NTI1MmM5ZGQ3NTIxNTg3NzMwLi4xNDc1OTJmYzA2ZDIyY2E0ZGEyYmQy
YjI4YWI3NjZhMDc1Nzk5NGRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9mZWF0dXJlcy5w
cmkKKysrIGIvU291cmNlL1dlYkNvcmUvZmVhdHVyZXMucHJpCkBAIC0zNSw2ICszNSw4IEBAIGNv
bnRhaW5zKERFRklORVMsIEVOQUJMRV9TSU5HTEVfVEhSRUFERUQ9MSkgewogIyB0dXJuIG9mZiBT
UUxJVEUgc3VwcG9ydCBpZiB3ZSBkbyBub3QgaGF2ZSBzcWxpdGUzIGF2YWlsYWJsZQogIUNPTkZJ
RyhRVERJUl9idWlsZCk6d2luMzItKjohZXhpc3RzKCAkJHtTUUxJVEUzU1JDRElSfS9zcWxpdGUz
LmMgKTogREVGSU5FUyArPSBFTkFCTEVfU1FMSVRFPTAgRU5BQkxFX0RBVEFCQVNFPTAgRU5BQkxF
X1dPUktFUlM9MCBFTkFCTEVfU0hBUkVEX1dPUktFUlM9MCBFTkFCTEVfSUNPTkRBVEFCQVNFPTAg
RU5BQkxFX09GRkxJTkVfV0VCX0FQUExJQ0FUSU9OUz0wIEVOQUJMRV9ET01fU1RPUkFHRT0wCiAK
K2NvbnRhaW5zKERFRklORVMsIEVOQUJMRV9QTFVHSU49MCk6IERFRklORVMgKz0gRU5BQkxFX05F
VFNDQVBFX1BMVUdJTl9BUEk9MAorCiAhY29udGFpbnMoREVGSU5FUywgRU5BQkxFX0pBVkFTQ1JJ
UFRfREVCVUdHRVI9Lik6IERFRklORVMgKz0gRU5BQkxFX0pBVkFTQ1JJUFRfREVCVUdHRVI9MQog
IWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9EQVRBQkFTRT0uKTogREVGSU5FUyArPSBFTkFCTEVf
REFUQUJBU0U9MQogIWNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9FVkVOVFNPVVJDRT0uKTogREVG
SU5FUyArPSBFTkFCTEVfRVZFTlRTT1VSQ0U9MQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv
Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDA0MzM1NDQ4MmY2ODM4
YzJlODM1ZTU4ZDUyNTEwZjdlZDdhMjVlYmQuLmI4YTEwZjVkODExMWJkNTM3YWNlMWE1ZWZkODkw
MzlhMmY3M2I5OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9T
b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMS0wNC0wNiAgS2Vp
dGggS3l6aXZhdCAgPGtlaXRoLmt5eml2YXRAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2Vk
IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gW1dLMl0gQWRkIGZlYXR1cmUgdG8g
ZGlzYWJsZSBhbGwgcGx1Z2lucyB1bmRlciBXSzIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp
dC5vcmcvc2hvd19idWcuY2dpP2lkPTU3Nzk2CisKKyAgICAgICAgKiBjb25maWcuaDoKKwogMjAx
MS0wNC0wNiAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAg
IFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvY29u
ZmlnLmggYi9Tb3VyY2UvV2ViS2l0Mi9jb25maWcuaAppbmRleCAwZDI0OTU3ZWI0NDgyZGFkYTVl
YTYxNTM4NmQwYjI3MDk2ZjMyNmU0Li45MDVmM2RjMjJmNDdlNzM4Yjc4MTE1ODNjNzQzZTQ2ZDNm
ZjY1ZjYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9jb25maWcuaAorKysgYi9Tb3VyY2Uv
V2ViS2l0Mi9jb25maWcuaApAQCAtMTQxLDYgKzE0MSw3IEBAIHN0YXRpYyBjb25zdCB0eXBlJiBu
YW1lKCkgXAogCiAjZW5kaWYKIAorI2lmIEVOQUJMRShQTFVHSU4pCiAjaWYgUExBVEZPUk0oTUFD
KQogI2RlZmluZSBQTFVHSU5fQVJDSElURUNUVVJFX01BQyAxCiAjZWxpZiBQTEFURk9STShXSU4p
CkBAIC0xNTAsNSArMTUxLDggQEAgc3RhdGljIGNvbnN0IHR5cGUmIG5hbWUoKSBcCiAjZWxzZQog
I2RlZmluZSBQTFVHSU5fQVJDSElURUNUVVJFX1VOU1VQUE9SVEVEIDEKICNlbmRpZgorI2Vsc2UK
KyNkZWZpbmUgUExVR0lOX0FSQ0hJVEVDVFVSRV9VTlNVUFBPUlRFRCAxCisjZW5kaWYKIAogI2Rl
ZmluZSBQTFVHSU5fQVJDSElURUNUVVJFKEFSQ0gpIChkZWZpbmVkIFBMVUdJTl9BUkNISVRFQ1RV
UkVfIyNBUkNIICYmIFBMVUdJTl9BUkNISVRFQ1RVUkVfIyNBUkNIKQpkaWZmIC0tZ2l0IGEvVG9v
bHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGViYTIwMTY5YTRjYzE3ZjI3NTJl
NTc4NDVkYzA3MjNmMTMwMWNhZWYuLjljZmM5ZWMyZDZhZGZhYTZlNTcyOGRmNTU3OWY0ZmE3ODFj
MDYxYjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK
QEAgLTEsMyArMSwxMyBAQAorMjAxMS0wNC0wNiAgS2VpdGggS3l6aXZhdCAgPGtlaXRoLmt5eml2
YXRAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIFtRdF0gW1dLMl0gQWRkIGZlYXR1cmUgdG8gZGlzYWJsZSBhbGwgcGx1Z2lucyB1bmRl
ciBXSzIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3
Nzk2CisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDoKKyAgICAgICAgKiBUb29scy5w
cm86CisKIDIwMTEtMDQtMDYgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxzdmlsbGFyQGlnYWxpYS5j
b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEv
VG9vbHMvVG9vbHMucHJvIGIvVG9vbHMvVG9vbHMucHJvCmluZGV4IDJlM2Q5NmU5YmFmYWFjZGVm
ODAwZTk3N2QwZWJlYmJhMmQwYmNmYmQuLmMzZTM0ZjY2MjU0NTAxZWU2NjM0ZDNlNjdmMDlhODcy
ZDg1NTA1M2YgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rvb2xzLnBybworKysgYi9Ub29scy9Ub29scy5w
cm8KQEAgLTEwLDYgKzEwLDYgQEAgd2Via2l0MiB7CiAgICAgIXN5bWJpYW46ZXhpc3RzKCQkUFdE
L1dlYktpdFRlc3RSdW5uZXIvV2ViS2l0VGVzdFJ1bm5lci5wcm8pOiBTVUJESVJTICs9IFdlYktp
dFRlc3RSdW5uZXIvV2ViS2l0VGVzdFJ1bm5lci5wcm8KIH0KIAotIXdpbjMyOiFzeW1iaWFuIHsK
K2NvbnRhaW5zKERFRklORVMsIEVOQUJMRV9ORVRTQ0FQRV9QTFVHSU5fQVBJPTEpOmNvbnRhaW5z
KERFRklORVMsIEVOQUJMRV9QTFVHSU49MSk6IXdpbjMyOiFzeW1iaWFuIHsKICAgICBleGlzdHMo
JCRQV0QvRHVtcFJlbmRlclRyZWUvcXQvVGVzdE5ldHNjYXBlUGx1Z2luL1Rlc3ROZXRzY2FwZVBs
dWdpbi5wcm8pOiBTVUJESVJTICs9IER1bXBSZW5kZXJUcmVlL3F0L1Rlc3ROZXRzY2FwZVBsdWdp
bi9UZXN0TmV0c2NhcGVQbHVnaW4ucHJvCiB9Cg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>91602</attachid>
            <date>2011-04-28 17:28:40 -0700</date>
            <delta_ts>2011-05-05 15:04:31 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-57796-20110428202934.patch</filename>
            <type>text/plain</type>
            <size>1276</size>
            <attacher name="Keith Kyzivat">kamaji</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogODUyNjMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No
YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjOTY2MmRjNGFlYTdmN2Uz
MzZhNDYxMTE5NzU1M2MzM2M4Mjg3OTE3Li42MzlhYzcwZDBlY2ZmYzdhYzRiNzM4NDI1ODM4Njdm
ZDI0YWQ3OGNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291
cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDQtMjggIEtlaXRo
IEt5eml2YXQgIDxrZWl0aC5reXppdmF0QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi
eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFtXSzJdIEFkZCBtZXRob2QgdG8gZGlz
YWJsZSBwbHVnaW5zIHVuZGVyIFdLMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9NTc3OTYKKworICAgICAgICAqIGNvbmZpZy5oOiBBbGxvdyBQTFVHSU5f
QVJDSElURUNUVVJFX1VOU1VQUE9SVEVEIHRvIGJlIGRlZmluZWQgb24gYnVpbGQgY29tbWFuZCBs
aW5lCisKIDIwMTEtMDQtMjggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K
IAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X
ZWJLaXQyL2NvbmZpZy5oIGIvU291cmNlL1dlYktpdDIvY29uZmlnLmgKaW5kZXggODI1MDg5MTg3
MTdjNjQyNmMyNzY4MWVlZjUxMTZkMzgwZWEyMjM3OC4uNTNmNTY3ZWUzZmE0MDU0MTFmNTc2MWE0
ZWJmYzE1ZmI5Yjg1MDAzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvY29uZmlnLmgKKysr
IGIvU291cmNlL1dlYktpdDIvY29uZmlnLmgKQEAgLTE0MSw2ICsxNDEsNyBAQCBzdGF0aWMgY29u
c3QgdHlwZSYgbmFtZSgpIFwKIAogI2VuZGlmCiAKKyNpZm5kZWYgUExVR0lOX0FSQ0hJVEVDVFVS
RV9VTlNVUFBPUlRFRAogI2lmIFBMQVRGT1JNKE1BQykKICNkZWZpbmUgUExVR0lOX0FSQ0hJVEVD
VFVSRV9NQUMgMQogI2VsaWYgUExBVEZPUk0oV0lOKQpAQCAtMTUwLDUgKzE1MSw2IEBAIHN0YXRp
YyBjb25zdCB0eXBlJiBuYW1lKCkgXAogI2Vsc2UKICNkZWZpbmUgUExVR0lOX0FSQ0hJVEVDVFVS
RV9VTlNVUFBPUlRFRCAxCiAjZW5kaWYKKyNlbmRpZgogCiAjZGVmaW5lIFBMVUdJTl9BUkNISVRF
Q1RVUkUoQVJDSCkgKGRlZmluZWQgUExVR0lOX0FSQ0hJVEVDVFVSRV8jI0FSQ0ggJiYgUExVR0lO
X0FSQ0hJVEVDVFVSRV8jI0FSQ0gpCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>