53275 2011-01-27 17:54:13 -0800 Fix ContentType parameter parsing error 2011-04-07 11:46:46 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 max.hong.shen nancy.piedra ap commit-queue eric.carlson max.hong.shen nancy.piedra oldest_to_newest 341193 0 max.hong.shen 2011-01-27 17:54:13 -0800 The implementation of ContentType::parameter() is incorrect for some particular cases, take LayoutTests/media/video-can-play-type.html for an example, testExpected("video.canPlayType('video/mpeg; Codecs=&quot;avc1.4D400C&quot;')", "probably"); The ContentType::parameter() returns "&quot" 341228 1 80395 max.hong.shen 2011-01-27 18:28:38 -0800 Created attachment 80395 first try 341362 2 80395 kling 2011-01-28 01:26:18 -0800 Comment on attachment 80395 first try View in context: https://bugs.webkit.org/attachment.cgi?id=80395&action=review > Source/WebCore/ChangeLog:10 > + Refactor only, no new tests. This is not a refactor, you're fixing a bug. We need a regression test. :) 341430 3 max.hong.shen 2011-01-28 07:27:29 -0800 (In reply to comment #2) > (From update of attachment 80395 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=80395&action=review > > > Source/WebCore/ChangeLog:10 > > + Refactor only, no new tests. > > This is not a refactor, you're fixing a bug. We need a regression test. :) Thanks Kling, I will work on making a test for it :) 341637 4 80481 max.hong.shen 2011-01-28 12:23:27 -0800 Created attachment 80481 add logs to help testing 341650 5 max.hong.shen 2011-01-28 12:37:19 -0800 Kling, LayoutTests/media/video-can-play-type.html is supposed to be the test for this change, however, it may not help much because no one really uses the media type codecs. For example,MediaPlayerPrivateQTKit::supportsType() only checks whether the codecs is empty or not (this can explain why this bug exists so long without causing any trouble.). I tried to fix it since MediaPlayerPrivateQt::supportsType() needs to pass correct codecs to QMediaPlayer::hasSupport(mime, QStringList(codec)). However, the hasSupport() may have other unsolved issues since it always returns "QtMultimediaKit::MaybeSupported", event the mime type is "video/blahblah". So all the layouttest is not really reliable. Instead, I added some logs in the patch to help testing. If you have better idea to make a test for this change, please let me know. thx 341797 6 80481 ap 2011-01-28 15:30:14 -0800 Comment on attachment 80481 add logs to help testing There is nothing in RFC 2616 that talks about SGML-style named entities, so "&quot;" is not magic in HTTP. If there is an actual compatibility issue that affects existing Web sites, please provide more information about it. 341855 7 max.hong.shen 2011-01-28 16:51:46 -0800 (In reply to comment #6) > (From update of attachment 80481 [details]) > There is nothing in RFC 2616 that talks about SGML-style named entities, so "&quot;" is not magic in HTTP. > > If there is an actual compatibility issue that affects existing Web sites, please provide more information about it. Thanks Alexey for review :). One example for "&quot;" issue is LayoutTests/media/video-can-play-type.html. testExpected("video.canPlayType('video/mpeg; Codecs=&quot;avc1.4D400C&quot;')", "probably"); Also,if you check the ContentType::parameter() in ContentType.cpp and the 50th line seems not right, size_t end = strippedType.find(';', start + 6); Note, the 'start' is the index of semi-colon, then why it adds 6 here? 341883 8 ap 2011-01-28 17:13:38 -0800 (In reply to comment #7) > One example for "&quot;" issue is LayoutTests/media/video-can-play-type.html. I don't know why this subtest was originally added. This could be an intentional test for an incorrect parameter, or a simple mistake (perhaps \" should have been used instead of &quot;). Nothing in the test's history indicates that &quot; should be parsed as a quotation mark. > Also,if you check the ContentType::parameter() in ContentType.cpp and the 50th line seems not right, > > size_t end = strippedType.find(';', start + 6); > > Note, the 'start' is the index of semi-colon, then why it adds 6 here? Yes, this part of your patch seems fine. I didn't verify it in detail for off by one errors and such. Please add tests for the issues you fixed. 344030 9 max.hong.shen 2011-02-02 10:13:54 -0800 (In reply to comment #8) > (In reply to comment #7) > > One example for "&quot;" issue is LayoutTests/media/video-can-play-type.html. > > I don't know why this subtest was originally added. This could be an intentional test for an incorrect parameter, or a simple mistake (perhaps \" should have been used instead of &quot;). > > Nothing in the test's history indicates that &quot; should be parsed as a quotation mark. > > > Also,if you check the ContentType::parameter() in ContentType.cpp and the 50th line seems not right, > > > > size_t end = strippedType.find(';', start + 6); > > > > Note, the 'start' is the index of semi-colon, then why it adds 6 here? > > Yes, this part of your patch seems fine. I didn't verify it in detail for off by one errors and such. Please add tests for the issues you fixed. I have reported a qtmobility bug, http://bugreports.qt.nokia.com/browse/QTMOBILITY-1091, once it gets fixed, then we can run LayoutTests/media/video-can-play-type.html to test this change. 378419 10 nancy.piedra 2011-04-02 13:11:36 -0700 I spoke to Yi and he says he is not working on this error any longer. I started working on a related error (https://bugs.webkit.org/show_bug.cgi?id=42094) so I told Yi I'd take over this error. I looked into the test case video-can-play-type.html and I think there is an issue with the content. I don't think &quot; is a valid way to specify quotes in javascript. I think you should use \" instead. However, when I fix this it still doesn't solve the problem with the test case failing because MediaPlayPrivateQt::supportsType does not return the right values. I will create a separate error for fixing the test content. If that gets approved then I think maybe this error can be closed as not valid since the problem is in the test content and not the code. I don't think the ContentType class should have to parse out the entity references (ie, &quot;). The issue with video-can-play-type.html failing for Qt can be fixed under 42094. 378448 11 nancy.piedra 2011-04-02 16:57:01 -0700 Actually we may still need part of this fix to parse out the quotation marks. 378583 12 nancy.piedra 2011-04-03 13:49:49 -0700 Created the following bug to change "&quot;" to '\"' in the layout test. https://bugs.webkit.org/show_bug.cgi?id=57728 378740 13 nancy.piedra 2011-04-04 05:39:24 -0700 After looking at the specification for the codecs paramter, http://tools.ietf.org/html/rfc4281, I think the intention of the ContentType class was to return everything after the '=' since single quotes and double quotes have special meaning to that paramter. So, I'm not sure that the quotes should be parsed out. However, I'm not sure about the '+ 6' that Yi mentions above. I will look intot that. 378819 14 ap 2011-04-04 09:09:07 -0700 Quote handling in Content-Type is governed by rfc2616, not by rfc4281. Please see sections 3.7 and 3.6 in <http://www.ietf.org/rfc/rfc2616.txt>: parameter = attribute "=" value attribute = token value = token | quoted-string 378830 15 nancy.piedra 2011-04-04 09:28:45 -0700 I was looking at the following section of the HTML5 spec which references RFC4281. I will look at your references more carefully also. 4.8.10.3 MIME types A media resource can be described in terms of its type, specifically a MIME type, in some cases with a codecs parameter. (Whether the codecs parameter is allowed or not depends on the MIME type.) [RFC4281] 378845 16 nancy.piedra 2011-04-04 10:04:25 -0700 After looking at RFC2616, I conclude that double quotes should be parsed out but not single quotes. Here are excerpts from RFC2616 for reference: Parameters are in the form of attribute/value pairs. parameter = attribute "=" value attribute = token value = token | quoted-string A string of text is parsed as a single word if it is quoted using double-quote marks. quoted-string = ( <"> *(qdtext | quoted-pair ) <"> ) qdtext = <any TEXT except <">> Alexey - Could you also look at https://bugs.webkit.org/show_bug.cgi?id=57728 and see if you agree? 378877 17 ap 2011-04-04 10:48:08 -0700 > double quotes should be parsed out but not single quotes Yes, that's correct. 379983 18 88340 nancy.piedra 2011-04-05 17:16:25 -0700 Created attachment 88340 Patch to fix codecs parsing Attached patch to parse out quotes from 'codecs' parameter according to RFC2616 mentioned above. Also, added some tests to the existing video-can-play-type.html layout test to test the codecs parsing. 380003 19 88340 ap 2011-04-05 17:48:16 -0700 Comment on attachment 88340 Patch to fix codecs parsing View in context: https://bugs.webkit.org/attachment.cgi?id=88340&action=review I only had a brief look yet, and didn't verify that the parsing code is correct. > Source/WebCore/platform/ContentType.cpp:50 > + size_t quote = notFound, end = notFound; Please don't declare two variables on one line. 380270 20 88397 nancy.piedra 2011-04-06 05:01:22 -0700 Created attachment 88397 New patch based on Alexey's comments Put the two variable declarations on separate lines. 380723 21 88397 eric.carlson 2011-04-06 12:27:02 -0700 Comment on attachment 88397 New patch based on Alexey's comments View in context: https://bugs.webkit.org/attachment.cgi?id=88397&action=review > Source/WebCore/ChangeLog:5 > + Parse quotes from content type codecs parameter This comment is incorrect, the change is for any parameter not just "codecs". > Source/WebCore/platform/ContentType.cpp:48 > - start = strippedType.find('=', start + 6); > + start = strippedType.find('=', start + 1); This isn't right, it starts the search at the beginning of the parameter name instead of at the end. > Source/WebCore/platform/ContentType.cpp:52 > + size_t quote = notFound; > + size_t end = notFound; > + if ((quote = strippedType.find('\"', start + 1)) != notFound && (end = strippedType.find('\"', start + 2)) != notFound) // find dobule quote The initializations to notFound are not helpful because you always set quote and end to strippedType.find(). I think it would be easier to read if you made the assignments outside of the test, but that may just be me. 380727 22 nancy.piedra 2011-04-06 12:34:17 -0700 Thanks! I will rework the patch. 381274 23 88616 nancy.piedra 2011-04-07 06:18:06 -0700 Created attachment 88616 Modified patch based on Eric's comments 381276 24 88616 eric.carlson 2011-04-07 06:25:37 -0700 Comment on attachment 88616 Modified patch based on Eric's comments View in context: https://bugs.webkit.org/attachment.cgi?id=88616&action=review r+ with the minor changes suggested. Thanks! > Source/WebCore/ChangeLog:7 > + > + Parse quotes from content type parameters > + https://bugs.webkit.org/show_bug.cgi?id=53275 > + It would be helpful to have a comment about how this change is tested, eg. something like the comment you are adding to the LayoutTests ChangeLog. > Source/WebCore/platform/ContentType.cpp:52 > + if (quote != notFound && end != notFound) // find dobule quote Typo: dobule -> double. However, the comment doesn't really add anything for someone reading the code later so I would just remove it. 381290 25 88621 nancy.piedra 2011-04-07 06:40:58 -0700 Created attachment 88621 Modified patch based on Eric's latest comments 381294 26 88621 eric.carlson 2011-04-07 06:47:48 -0700 Comment on attachment 88621 Modified patch based on Eric's latest comments Thanks! 381536 27 88621 commit-queue 2011-04-07 11:46:39 -0700 Comment on attachment 88621 Modified patch based on Eric's latest comments Clearing flags on attachment: 88621 Committed r83191: <http://trac.webkit.org/changeset/83191> 381537 28 commit-queue 2011-04-07 11:46:46 -0700 All reviewed patches have been landed. Closing bug. 80395 2011-01-27 18:28:38 -0800 2011-01-28 12:23:27 -0800 first try 53275.patch text/plain 2684 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc2ODkzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDEtMjcgIFlpIFNoZW4g IDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEZpeCBDb250ZW50VHlwZSBwYXJhbWV0ZXIgcGFyc2luZyBlcnJvcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMyNzUKKwor ICAgICAgICBGaXggYSBwYXJzaW5nIGVycm9yIGluIENvbnRlbnRUeXBlOjpwYXJhbWV0ZXIoKS4K KworICAgICAgICBSZWZhY3RvciBvbmx5LCBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9Db250ZW50VHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50VHlwZTo6cGFy YW1ldGVyKToKKwogMjAxMS0wMS0yNyAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0NvbnRlbnRUeXBlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9Db250ZW50VHlwZS5jcHAJKHJldmlzaW9uIDc2ODg1KQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vQ29udGVudFR5cGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOCwyMyAr MzgsMjkgQEAgQ29udGVudFR5cGU6OkNvbnRlbnRUeXBlKGNvbnN0IFN0cmluZyYgYwogU3RyaW5n IENvbnRlbnRUeXBlOjpwYXJhbWV0ZXIoY29uc3QgU3RyaW5nJiBwYXJhbWV0ZXJOYW1lKSBjb25z dAogewogICAgIFN0cmluZyBwYXJhbWV0ZXJWYWx1ZTsKLSAgICBTdHJpbmcgc3RyaXBwZWRUeXBl ID0gbV90eXBlLnN0cmlwV2hpdGVTcGFjZSgpOworICAgIFN0cmluZyBzdHJpcHBlZFR5cGUgPSBt X3R5cGUuc3RyaXBXaGl0ZVNwYWNlKCkubG93ZXIoKS5yZXBsYWNlKCImcXVvdDsiLCAiXCIiKS5y ZXBsYWNlKCImYXBvczsiLCAiXCciKS5yZXBsYWNlKCImbmJzcDsiLCAiICIpOwogCiAgICAgLy8g YSBNSU1FIHR5cGUgY2FuIGhhdmUgb25lIG9yIG1vcmUgInBhcmFtPXZhbHVlIiBhZnRlciBhIHNl bWktY29sb24sIGFuZCBzZXBhcmF0ZWQgZnJvbSBlYWNoIG90aGVyIGJ5IHNlbWktY29sb25zCiAg ICAgc2l6ZV90IHNlbWkgPSBzdHJpcHBlZFR5cGUuZmluZCgnOycpOwogICAgIGlmIChzZW1pICE9 IG5vdEZvdW5kKSB7CiAgICAgICAgIHNpemVfdCBzdGFydCA9IHN0cmlwcGVkVHlwZS5maW5kKHBh cmFtZXRlck5hbWUsIHNlbWkgKyAxLCBmYWxzZSk7CiAgICAgICAgIGlmIChzdGFydCAhPSBub3RG b3VuZCkgewotICAgICAgICAgICAgc3RhcnQgPSBzdHJpcHBlZFR5cGUuZmluZCgnPScsIHN0YXJ0 ICsgNik7CisgICAgICAgICAgICBzdGFydCA9IHN0cmlwcGVkVHlwZS5maW5kKCc9Jywgc3RhcnQg KyAxKTsKICAgICAgICAgICAgIGlmIChzdGFydCAhPSBub3RGb3VuZCkgewotICAgICAgICAgICAg ICAgIHNpemVfdCBlbmQgPSBzdHJpcHBlZFR5cGUuZmluZCgnOycsIHN0YXJ0ICsgNik7Ci0gICAg ICAgICAgICAgICAgaWYgKGVuZCA9PSBub3RGb3VuZCkKLSAgICAgICAgICAgICAgICAgICAgZW5k ID0gc3RyaXBwZWRUeXBlLmxlbmd0aCgpOworICAgICAgICAgICAgICAgIHNpemVfdCBxdW90ZSA9 IG5vdEZvdW5kLCBlbmQgPSBub3RGb3VuZDsKKyAgICAgICAgICAgICAgICBpZiAoKHF1b3RlID0g c3RyaXBwZWRUeXBlLmZpbmQoJ1wiJywgc3RhcnQgKyAxKSkgIT0gbm90Rm91bmQgJiYgKGVuZCA9 IHN0cmlwcGVkVHlwZS5maW5kKCdcIicsIHN0YXJ0ICsgMikpICE9IG5vdEZvdW5kKSB7IC8vIGZp bmQgZG9idWxlIHF1b3RlCisgICAgICAgICAgICAgICAgICAgIHN0YXJ0ID0gcXVvdGU7CisgICAg ICAgICAgICAgICAgfSBlbHNlIGlmICgocXVvdGUgPSBzdHJpcHBlZFR5cGUuZmluZCgnXCcnLCBz dGFydCArIDEpKSAhPSBub3RGb3VuZCAmJiAoZW5kID0gc3RyaXBwZWRUeXBlLmZpbmQoJ1wnJywg c3RhcnQgKyAyKSkgIT0gbm90Rm91bmQpIHsgLy8gZmluZCBzaW5nbGUgcXVvdGUKKyAgICAgICAg ICAgICAgICAgICAgc3RhcnQgPSBxdW90ZTsKKyAgICAgICAgICAgICAgICB9IGVsc2UgeworICAg ICAgICAgICAgICAgICAgICBlbmQgPSBzdHJpcHBlZFR5cGUuZmluZCgnOycsIHN0YXJ0ICsgMSk7 CisgICAgICAgICAgICAgICAgICAgIGlmIChlbmQgPT0gbm90Rm91bmQpCisgICAgICAgICAgICAg ICAgICAgICAgICBlbmQgPSBzdHJpcHBlZFR5cGUubGVuZ3RoKCk7CisgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIHBhcmFtZXRlclZhbHVlID0gc3RyaXBwZWRUeXBlLnN1YnN0cmlu ZyhzdGFydCArIDEsIGVuZCAtIChzdGFydCArIDEpKS5zdHJpcFdoaXRlU3BhY2UoKTsKICAgICAg ICAgICAgIH0KICAgICAgICAgfQogICAgIH0KLQogICAgIHJldHVybiBwYXJhbWV0ZXJWYWx1ZTsK IH0KIAo= 80481 2011-01-28 12:23:27 -0800 2011-04-05 17:16:25 -0700 add logs to help testing 53275.patch text/plain 3844 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc2OTY4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDEtMjggIFlpIFNoZW4g IDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEZpeCBDb250ZW50VHlwZSBwYXJhbWV0ZXIgcGFyc2luZyBlcnJvcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMyNzUKKwor ICAgICAgICBGaXggYSBwYXJzaW5nIGVycm9yIGluIENvbnRlbnRUeXBlOjpwYXJhbWV0ZXIoKS4K KworICAgICAgICBUZXN0OiBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jYW4tcGxheS10eXBlLmh0 bWwKKworICAgICAgICAqIHBsYXRmb3JtL0NvbnRlbnRUeXBlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNvbnRlbnRUeXBlOjpwYXJhbWV0ZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L01lZGlhUGxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyOjpzdXBwb3J0 c1R5cGUpOgorCiAyMDExLTAxLTI4ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAog ICAgICAgICBOb3RpZnkgQ0FDRkxheWVyVHJlZUhvc3Qgd2hlbiB0aGUgY29udGV4dCBpcyBmbHVz aGVkCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZW50VHlwZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGVudFR5cGUuY3BwCShyZXZpc2lv biA3Njg4NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRlbnRUeXBlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMzgsMjMgKzM4LDI5IEBAIENvbnRlbnRUeXBlOjpDb250ZW50VHlwZShj b25zdCBTdHJpbmcmIGMKIFN0cmluZyBDb250ZW50VHlwZTo6cGFyYW1ldGVyKGNvbnN0IFN0cmlu ZyYgcGFyYW1ldGVyTmFtZSkgY29uc3QKIHsKICAgICBTdHJpbmcgcGFyYW1ldGVyVmFsdWU7Ci0g ICAgU3RyaW5nIHN0cmlwcGVkVHlwZSA9IG1fdHlwZS5zdHJpcFdoaXRlU3BhY2UoKTsKKyAgICBT dHJpbmcgc3RyaXBwZWRUeXBlID0gbV90eXBlLnN0cmlwV2hpdGVTcGFjZSgpLmxvd2VyKCkucmVw bGFjZSgiJnF1b3Q7IiwgIlwiIikucmVwbGFjZSgiJmFwb3M7IiwgIlwnIikucmVwbGFjZSgiJm5i c3A7IiwgIiAiKTsKIAogICAgIC8vIGEgTUlNRSB0eXBlIGNhbiBoYXZlIG9uZSBvciBtb3JlICJw YXJhbT12YWx1ZSIgYWZ0ZXIgYSBzZW1pLWNvbG9uLCBhbmQgc2VwYXJhdGVkIGZyb20gZWFjaCBv dGhlciBieSBzZW1pLWNvbG9ucwogICAgIHNpemVfdCBzZW1pID0gc3RyaXBwZWRUeXBlLmZpbmQo JzsnKTsKICAgICBpZiAoc2VtaSAhPSBub3RGb3VuZCkgewogICAgICAgICBzaXplX3Qgc3RhcnQg PSBzdHJpcHBlZFR5cGUuZmluZChwYXJhbWV0ZXJOYW1lLCBzZW1pICsgMSwgZmFsc2UpOwogICAg ICAgICBpZiAoc3RhcnQgIT0gbm90Rm91bmQpIHsKLSAgICAgICAgICAgIHN0YXJ0ID0gc3RyaXBw ZWRUeXBlLmZpbmQoJz0nLCBzdGFydCArIDYpOworICAgICAgICAgICAgc3RhcnQgPSBzdHJpcHBl ZFR5cGUuZmluZCgnPScsIHN0YXJ0ICsgMSk7CiAgICAgICAgICAgICBpZiAoc3RhcnQgIT0gbm90 Rm91bmQpIHsKLSAgICAgICAgICAgICAgICBzaXplX3QgZW5kID0gc3RyaXBwZWRUeXBlLmZpbmQo JzsnLCBzdGFydCArIDYpOwotICAgICAgICAgICAgICAgIGlmIChlbmQgPT0gbm90Rm91bmQpCi0g ICAgICAgICAgICAgICAgICAgIGVuZCA9IHN0cmlwcGVkVHlwZS5sZW5ndGgoKTsKKyAgICAgICAg ICAgICAgICBzaXplX3QgcXVvdGUgPSBub3RGb3VuZCwgZW5kID0gbm90Rm91bmQ7CisgICAgICAg ICAgICAgICAgaWYgKChxdW90ZSA9IHN0cmlwcGVkVHlwZS5maW5kKCdcIicsIHN0YXJ0ICsgMSkp ICE9IG5vdEZvdW5kICYmIChlbmQgPSBzdHJpcHBlZFR5cGUuZmluZCgnXCInLCBzdGFydCArIDIp KSAhPSBub3RGb3VuZCkgeyAvLyBmaW5kIGRvYnVsZSBxdW90ZQorICAgICAgICAgICAgICAgICAg ICBzdGFydCA9IHF1b3RlOworICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoKHF1b3RlID0gc3Ry aXBwZWRUeXBlLmZpbmQoJ1wnJywgc3RhcnQgKyAxKSkgIT0gbm90Rm91bmQgJiYgKGVuZCA9IHN0 cmlwcGVkVHlwZS5maW5kKCdcJycsIHN0YXJ0ICsgMikpICE9IG5vdEZvdW5kKSB7IC8vIGZpbmQg c2luZ2xlIHF1b3RlCisgICAgICAgICAgICAgICAgICAgIHN0YXJ0ID0gcXVvdGU7CisgICAgICAg ICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgZW5kID0gc3RyaXBwZWRUeXBl LmZpbmQoJzsnLCBzdGFydCArIDEpOworICAgICAgICAgICAgICAgICAgICBpZiAoZW5kID09IG5v dEZvdW5kKQorICAgICAgICAgICAgICAgICAgICAgICAgZW5kID0gc3RyaXBwZWRUeXBlLmxlbmd0 aCgpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBwYXJhbWV0ZXJWYWx1ZSA9 IHN0cmlwcGVkVHlwZS5zdWJzdHJpbmcoc3RhcnQgKyAxLCBlbmQgLSAoc3RhcnQgKyAxKSkuc3Ry aXBXaGl0ZVNwYWNlKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9Ci0KICAgICBy ZXR1cm4gcGFyYW1ldGVyVmFsdWU7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAJKHJldmlzaW9uIDc2ODg1KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJGcmFt ZVZpZXcuaCIKICNpbmNsdWRlICJJbnRSZWN0LmgiCisjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2lu Y2x1ZGUgIk1JTUVUeXBlUmVnaXN0cnkuaCIKICNpbmNsdWRlICJNZWRpYVBsYXllclByaXZhdGUu aCIKICNpbmNsdWRlICJUaW1lUmFuZ2VzLmgiCkBAIC02MDQsNiArNjA1LDggQEAgTWVkaWFQbGF5 ZXI6OlN1cHBvcnRzVHlwZSBNZWRpYVBsYXllcjo6cwogICAgIFN0cmluZyB0eXBlID0gY29udGVu dFR5cGUudHlwZSgpLmxvd2VyKCk7CiAgICAgU3RyaW5nIHR5cGVDb2RlY3MgPSBjb250ZW50VHlw ZS5wYXJhbWV0ZXIoY29kZWNzKCkpOwogCisgICAgTE9HKE1lZGlhLCAiTWVkaWFQbGF5ZXI6OnN1 cHBvcnRzVHlwZSglcykgLT4gdHlwZTolcyB0eXBlQ29kZWNzOiVzIiwgY29udGVudFR5cGUucmF3 KCkudXRmOCgpLmRhdGEoKSwgdHlwZS51dGY4KCkuZGF0YSgpLCB0eXBlQ29kZWNzLnV0ZjgoKS5k YXRhKCkpOworCiAgICAgLy8gNC44LjEwLjMgTUlNRSB0eXBlcyAtIFRoZSBjYW5QbGF5VHlwZSh0 eXBlKSBtZXRob2QgbXVzdCByZXR1cm4gdGhlIGVtcHR5IHN0cmluZyBpZiB0eXBlIGlzIGEgdHlw ZSB0aGF0IHRoZSAKICAgICAvLyB1c2VyIGFnZW50IGtub3dzIGl0IGNhbm5vdCByZW5kZXIgb3Ig aXMgdGhlIHR5cGUgImFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbSIKICAgICBpZiAodHlwZSA9PSBh cHBsaWNhdGlvbk9jdGV0U3RyZWFtKCkpCg== 88340 2011-04-05 17:16:25 -0700 2011-04-06 05:01:22 -0700 Patch to fix codecs parsing canplay.diff text/plain 4517 nancy.piedra SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyOTkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDQtMDUgIE5hbmN5IFBp ZWRyYSAgPG5hbmN5LnBpZWRyYUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUGFyc2UgcXVvdGVzIGZyb20gY29udGVudCB0eXBlIGNv ZGVjcyBwYXJhbWV0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTUzMjc1CisKKyAgICAgICAgKiBwbGF0Zm9ybS9Db250ZW50VHlwZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDb250ZW50VHlwZTo6cGFyYW1ldGVyKToKKwogMjAxMS0wNC0wNSAgVnNl dm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBQYXZlbCBGZWxkbWFuLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGVudFR5 cGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRlbnRUeXBl LmNwcAkocmV2aXNpb24gODI5NDcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZW50 VHlwZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDExICs0NSwxNiBAQCBTdHJpbmcgQ29udGVu dFR5cGU6OnBhcmFtZXRlcihjb25zdCBTdHJpCiAgICAgaWYgKHNlbWkgIT0gbm90Rm91bmQpIHsK ICAgICAgICAgc2l6ZV90IHN0YXJ0ID0gc3RyaXBwZWRUeXBlLmZpbmQocGFyYW1ldGVyTmFtZSwg c2VtaSArIDEsIGZhbHNlKTsKICAgICAgICAgaWYgKHN0YXJ0ICE9IG5vdEZvdW5kKSB7Ci0gICAg ICAgICAgICBzdGFydCA9IHN0cmlwcGVkVHlwZS5maW5kKCc9Jywgc3RhcnQgKyA2KTsKKyAgICAg ICAgICAgIHN0YXJ0ID0gc3RyaXBwZWRUeXBlLmZpbmQoJz0nLCBzdGFydCArIDEpOwogICAgICAg ICAgICAgaWYgKHN0YXJ0ICE9IG5vdEZvdW5kKSB7Ci0gICAgICAgICAgICAgICAgc2l6ZV90IGVu ZCA9IHN0cmlwcGVkVHlwZS5maW5kKCc7Jywgc3RhcnQgKyA2KTsKLSAgICAgICAgICAgICAgICBp ZiAoZW5kID09IG5vdEZvdW5kKQotICAgICAgICAgICAgICAgICAgICBlbmQgPSBzdHJpcHBlZFR5 cGUubGVuZ3RoKCk7CisgICAgICAgICAgICAgICAgc2l6ZV90IHF1b3RlID0gbm90Rm91bmQsIGVu ZCA9IG5vdEZvdW5kOworICAgICAgICAgICAgICAgIGlmICgocXVvdGUgPSBzdHJpcHBlZFR5cGUu ZmluZCgnXCInLCBzdGFydCArIDEpKSAhPSBub3RGb3VuZCAmJiAoZW5kID0gc3RyaXBwZWRUeXBl LmZpbmQoJ1wiJywgc3RhcnQgKyAyKSkgIT0gbm90Rm91bmQpIC8vIGZpbmQgZG9idWxlIHF1b3Rl CisgICAgICAgICAgICAgICAgICAgIHN0YXJ0ID0gcXVvdGU7CisgICAgICAgICAgICAgICAgZWxz ZSB7CisgICAgICAgICAgICAgICAgICAgIGVuZCA9IHN0cmlwcGVkVHlwZS5maW5kKCc7Jywgc3Rh cnQgKyAxKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGVuZCA9PSBub3RGb3VuZCkKKyAgICAg ICAgICAgICAgICAgICAgICAgIGVuZCA9IHN0cmlwcGVkVHlwZS5sZW5ndGgoKTsKKyAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgcGFyYW1ldGVyVmFsdWUgPSBzdHJpcHBlZFR5cGUu c3Vic3RyaW5nKHN0YXJ0ICsgMSwgZW5kIC0gKHN0YXJ0ICsgMSkpLnN0cmlwV2hpdGVTcGFjZSgp OwogICAgICAgICAgICAgfQogICAgICAgICB9CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4Mjk5MCkKKysr IExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisy MDExLTA0LTA1ICBOYW5jeSBQaWVkcmEgIDxuYW5jeS5waWVkcmFAbm9raWEuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0cyBmb3Ig cGFyc2luZyBjb2RlY3MgcGFyYW1ldGVyIGluIHZpZGVvLWNhbi1wbGF5LXR5cGUuaHRtbAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMyNzUKKworICAg ICAgICAqIG1lZGlhL3ZpZGVvLWNhbi1wbGF5LXR5cGUtZXhwZWN0ZWQudHh0OgorICAgICAgICAq IG1lZGlhL3ZpZGVvLWNhbi1wbGF5LXR5cGUuaHRtbDoKKwogMjAxMS0wNC0wNSAgSmVzc2llIEJl cmxpbiAgPGpiZXJsaW5AYXBwbGUuY29tPgogCiAgICAgICAgIDMgdGVzdHMgZmFpbCBvbiBhcHBs ZS1tYWNwcm8tNiAoZHVlIHRvIGRpZmZlcmVudCBKUyBNSU1FIHR5cGUpIGJ1dCBub3QgYW55IG90 aGVyIExlb3BhcmQKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNhbi1wbGF5LXR5cGUt ZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNhbi1w bGF5LXR5cGUtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiA4Mjk0NykKKysrIExheW91dFRlc3RzL21l ZGlhL3ZpZGVvLWNhbi1wbGF5LXR5cGUtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC03 LDUgKzcsMTAgQEAgRVhQRUNURUQgKHZpZGVvLmNhblBsYXlUeXBlKCd2aWRlby9tcGVnOwogRVhQ RUNURUQgKHZpZGVvLmNhblBsYXlUeXBlKCcgVmlkZW8vTVA0IDsgQ09ERUNTPSJtcDR2LjIwLjgs IG1wNGEuNDAuMiInKSA9PSAncHJvYmFibHknKSBPSwogRVhQRUNURUQgKHZpZGVvLmNhblBsYXlU eXBlKCdhdWRpby9tcGVnJykgPT0gJ21heWJlJykgT0sKIEVYUEVDVEVEICh2aWRlby5jYW5QbGF5 VHlwZSgnYXVkaW8vV2F2JykgPT0gJ21heWJlJykgT0sKK0VYUEVDVEVEICh2aWRlby5jYW5QbGF5 VHlwZSgndmlkZW8vYmxhaGJsYWg7IGNvZGVjcz1ibGFoJykgPT0gJycpIE9LCitFWFBFQ1RFRCAo dmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFoOyBjb2RlY3M9ImJsYWgiJykgPT0gJycp IE9LCitFWFBFQ1RFRCAodmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFoOyBjb2RlY3M9 ImJhZGNvbnRlbnQnKSA9PSAnJykgT0sKK0VYUEVDVEVEICh2aWRlby5jYW5QbGF5VHlwZSgndmlk ZW8vYmxhaGJsYWg7IGNvZGVjcz1iYWRjb250ZW50IicpID09ICcnKSBPSworRVhQRUNURUQgKHZp ZGVvLmNhblBsYXlUeXBlKCd2aWRlby9ibGFoYmxhaDsgY29kZWNzPSJiYWRjb250ZW50IicpID09 ICcnKSBPSwogRU5EIE9GIFRFU1QKIApJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY2Fu LXBsYXktdHlwZS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNh bi1wbGF5LXR5cGUuaHRtbAkocmV2aXNpb24gODI5NDcpCisrKyBMYXlvdXRUZXN0cy9tZWRpYS92 aWRlby1jYW4tcGxheS10eXBlLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTIyLDYgKzIyLDExIEBA CiAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNhblBsYXlUeXBlKCcgICAgICAgIFZp ZGVvL01QNCA7IENPREVDUz1cIm1wNHYuMjAuOCwgbXA0YS40MC4yXCInKSIsICJwcm9iYWJseSIp OwogICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jYW5QbGF5VHlwZSgnYXVkaW8vbXBl ZycpIiwgIm1heWJlIik7CiAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNhblBsYXlU eXBlKCdhdWRpby9XYXYnKSIsICJtYXliZSIpOworICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2 aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vYmxhaGJsYWg7IGNvZGVjcz1ibGFoJykiLCAiIik7Cisg ICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNhblBsYXlUeXBlKCd2aWRlby9ibGFoYmxh aDsgY29kZWNzPVwiYmxhaFwiJykiLCAiIik7CisgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZp ZGVvLmNhblBsYXlUeXBlKCd2aWRlby9ibGFoYmxhaDsgY29kZWNzPVwiYmFkY29udGVudCcpIiwg IiIpOworICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jYW5QbGF5VHlwZSgndmlkZW8v YmxhaGJsYWg7IGNvZGVjcz1iYWRjb250ZW50XCInKSIsICIiKTsKKyAgICAgICAgICAgIHRlc3RF eHBlY3RlZCgidmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFoOyBjb2RlY3M9JnF1b3Q7 YmFkY29udGVudCZxdW90OycpIiwgIiIpOwogCiAgICAgICAgICAgICBlbmRUZXN0KCk7CiAgICAg ICAgIDwvc2NyaXB0Pgo= 88397 2011-04-06 05:01:22 -0700 2011-04-07 06:18:06 -0700 New patch based on Alexey's comments canplay2.diff text/plain 4541 nancy.piedra SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyOTkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDQtMDUgIE5hbmN5IFBp ZWRyYSAgPG5hbmN5LnBpZWRyYUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUGFyc2UgcXVvdGVzIGZyb20gY29udGVudCB0eXBlIGNv ZGVjcyBwYXJhbWV0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTUzMjc1CisKKyAgICAgICAgKiBwbGF0Zm9ybS9Db250ZW50VHlwZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDb250ZW50VHlwZTo6cGFyYW1ldGVyKToKKwogMjAxMS0wNC0wNSAgVnNl dm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBQYXZlbCBGZWxkbWFuLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGVudFR5 cGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRlbnRUeXBl LmNwcAkocmV2aXNpb24gODI5NDcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZW50 VHlwZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDExICs0NSwxNyBAQCBTdHJpbmcgQ29udGVu dFR5cGU6OnBhcmFtZXRlcihjb25zdCBTdHJpCiAgICAgaWYgKHNlbWkgIT0gbm90Rm91bmQpIHsK ICAgICAgICAgc2l6ZV90IHN0YXJ0ID0gc3RyaXBwZWRUeXBlLmZpbmQocGFyYW1ldGVyTmFtZSwg c2VtaSArIDEsIGZhbHNlKTsKICAgICAgICAgaWYgKHN0YXJ0ICE9IG5vdEZvdW5kKSB7Ci0gICAg ICAgICAgICBzdGFydCA9IHN0cmlwcGVkVHlwZS5maW5kKCc9Jywgc3RhcnQgKyA2KTsKKyAgICAg ICAgICAgIHN0YXJ0ID0gc3RyaXBwZWRUeXBlLmZpbmQoJz0nLCBzdGFydCArIDEpOwogICAgICAg ICAgICAgaWYgKHN0YXJ0ICE9IG5vdEZvdW5kKSB7Ci0gICAgICAgICAgICAgICAgc2l6ZV90IGVu ZCA9IHN0cmlwcGVkVHlwZS5maW5kKCc7Jywgc3RhcnQgKyA2KTsKLSAgICAgICAgICAgICAgICBp ZiAoZW5kID09IG5vdEZvdW5kKQotICAgICAgICAgICAgICAgICAgICBlbmQgPSBzdHJpcHBlZFR5 cGUubGVuZ3RoKCk7CisgICAgICAgICAgICAgICAgc2l6ZV90IHF1b3RlID0gbm90Rm91bmQ7Cisg ICAgICAgICAgICAgICAgc2l6ZV90IGVuZCA9IG5vdEZvdW5kOworICAgICAgICAgICAgICAgIGlm ICgocXVvdGUgPSBzdHJpcHBlZFR5cGUuZmluZCgnXCInLCBzdGFydCArIDEpKSAhPSBub3RGb3Vu ZCAmJiAoZW5kID0gc3RyaXBwZWRUeXBlLmZpbmQoJ1wiJywgc3RhcnQgKyAyKSkgIT0gbm90Rm91 bmQpIC8vIGZpbmQgZG9idWxlIHF1b3RlCisgICAgICAgICAgICAgICAgICAgIHN0YXJ0ID0gcXVv dGU7CisgICAgICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgICAgIGVuZCA9IHN0 cmlwcGVkVHlwZS5maW5kKCc7Jywgc3RhcnQgKyAxKTsKKyAgICAgICAgICAgICAgICAgICAgaWYg KGVuZCA9PSBub3RGb3VuZCkKKyAgICAgICAgICAgICAgICAgICAgICAgIGVuZCA9IHN0cmlwcGVk VHlwZS5sZW5ndGgoKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgcGFyYW1l dGVyVmFsdWUgPSBzdHJpcHBlZFR5cGUuc3Vic3RyaW5nKHN0YXJ0ICsgMSwgZW5kIC0gKHN0YXJ0 ICsgMSkpLnN0cmlwV2hpdGVTcGFjZSgpOwogICAgICAgICAgICAgfQogICAgICAgICB9CkluZGV4 OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCShyZXZpc2lvbiA4Mjk5MCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDExLTA0LTA1ICBOYW5jeSBQaWVkcmEgIDxuYW5jeS5w aWVkcmFAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZCB0ZXN0cyBmb3IgcGFyc2luZyBjb2RlY3MgcGFyYW1ldGVyIGluIHZpZGVv LWNhbi1wbGF5LXR5cGUuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTMyNzUKKworICAgICAgICAqIG1lZGlhL3ZpZGVvLWNhbi1wbGF5LXR5cGUt ZXhwZWN0ZWQudHh0OgorICAgICAgICAqIG1lZGlhL3ZpZGVvLWNhbi1wbGF5LXR5cGUuaHRtbDoK KwogMjAxMS0wNC0wNSAgSmVzc2llIEJlcmxpbiAgPGpiZXJsaW5AYXBwbGUuY29tPgogCiAgICAg ICAgIDMgdGVzdHMgZmFpbCBvbiBhcHBsZS1tYWNwcm8tNiAoZHVlIHRvIGRpZmZlcmVudCBKUyBN SU1FIHR5cGUpIGJ1dCBub3QgYW55IG90aGVyIExlb3BhcmQKSW5kZXg6IExheW91dFRlc3RzL21l ZGlhL3ZpZGVvLWNhbi1wbGF5LXR5cGUtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL21lZGlhL3ZpZGVvLWNhbi1wbGF5LXR5cGUtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiA4 Mjk0NykKKysrIExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNhbi1wbGF5LXR5cGUtZXhwZWN0ZWQu dHh0CSh3b3JraW5nIGNvcHkpCkBAIC03LDUgKzcsMTAgQEAgRVhQRUNURUQgKHZpZGVvLmNhblBs YXlUeXBlKCd2aWRlby9tcGVnOwogRVhQRUNURUQgKHZpZGVvLmNhblBsYXlUeXBlKCcgVmlkZW8v TVA0IDsgQ09ERUNTPSJtcDR2LjIwLjgsIG1wNGEuNDAuMiInKSA9PSAncHJvYmFibHknKSBPSwog RVhQRUNURUQgKHZpZGVvLmNhblBsYXlUeXBlKCdhdWRpby9tcGVnJykgPT0gJ21heWJlJykgT0sK IEVYUEVDVEVEICh2aWRlby5jYW5QbGF5VHlwZSgnYXVkaW8vV2F2JykgPT0gJ21heWJlJykgT0sK K0VYUEVDVEVEICh2aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vYmxhaGJsYWg7IGNvZGVjcz1ibGFo JykgPT0gJycpIE9LCitFWFBFQ1RFRCAodmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFo OyBjb2RlY3M9ImJsYWgiJykgPT0gJycpIE9LCitFWFBFQ1RFRCAodmlkZW8uY2FuUGxheVR5cGUo J3ZpZGVvL2JsYWhibGFoOyBjb2RlY3M9ImJhZGNvbnRlbnQnKSA9PSAnJykgT0sKK0VYUEVDVEVE ICh2aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vYmxhaGJsYWg7IGNvZGVjcz1iYWRjb250ZW50Iicp ID09ICcnKSBPSworRVhQRUNURUQgKHZpZGVvLmNhblBsYXlUeXBlKCd2aWRlby9ibGFoYmxhaDsg Y29kZWNzPSJiYWRjb250ZW50IicpID09ICcnKSBPSwogRU5EIE9GIFRFU1QKIApJbmRleDogTGF5 b3V0VGVzdHMvbWVkaWEvdmlkZW8tY2FuLXBsYXktdHlwZS5odG1sCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL21lZGlhL3ZpZGVvLWNhbi1wbGF5LXR5cGUuaHRtbAkocmV2aXNpb24gODI5NDcp CisrKyBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jYW4tcGxheS10eXBlLmh0bWwJKHdvcmtpbmcg Y29weSkKQEAgLTIyLDYgKzIyLDExIEBACiAgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVv LmNhblBsYXlUeXBlKCcgICAgICAgIFZpZGVvL01QNCA7IENPREVDUz1cIm1wNHYuMjAuOCwgbXA0 YS40MC4yXCInKSIsICJwcm9iYWJseSIpOwogICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRl by5jYW5QbGF5VHlwZSgnYXVkaW8vbXBlZycpIiwgIm1heWJlIik7CiAgICAgICAgICAgICB0ZXN0 RXhwZWN0ZWQoInZpZGVvLmNhblBsYXlUeXBlKCdhdWRpby9XYXYnKSIsICJtYXliZSIpOworICAg ICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vYmxhaGJsYWg7 IGNvZGVjcz1ibGFoJykiLCAiIik7CisgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNh blBsYXlUeXBlKCd2aWRlby9ibGFoYmxhaDsgY29kZWNzPVwiYmxhaFwiJykiLCAiIik7CisgICAg ICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNhblBsYXlUeXBlKCd2aWRlby9ibGFoYmxhaDsg Y29kZWNzPVwiYmFkY29udGVudCcpIiwgIiIpOworICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2 aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vYmxhaGJsYWg7IGNvZGVjcz1iYWRjb250ZW50XCInKSIs ICIiKTsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVv L2JsYWhibGFoOyBjb2RlY3M9JnF1b3Q7YmFkY29udGVudCZxdW90OycpIiwgIiIpOwogCiAgICAg ICAgICAgICBlbmRUZXN0KCk7CiAgICAgICAgIDwvc2NyaXB0Pgo= 88616 2011-04-07 06:18:06 -0700 2011-04-07 06:40:58 -0700 Modified patch based on Eric's comments canplay3.diff text/plain 4530 nancy.piedra SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyOTkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDQtMDUgIE5hbmN5IFBp ZWRyYSAgPG5hbmN5LnBpZWRyYUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUGFyc2UgcXVvdGVzIGZyb20gY29udGVudCB0eXBlIHBh cmFtZXRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTUzMjc1CisKKyAgICAgICAgKiBwbGF0Zm9ybS9Db250ZW50VHlwZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDb250ZW50VHlwZTo6cGFyYW1ldGVyKToKKwogMjAxMS0wNC0wNSAgVnNldm9sb2Qg Vmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZl bCBGZWxkbWFuLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGVudFR5cGUuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRlbnRUeXBlLmNwcAko cmV2aXNpb24gODI5NDcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZW50VHlwZS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDExICs0NSwxNyBAQCBTdHJpbmcgQ29udGVudFR5cGU6 OnBhcmFtZXRlcihjb25zdCBTdHJpCiAgICAgaWYgKHNlbWkgIT0gbm90Rm91bmQpIHsKICAgICAg ICAgc2l6ZV90IHN0YXJ0ID0gc3RyaXBwZWRUeXBlLmZpbmQocGFyYW1ldGVyTmFtZSwgc2VtaSAr IDEsIGZhbHNlKTsKICAgICAgICAgaWYgKHN0YXJ0ICE9IG5vdEZvdW5kKSB7Ci0gICAgICAgICAg ICBzdGFydCA9IHN0cmlwcGVkVHlwZS5maW5kKCc9Jywgc3RhcnQgKyA2KTsKKyAgICAgICAgICAg IHN0YXJ0ID0gc3RyaXBwZWRUeXBlLmZpbmQoJz0nLCBzdGFydCArIHBhcmFtZXRlck5hbWUubGVu Z3RoKCkpOwogICAgICAgICAgICAgaWYgKHN0YXJ0ICE9IG5vdEZvdW5kKSB7Ci0gICAgICAgICAg ICAgICAgc2l6ZV90IGVuZCA9IHN0cmlwcGVkVHlwZS5maW5kKCc7Jywgc3RhcnQgKyA2KTsKLSAg ICAgICAgICAgICAgICBpZiAoZW5kID09IG5vdEZvdW5kKQotICAgICAgICAgICAgICAgICAgICBl bmQgPSBzdHJpcHBlZFR5cGUubGVuZ3RoKCk7CisgICAgICAgICAgICAgICAgc2l6ZV90IHF1b3Rl ID0gc3RyaXBwZWRUeXBlLmZpbmQoJ1wiJywgc3RhcnQgKyAxKTsKKyAgICAgICAgICAgICAgICBz aXplX3QgZW5kID0gc3RyaXBwZWRUeXBlLmZpbmQoJ1wiJywgc3RhcnQgKyAyKTsKKyAgICAgICAg ICAgICAgICBpZiAocXVvdGUgIT0gbm90Rm91bmQgJiYgZW5kICE9IG5vdEZvdW5kKSAvLyBmaW5k IGRvYnVsZSBxdW90ZQorICAgICAgICAgICAgICAgICAgICBzdGFydCA9IHF1b3RlOworICAgICAg ICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgICAgICBlbmQgPSBzdHJpcHBlZFR5cGUu ZmluZCgnOycsIHN0YXJ0ICsgMSk7CisgICAgICAgICAgICAgICAgICAgIGlmIChlbmQgPT0gbm90 Rm91bmQpCisgICAgICAgICAgICAgICAgICAgICAgICBlbmQgPSBzdHJpcHBlZFR5cGUubGVuZ3Ro KCk7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHBhcmFtZXRlclZhbHVlID0g c3RyaXBwZWRUeXBlLnN1YnN0cmluZyhzdGFydCArIDEsIGVuZCAtIChzdGFydCArIDEpKS5zdHJp cFdoaXRlU3BhY2UoKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpJbmRleDogTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNp b24gODI5OTApCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxMyBAQAorMjAxMS0wNC0wNSAgTmFuY3kgUGllZHJhICA8bmFuY3kucGllZHJhQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZGQgdGVzdHMgZm9yIHBhcnNpbmcgY29kZWNzIHBhcmFtZXRlciBpbiB2aWRlby1jYW4tcGxheS10 eXBlLmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTUzMjc1CisKKyAgICAgICAgKiBtZWRpYS92aWRlby1jYW4tcGxheS10eXBlLWV4cGVjdGVkLnR4 dDoKKyAgICAgICAgKiBtZWRpYS92aWRlby1jYW4tcGxheS10eXBlLmh0bWw6CisKIDIwMTEtMDQt MDUgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxlLmNvbT4KIAogICAgICAgICAzIHRlc3Rz IGZhaWwgb24gYXBwbGUtbWFjcHJvLTYgKGR1ZSB0byBkaWZmZXJlbnQgSlMgTUlNRSB0eXBlKSBi dXQgbm90IGFueSBvdGhlciBMZW9wYXJkCkluZGV4OiBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1j YW4tcGxheS10eXBlLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRp YS92aWRlby1jYW4tcGxheS10eXBlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gODI5NDcpCisrKyBM YXlvdXRUZXN0cy9tZWRpYS92aWRlby1jYW4tcGxheS10eXBlLWV4cGVjdGVkLnR4dAkod29ya2lu ZyBjb3B5KQpAQCAtNyw1ICs3LDEwIEBAIEVYUEVDVEVEICh2aWRlby5jYW5QbGF5VHlwZSgndmlk ZW8vbXBlZzsKIEVYUEVDVEVEICh2aWRlby5jYW5QbGF5VHlwZSgnIFZpZGVvL01QNCA7IENPREVD Uz0ibXA0di4yMC44LCBtcDRhLjQwLjIiJykgPT0gJ3Byb2JhYmx5JykgT0sKIEVYUEVDVEVEICh2 aWRlby5jYW5QbGF5VHlwZSgnYXVkaW8vbXBlZycpID09ICdtYXliZScpIE9LCiBFWFBFQ1RFRCAo dmlkZW8uY2FuUGxheVR5cGUoJ2F1ZGlvL1dhdicpID09ICdtYXliZScpIE9LCitFWFBFQ1RFRCAo dmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFoOyBjb2RlY3M9YmxhaCcpID09ICcnKSBP SworRVhQRUNURUQgKHZpZGVvLmNhblBsYXlUeXBlKCd2aWRlby9ibGFoYmxhaDsgY29kZWNzPSJi bGFoIicpID09ICcnKSBPSworRVhQRUNURUQgKHZpZGVvLmNhblBsYXlUeXBlKCd2aWRlby9ibGFo YmxhaDsgY29kZWNzPSJiYWRjb250ZW50JykgPT0gJycpIE9LCitFWFBFQ1RFRCAodmlkZW8uY2Fu UGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFoOyBjb2RlY3M9YmFkY29udGVudCInKSA9PSAnJykgT0sK K0VYUEVDVEVEICh2aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vYmxhaGJsYWg7IGNvZGVjcz0iYmFk Y29udGVudCInKSA9PSAnJykgT0sKIEVORCBPRiBURVNUCiAKSW5kZXg6IExheW91dFRlc3RzL21l ZGlhL3ZpZGVvLWNhbi1wbGF5LXR5cGUuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9t ZWRpYS92aWRlby1jYW4tcGxheS10eXBlLmh0bWwJKHJldmlzaW9uIDgyOTQ3KQorKysgTGF5b3V0 VGVzdHMvbWVkaWEvdmlkZW8tY2FuLXBsYXktdHlwZS5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0y Miw2ICsyMiwxMSBAQAogICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jYW5QbGF5VHlw ZSgnICAgICAgICBWaWRlby9NUDQgOyBDT0RFQ1M9XCJtcDR2LjIwLjgsIG1wNGEuNDAuMlwiJyki LCAicHJvYmFibHkiKTsKICAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8uY2FuUGxheVR5 cGUoJ2F1ZGlvL21wZWcnKSIsICJtYXliZSIpOwogICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2 aWRlby5jYW5QbGF5VHlwZSgnYXVkaW8vV2F2JykiLCAibWF5YmUiKTsKKyAgICAgICAgICAgIHRl c3RFeHBlY3RlZCgidmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFoOyBjb2RlY3M9Ymxh aCcpIiwgIiIpOworICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jYW5QbGF5VHlwZSgn dmlkZW8vYmxhaGJsYWg7IGNvZGVjcz1cImJsYWhcIicpIiwgIiIpOworICAgICAgICAgICAgdGVz dEV4cGVjdGVkKCJ2aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vYmxhaGJsYWg7IGNvZGVjcz1cImJh ZGNvbnRlbnQnKSIsICIiKTsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8uY2FuUGxh eVR5cGUoJ3ZpZGVvL2JsYWhibGFoOyBjb2RlY3M9YmFkY29udGVudFwiJykiLCAiIik7CisgICAg ICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNhblBsYXlUeXBlKCd2aWRlby9ibGFoYmxhaDsg Y29kZWNzPSZxdW90O2JhZGNvbnRlbnQmcXVvdDsnKSIsICIiKTsKIAogICAgICAgICAgICAgZW5k VGVzdCgpOwogICAgICAgICA8L3NjcmlwdD4K 88621 2011-04-07 06:40:58 -0700 2011-04-07 11:46:39 -0700 Modified patch based on Eric's latest comments canplay4.diff text/plain 4662 nancy.piedra SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyOTkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDQtMDUgIE5hbmN5IFBp ZWRyYSAgPG5hbmN5LnBpZWRyYUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUGFyc2UgcXVvdGVzIGZyb20gY29udGVudCB0eXBlIHBh cmFtZXRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTUzMjc1CisKKyAgICAgICAgVGhpcyBmdW5jdGlvbmFsaXR5IGlzIHRlc3RlZCBpbiB2aWRlby1j YW4tcGxheS10eXBlLmh0bWwgbGF5b3V0IHRlc3QKKyAgICAgICAgd2hlcmUgSSd2ZSBhZGRlZCBj b2RlY3MgcGFyYW1ldGVyIHdpdGggZ29vZCBhbmQgYmFkIGZvcm1hdHRpbmcuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9Db250ZW50VHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50VHlw ZTo6cGFyYW1ldGVyKToKKwogMjAxMS0wNC0wNSAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpJbmRleDog U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGVudFR5cGUuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRlbnRUeXBlLmNwcAkocmV2aXNpb24gODI5NDcpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZW50VHlwZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQ1LDExICs0NSwxNyBAQCBTdHJpbmcgQ29udGVudFR5cGU6OnBhcmFtZXRlcihjb25zdCBT dHJpCiAgICAgaWYgKHNlbWkgIT0gbm90Rm91bmQpIHsKICAgICAgICAgc2l6ZV90IHN0YXJ0ID0g c3RyaXBwZWRUeXBlLmZpbmQocGFyYW1ldGVyTmFtZSwgc2VtaSArIDEsIGZhbHNlKTsKICAgICAg ICAgaWYgKHN0YXJ0ICE9IG5vdEZvdW5kKSB7Ci0gICAgICAgICAgICBzdGFydCA9IHN0cmlwcGVk VHlwZS5maW5kKCc9Jywgc3RhcnQgKyA2KTsKKyAgICAgICAgICAgIHN0YXJ0ID0gc3RyaXBwZWRU eXBlLmZpbmQoJz0nLCBzdGFydCArIHBhcmFtZXRlck5hbWUubGVuZ3RoKCkpOwogICAgICAgICAg ICAgaWYgKHN0YXJ0ICE9IG5vdEZvdW5kKSB7Ci0gICAgICAgICAgICAgICAgc2l6ZV90IGVuZCA9 IHN0cmlwcGVkVHlwZS5maW5kKCc7Jywgc3RhcnQgKyA2KTsKLSAgICAgICAgICAgICAgICBpZiAo ZW5kID09IG5vdEZvdW5kKQotICAgICAgICAgICAgICAgICAgICBlbmQgPSBzdHJpcHBlZFR5cGUu bGVuZ3RoKCk7CisgICAgICAgICAgICAgICAgc2l6ZV90IHF1b3RlID0gc3RyaXBwZWRUeXBlLmZp bmQoJ1wiJywgc3RhcnQgKyAxKTsKKyAgICAgICAgICAgICAgICBzaXplX3QgZW5kID0gc3RyaXBw ZWRUeXBlLmZpbmQoJ1wiJywgc3RhcnQgKyAyKTsKKyAgICAgICAgICAgICAgICBpZiAocXVvdGUg IT0gbm90Rm91bmQgJiYgZW5kICE9IG5vdEZvdW5kKQorICAgICAgICAgICAgICAgICAgICBzdGFy dCA9IHF1b3RlOworICAgICAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgICAgICBl bmQgPSBzdHJpcHBlZFR5cGUuZmluZCgnOycsIHN0YXJ0ICsgMSk7CisgICAgICAgICAgICAgICAg ICAgIGlmIChlbmQgPT0gbm90Rm91bmQpCisgICAgICAgICAgICAgICAgICAgICAgICBlbmQgPSBz dHJpcHBlZFR5cGUubGVuZ3RoKCk7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAg IHBhcmFtZXRlclZhbHVlID0gc3RyaXBwZWRUeXBlLnN1YnN0cmluZyhzdGFydCArIDEsIGVuZCAt IChzdGFydCArIDEpKS5zdHJpcFdoaXRlU3BhY2UoKTsKICAgICAgICAgICAgIH0KICAgICAgICAg fQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L0NoYW5nZUxvZwkocmV2aXNpb24gODI5OTApCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0wNC0wNSAgTmFuY3kgUGllZHJhICA8 bmFuY3kucGllZHJhQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGQgdGVzdHMgZm9yIHBhcnNpbmcgY29kZWNzIHBhcmFtZXRlciBp biB2aWRlby1jYW4tcGxheS10eXBlLmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTUzMjc1CisKKyAgICAgICAgKiBtZWRpYS92aWRlby1jYW4tcGxh eS10eXBlLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBtZWRpYS92aWRlby1jYW4tcGxheS10eXBl Lmh0bWw6CisKIDIwMTEtMDQtMDUgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxlLmNvbT4K IAogICAgICAgICAzIHRlc3RzIGZhaWwgb24gYXBwbGUtbWFjcHJvLTYgKGR1ZSB0byBkaWZmZXJl bnQgSlMgTUlNRSB0eXBlKSBidXQgbm90IGFueSBvdGhlciBMZW9wYXJkCkluZGV4OiBMYXlvdXRU ZXN0cy9tZWRpYS92aWRlby1jYW4tcGxheS10eXBlLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jYW4tcGxheS10eXBlLWV4cGVjdGVkLnR4dAkocmV2 aXNpb24gODI5NDcpCisrKyBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jYW4tcGxheS10eXBlLWV4 cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtNyw1ICs3LDEwIEBAIEVYUEVDVEVEICh2aWRl by5jYW5QbGF5VHlwZSgndmlkZW8vbXBlZzsKIEVYUEVDVEVEICh2aWRlby5jYW5QbGF5VHlwZSgn IFZpZGVvL01QNCA7IENPREVDUz0ibXA0di4yMC44LCBtcDRhLjQwLjIiJykgPT0gJ3Byb2JhYmx5 JykgT0sKIEVYUEVDVEVEICh2aWRlby5jYW5QbGF5VHlwZSgnYXVkaW8vbXBlZycpID09ICdtYXli ZScpIE9LCiBFWFBFQ1RFRCAodmlkZW8uY2FuUGxheVR5cGUoJ2F1ZGlvL1dhdicpID09ICdtYXli ZScpIE9LCitFWFBFQ1RFRCAodmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFoOyBjb2Rl Y3M9YmxhaCcpID09ICcnKSBPSworRVhQRUNURUQgKHZpZGVvLmNhblBsYXlUeXBlKCd2aWRlby9i bGFoYmxhaDsgY29kZWNzPSJibGFoIicpID09ICcnKSBPSworRVhQRUNURUQgKHZpZGVvLmNhblBs YXlUeXBlKCd2aWRlby9ibGFoYmxhaDsgY29kZWNzPSJiYWRjb250ZW50JykgPT0gJycpIE9LCitF WFBFQ1RFRCAodmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFoOyBjb2RlY3M9YmFkY29u dGVudCInKSA9PSAnJykgT0sKK0VYUEVDVEVEICh2aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vYmxh aGJsYWg7IGNvZGVjcz0iYmFkY29udGVudCInKSA9PSAnJykgT0sKIEVORCBPRiBURVNUCiAKSW5k ZXg6IExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNhbi1wbGF5LXR5cGUuaHRtbAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jYW4tcGxheS10eXBlLmh0bWwJKHJldmlzaW9u IDgyOTQ3KQorKysgTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY2FuLXBsYXktdHlwZS5odG1sCSh3 b3JraW5nIGNvcHkpCkBAIC0yMiw2ICsyMiwxMSBAQAogICAgICAgICAgICAgdGVzdEV4cGVjdGVk KCJ2aWRlby5jYW5QbGF5VHlwZSgnICAgICAgICBWaWRlby9NUDQgOyBDT0RFQ1M9XCJtcDR2LjIw LjgsIG1wNGEuNDAuMlwiJykiLCAicHJvYmFibHkiKTsKICAgICAgICAgICAgIHRlc3RFeHBlY3Rl ZCgidmlkZW8uY2FuUGxheVR5cGUoJ2F1ZGlvL21wZWcnKSIsICJtYXliZSIpOwogICAgICAgICAg ICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jYW5QbGF5VHlwZSgnYXVkaW8vV2F2JykiLCAibWF5YmUi KTsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgidmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2Js YWhibGFoOyBjb2RlY3M9YmxhaCcpIiwgIiIpOworICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2 aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vYmxhaGJsYWg7IGNvZGVjcz1cImJsYWhcIicpIiwgIiIp OworICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jYW5QbGF5VHlwZSgndmlkZW8vYmxh aGJsYWg7IGNvZGVjcz1cImJhZGNvbnRlbnQnKSIsICIiKTsKKyAgICAgICAgICAgIHRlc3RFeHBl Y3RlZCgidmlkZW8uY2FuUGxheVR5cGUoJ3ZpZGVvL2JsYWhibGFoOyBjb2RlY3M9YmFkY29udGVu dFwiJykiLCAiIik7CisgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInZpZGVvLmNhblBsYXlUeXBl KCd2aWRlby9ibGFoYmxhaDsgY29kZWNzPSZxdW90O2JhZGNvbnRlbnQmcXVvdDsnKSIsICIiKTsK IAogICAgICAgICAgICAgZW5kVGVzdCgpOwogICAgICAgICA8L3NjcmlwdD4K