106625 2013-01-10 19:05:30 -0800 [BlackBerry] Enable concatenating headers with same field name 2013-01-11 03:13:45 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mawu mawu charles.wei joenotcharles mifenton rwlbuis staikos tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 804875 0 mawu 2013-01-10 19:05:30 -0800 RFC 2616 says: Multiple message-header fields with the same field-name MAY be present in a message if and only if the entire field-value for that header field is defined as a comma-separated list [i.e., #(values)]. It MUST be possible to combine the multiple header fields into one "field-name: field-value" pair, without changing the semantics of the message, by appending each subsequent field-value to the first, each separated by a comma. The order in which header fields with the same field-name are received is therefore significant to the interpretation of the combined field value, and thus a proxy MUST NOT change the order of these field values when a message is forwarded. 804878 1 182244 mawu 2013-01-10 19:16:42 -0800 Created attachment 182244 Patch 805047 2 182286 mawu 2013-01-11 00:55:38 -0800 Created attachment 182286 Patch 805075 3 182286 rwlbuis 2013-01-11 01:53:51 -0800 Comment on attachment 182286 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182286&action=review > Source/WebCore/platform/network/blackberry/NetworkJob.cpp:69 > +static bool isAppendableHeader(String key) More efficient to use const String & here. 805096 4 mawu 2013-01-11 02:27:22 -0800 (In reply to comment #3) > (From update of attachment 182286 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=182286&action=review > > > Source/WebCore/platform/network/blackberry/NetworkJob.cpp:69 > > +static bool isAppendableHeader(String key) > > More efficient to use const String & here. nice catch, thanks 805102 5 182303 mawu 2013-01-11 02:33:16 -0800 Created attachment 182303 Patch 805103 6 182303 rwlbuis 2013-01-11 02:35:01 -0800 Comment on attachment 182303 Patch LGTM. 805123 7 182303 webkit.review.bot 2013-01-11 03:13:42 -0800 Comment on attachment 182303 Patch Clearing flags on attachment: 182303 Committed r139423: <http://trac.webkit.org/changeset/139423> 805124 8 webkit.review.bot 2013-01-11 03:13:45 -0800 All reviewed patches have been landed. Closing bug. 182244 2013-01-10 19:16:42 -0800 2013-01-11 00:55:33 -0800 Patch bug-106625-20130111111344.patch text/plain 3920 mawu U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzljMDIyNjBmN2Q2ZWEw OTM4NTAzZGRkYzY1NDI5ZGY0MTRhMDg0ZC4uZmMzMGNhMDI4NTExYzgyMGRjYmEwMzVhZjFjMDNl ZTgxYmZjNDJkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAxLTEwICBNYXJ5 IFd1ICA8bWFyeS53dUB0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAgW0JsYWNrQmVycnld IEVuYWJsZSBjb25jYXRlbmF0aW5nIGhlYWRlcnMgd2l0aCBzYW1lIGZpZWxkIG5hbWUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjYyNQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJGQyAyNjE2IHNwZWNp ZmllcyB0aGF0IGhlYWRlcnMgY291bGQgY29uY2F0ZW5hdGUgd2l0aCBjb21tYSBpZiB0aGV5IGhh dmUKKyAgICAgICAgc2FtZSBmaWVsZCBuYW1lLiBXZSBzaG91bGQgZW5hYmxlIHRoaXMgaWYgdGhl IGhlYWRlciBhbGxvd3MgbXVsdGlwbGUgdmFsdWVzLgorCisgICAgICAgIFJJTSBQUiMgMjc1NTA4 LCBpbnRlcm5hbGx5IHJldmlld2VkIGJ5IEpvZSBNYXNvbgorCisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwOgorICAgICAgICAoV2ViQ29yZSk6Cisg ICAgICAgIChXZWJDb3JlOjppc0FwcGVuZGFibGVIZWFkZXJzKToKKyAgICAgICAgKFdlYkNvcmU6 Ok5ldHdvcmtKb2I6OmhhbmRsZU5vdGlmeUhlYWRlclJlY2VpdmVkKToKKwogMjAxMi0xMi0yMyAg QWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICA8cmRhcjovL3By b2JsZW0vMTI4MDgzNzc+IE5ldHdvcmsgcHJvY2VzcyBzaG91bGQgcmVzcGVjdCBjb29raWUgYWNj ZXB0IHBvbGljeQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9i bGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9ibGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCmluZGV4IDczMTM4NDY4N2FlZmNjMzNmYjYzZDBk MzdkYTRjOTc0ZTUzMDE2M2MuLjczODY1NDllMDY1ZmJlNzU1MzExYWIzYjI2MzBiYWRiMTkxZmVi OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxhY2tiZXJy eS9OZXR3b3JrSm9iLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Js YWNrYmVycnkvTmV0d29ya0pvYi5jcHAKQEAgLTYzLDYgKzYzLDIyIEBAIGlubGluZSBzdGF0aWMg Ym9vbCBpc1VuYXV0aG9yaXplZChpbnQgc3RhdHVzQ29kZSkKICAgICByZXR1cm4gc3RhdHVzQ29k ZSA9PSA0MDE7CiB9CiAKK3N0YXRpYyBjaGFyKiBjb25zdCBhcHBlbmRhYmxlSGVhZGVyc1tdID0g eyJhY2Nlc3MtY29udHJvbC1hbGxvdy1vcmlnaW4iLCAiYWxsb3ciLAorICAgICJzZXQtY29va2ll IiwgInNldC1jb29raWUyIiwgInZhcnkiLCAidmlhIiwgIndhcm5pbmcifTsKKworc3RhdGljIGJv b2wgaXNBcHBlbmRhYmxlSGVhZGVycyhTdHJpbmcgc3RyKQoreworICAgIC8vIE5vbi1zdGFuZGFy ZCBoZWFkZXIgZmllbGRzIGFyZSBjb252ZW50aW9uYWxseSBtYXJrZWQgYnkgcHJlZml4aW5nIHRo ZSBmaWVsZCBuYW1lIHdpdGggWC0uCisgICAgaWYgKHN0ci5zdGFydHNXaXRoKCJ4LSIpKQorICAg ICAgICByZXR1cm4gdHJ1ZTsKKworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgc2l6ZW9mKGFwcGVu ZGFibGVIZWFkZXJzKSAvc2l6ZW9mKGNoYXIqKTsgaSsrKQorICAgICAgICBpZiAoc3RyID09IGFw cGVuZGFibGVIZWFkZXJzW2ldKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICByZXR1 cm4gZmFsc2U7Cit9CisKIE5ldHdvcmtKb2I6Ok5ldHdvcmtKb2IoKQogICAgIDogRnJhbWVEZXN0 cnVjdGlvbk9ic2VydmVyKDApCiAgICAgLCBtX3BsYXllcklkKDApCkBAIC0zMzMsMjAgKzM0OSwx NyBAQCB2b2lkIE5ldHdvcmtKb2I6OmhhbmRsZU5vdGlmeUhlYWRlclJlY2VpdmVkKGNvbnN0IFN0 cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbAogICAgICAgICBtX2NvbnRlbnRUeXBlID0gdmFs dWUubG93ZXIoKTsKICAgICBlbHNlIGlmIChsb3dlcktleSA9PSAiY29udGVudC1kaXNwb3NpdGlv biIpCiAgICAgICAgIG1fY29udGVudERpc3Bvc2l0aW9uID0gdmFsdWU7Ci0gICAgZWxzZSBpZiAo bG93ZXJLZXkgPT0gInNldC1jb29raWUiKSB7Ci0gICAgICAgIGlmIChtX2ZyYW1lICYmIG1fZnJh bWUtPmxvYWRlcigpICYmIG1fZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKQotICAgICAgICAgICAg JiYgc3RhdGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5Kj4obV9mcmFtZS0+bG9h ZGVyKCktPmNsaWVudCgpKS0+Y29va2llc0VuYWJsZWQoKSkgewotICAgICAgICAgICAgaGFuZGxl U2V0Q29va2llSGVhZGVyKHZhbHVlKTsKLSAgICAgICAgICAgIC8vIElmIHRoZXJlIGFyZSBzZXZl cmFsICJTZXQtQ29va2llIiBoZWFkZXJzLCB3ZSBzaG91bGQgY29tYmluZSB0aGUgZm9sbG93aW5n IG9uZXMgd2l0aCB0aGUgZmlyc3QuCi0gICAgICAgICAgICBpZiAobV9yZXNwb25zZS5odHRwSGVh ZGVyRmllbGRzKCkuY29udGFpbnMoIlNldC1Db29raWUiKSkgewotICAgICAgICAgICAgICAgIG1f cmVzcG9uc2Uuc2V0SFRUUEhlYWRlckZpZWxkKGtleSwgbV9yZXNwb25zZS5odHRwSGVhZGVyRmll bGQoa2V5KSArICIsICIgKyB2YWx1ZSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICAgICAgfQotICAgICAgICB9Ci0gICAgfSBlbHNlIGlmIChlcXVhbElnbm9yaW5nQ2FzZShrZXks IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6SEVBREVSX0JMQUNLQkVSUllf RlRQKSkKKyAgICBlbHNlIGlmIChsb3dlcktleSA9PSAic2V0LWNvb2tpZSIgJiYgbV9mcmFtZSAm JiBtX2ZyYW1lLT5sb2FkZXIoKSAmJiBtX2ZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCkKKyAgICAg ICAgJiYgc3RhdGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5Kj4obV9mcmFtZS0+ bG9hZGVyKCktPmNsaWVudCgpKS0+Y29va2llc0VuYWJsZWQoKSkKKyAgICAgICAgaGFuZGxlU2V0 Q29va2llSGVhZGVyKHZhbHVlKTsKKyAgICBlbHNlIGlmIChlcXVhbElnbm9yaW5nQ2FzZShrZXks IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6SEVBREVSX0JMQUNLQkVSUllf RlRQKSkKICAgICAgICAgaGFuZGxlRlRQSGVhZGVyKHZhbHVlKTsKIAotICAgIG1fcmVzcG9uc2Uu c2V0SFRUUEhlYWRlckZpZWxkKGtleSwgdmFsdWUpOworICAgIGlmIChtX3Jlc3BvbnNlLmh0dHBI ZWFkZXJGaWVsZHMoKS5jb250YWlucyhrZXkudXRmOCgpLmRhdGEoKSkgJiYgaXNBcHBlbmRhYmxl SGVhZGVycyhsb3dlcktleSkpIHsKKyAgICAgICAgLy8gSWYgdGhlcmUgYXJlIHNldmVyYWwgaGVh ZGVycyB3aXRoIHNhbWUga2V5LCB3ZSBzaG91bGQgY29tYmluZSB0aGUgZm9sbG93aW5nIG9uZXMg d2l0aCB0aGUgZmlyc3QuCisgICAgICAgIG1fcmVzcG9uc2Uuc2V0SFRUUEhlYWRlckZpZWxkKGtl eSwgbV9yZXNwb25zZS5odHRwSGVhZGVyRmllbGQoa2V5KSArICIsICIgKyB2YWx1ZSk7CisgICAg fSBlbHNlCisgICAgICAgIG1fcmVzcG9uc2Uuc2V0SFRUUEhlYWRlckZpZWxkKGtleSwgdmFsdWUp OwogfQogCiB2b2lkIE5ldHdvcmtKb2I6OmhhbmRsZU5vdGlmeU11bHRpcGFydEhlYWRlclJlY2Vp dmVkKGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlKQo= 182286 2013-01-11 00:55:38 -0800 2013-01-11 02:33:12 -0800 Patch bug-106625-20130111165240.patch text/plain 3862 mawu U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzljMDIyNjBmN2Q2ZWEw OTM4NTAzZGRkYzY1NDI5ZGY0MTRhMDg0ZC4uMmYwOTA1ODZmZGQyODVhNmRmZGFkMjc4Y2EzYmVj OGQwYjkyOTY1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAxLTExICBNYXJ5 IFd1ICA8bWFyeS53dUB0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAgW0JsYWNrQmVycnld IEVuYWJsZSBjb25jYXRlbmF0aW5nIGhlYWRlcnMgd2l0aCBzYW1lIGZpZWxkIG5hbWUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjYyNQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJGQyAyNjE2IHNwZWNp ZmllcyB0aGF0IGhlYWRlcnMgY291bGQgY29uY2F0ZW5hdGUgd2l0aCBjb21tYSBpZiB0aGV5IGhh dmUKKyAgICAgICAgc2FtZSBmaWVsZCBuYW1lLiBXZSBzaG91bGQgZW5hYmxlIHRoaXMgaWYgdGhl IGhlYWRlciBhbGxvd3MgbXVsdGlwbGUgdmFsdWVzLgorCisgICAgICAgIFJJTSBQUiMgMjc1NTA4 LCBpbnRlcm5hbGx5IHJldmlld2VkIGJ5IEpvZSBNYXNvbgorCisgICAgICAgIChXZWJDb3JlKToK KyAgICAgICAgKFdlYkNvcmU6OmlzQXBwZW5kYWJsZUhlYWRlcik6CisgICAgICAgIChXZWJDb3Jl OjpOZXR3b3JrSm9iOjpoYW5kbGVOb3RpZnlIZWFkZXJSZWNlaXZlZCk6CisKIDIwMTItMTItMjMg IEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzEyODA4Mzc3PiBOZXR3b3JrIHByb2Nlc3Mgc2hvdWxkIHJlc3BlY3QgY29va2llIGFj Y2VwdCBwb2xpY3kKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv YmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAppbmRleCA3MzEzODQ2ODdhZWZjYzMzZmI2M2Qw ZDM3ZGE0Yzk3NGU1MzAxNjNjLi5iZTY4N2YxODJmOTdjNTE4ZWU0MGQ0OWIxZDQwYTczNTYyYTc3 YTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVy cnkvTmV0d29ya0pvYi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9i bGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCkBAIC02Myw2ICs2MywyMiBAQCBpbmxpbmUgc3RhdGlj IGJvb2wgaXNVbmF1dGhvcml6ZWQoaW50IHN0YXR1c0NvZGUpCiAgICAgcmV0dXJuIHN0YXR1c0Nv ZGUgPT0gNDAxOwogfQogCitzdGF0aWMgY2hhciogY29uc3QgYXBwZW5kYWJsZUhlYWRlcnNbXSA9 IHsiYWNjZXNzLWNvbnRyb2wtYWxsb3ctb3JpZ2luIiwgImFsbG93IiwKKyAgICAic2V0LWNvb2tp ZSIsICJzZXQtY29va2llMiIsICJ2YXJ5IiwgInZpYSIsICJ3YXJuaW5nIn07CisKK3N0YXRpYyBi b29sIGlzQXBwZW5kYWJsZUhlYWRlcihTdHJpbmcga2V5KQoreworICAgIC8vIE5vbi1zdGFuZGFy ZCBoZWFkZXIgZmllbGRzIGFyZSBjb252ZW50aW9uYWxseSBtYXJrZWQgYnkgcHJlZml4aW5nIHRo ZSBmaWVsZCBuYW1lIHdpdGggWC0uCisgICAgaWYgKGtleS5zdGFydHNXaXRoKCJ4LSIpKQorICAg ICAgICByZXR1cm4gdHJ1ZTsKKworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgc2l6ZW9mKGFwcGVu ZGFibGVIZWFkZXJzKSAvc2l6ZW9mKGNoYXIqKTsgaSsrKQorICAgICAgICBpZiAoa2V5ID09IGFw cGVuZGFibGVIZWFkZXJzW2ldKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICByZXR1 cm4gZmFsc2U7Cit9CisKIE5ldHdvcmtKb2I6Ok5ldHdvcmtKb2IoKQogICAgIDogRnJhbWVEZXN0 cnVjdGlvbk9ic2VydmVyKDApCiAgICAgLCBtX3BsYXllcklkKDApCkBAIC0zMzMsMjAgKzM0OSwx NyBAQCB2b2lkIE5ldHdvcmtKb2I6OmhhbmRsZU5vdGlmeUhlYWRlclJlY2VpdmVkKGNvbnN0IFN0 cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbAogICAgICAgICBtX2NvbnRlbnRUeXBlID0gdmFs dWUubG93ZXIoKTsKICAgICBlbHNlIGlmIChsb3dlcktleSA9PSAiY29udGVudC1kaXNwb3NpdGlv biIpCiAgICAgICAgIG1fY29udGVudERpc3Bvc2l0aW9uID0gdmFsdWU7Ci0gICAgZWxzZSBpZiAo bG93ZXJLZXkgPT0gInNldC1jb29raWUiKSB7Ci0gICAgICAgIGlmIChtX2ZyYW1lICYmIG1fZnJh bWUtPmxvYWRlcigpICYmIG1fZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKQotICAgICAgICAgICAg JiYgc3RhdGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5Kj4obV9mcmFtZS0+bG9h ZGVyKCktPmNsaWVudCgpKS0+Y29va2llc0VuYWJsZWQoKSkgewotICAgICAgICAgICAgaGFuZGxl U2V0Q29va2llSGVhZGVyKHZhbHVlKTsKLSAgICAgICAgICAgIC8vIElmIHRoZXJlIGFyZSBzZXZl cmFsICJTZXQtQ29va2llIiBoZWFkZXJzLCB3ZSBzaG91bGQgY29tYmluZSB0aGUgZm9sbG93aW5n IG9uZXMgd2l0aCB0aGUgZmlyc3QuCi0gICAgICAgICAgICBpZiAobV9yZXNwb25zZS5odHRwSGVh ZGVyRmllbGRzKCkuY29udGFpbnMoIlNldC1Db29raWUiKSkgewotICAgICAgICAgICAgICAgIG1f cmVzcG9uc2Uuc2V0SFRUUEhlYWRlckZpZWxkKGtleSwgbV9yZXNwb25zZS5odHRwSGVhZGVyRmll bGQoa2V5KSArICIsICIgKyB2YWx1ZSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICAgICAgfQotICAgICAgICB9Ci0gICAgfSBlbHNlIGlmIChlcXVhbElnbm9yaW5nQ2FzZShrZXks IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6SEVBREVSX0JMQUNLQkVSUllf RlRQKSkKKyAgICBlbHNlIGlmIChsb3dlcktleSA9PSAic2V0LWNvb2tpZSIgJiYgbV9mcmFtZSAm JiBtX2ZyYW1lLT5sb2FkZXIoKSAmJiBtX2ZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCkKKyAgICAg ICAgJiYgc3RhdGljX2Nhc3Q8RnJhbWVMb2FkZXJDbGllbnRCbGFja0JlcnJ5Kj4obV9mcmFtZS0+ bG9hZGVyKCktPmNsaWVudCgpKS0+Y29va2llc0VuYWJsZWQoKSkKKyAgICAgICAgaGFuZGxlU2V0 Q29va2llSGVhZGVyKHZhbHVlKTsKKyAgICBlbHNlIGlmIChlcXVhbElnbm9yaW5nQ2FzZShrZXks IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpOZXR3b3JrUmVxdWVzdDo6SEVBREVSX0JMQUNLQkVSUllf RlRQKSkKICAgICAgICAgaGFuZGxlRlRQSGVhZGVyKHZhbHVlKTsKIAotICAgIG1fcmVzcG9uc2Uu c2V0SFRUUEhlYWRlckZpZWxkKGtleSwgdmFsdWUpOworICAgIGlmIChtX3Jlc3BvbnNlLmh0dHBI ZWFkZXJGaWVsZHMoKS5jb250YWlucyhrZXkudXRmOCgpLmRhdGEoKSkgJiYgaXNBcHBlbmRhYmxl SGVhZGVyKGxvd2VyS2V5KSkgeworICAgICAgICAvLyBJZiB0aGVyZSBhcmUgc2V2ZXJhbCBoZWFk ZXJzIHdpdGggc2FtZSBrZXksIHdlIHNob3VsZCBjb21iaW5lIHRoZSBmb2xsb3dpbmcgb25lcyB3 aXRoIHRoZSBmaXJzdC4KKyAgICAgICAgbV9yZXNwb25zZS5zZXRIVFRQSGVhZGVyRmllbGQoa2V5 LCBtX3Jlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZChrZXkpICsgIiwgIiArIHZhbHVlKTsKKyAgICB9 IGVsc2UKKyAgICAgICAgbV9yZXNwb25zZS5zZXRIVFRQSGVhZGVyRmllbGQoa2V5LCB2YWx1ZSk7 CiB9CiAKIHZvaWQgTmV0d29ya0pvYjo6aGFuZGxlTm90aWZ5TXVsdGlwYXJ0SGVhZGVyUmVjZWl2 ZWQoY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdmFsdWUpCg== 182303 2013-01-11 02:33:16 -0800 2013-01-11 03:13:42 -0800 Patch bug-106625-20130111183018.patch text/plain 3869 mawu U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NDI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzljMDIyNjBmN2Q2ZWEw OTM4NTAzZGRkYzY1NDI5ZGY0MTRhMDg0ZC4uMmYwOTA1ODZmZGQyODVhNmRmZGFkMjc4Y2EzYmVj OGQwYjkyOTY1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAxLTExICBNYXJ5 IFd1ICA8bWFyeS53dUB0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAgW0JsYWNrQmVycnld IEVuYWJsZSBjb25jYXRlbmF0aW5nIGhlYWRlcnMgd2l0aCBzYW1lIGZpZWxkIG5hbWUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjYyNQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJGQyAyNjE2IHNwZWNp ZmllcyB0aGF0IGhlYWRlcnMgY291bGQgY29uY2F0ZW5hdGUgd2l0aCBjb21tYSBpZiB0aGV5IGhh dmUKKyAgICAgICAgc2FtZSBmaWVsZCBuYW1lLiBXZSBzaG91bGQgZW5hYmxlIHRoaXMgaWYgdGhl IGhlYWRlciBhbGxvd3MgbXVsdGlwbGUgdmFsdWVzLgorCisgICAgICAgIFJJTSBQUiMgMjc1NTA4 LCBpbnRlcm5hbGx5IHJldmlld2VkIGJ5IEpvZSBNYXNvbgorCisgICAgICAgIChXZWJDb3JlKToK KyAgICAgICAgKFdlYkNvcmU6OmlzQXBwZW5kYWJsZUhlYWRlcik6CisgICAgICAgIChXZWJDb3Jl OjpOZXR3b3JrSm9iOjpoYW5kbGVOb3RpZnlIZWFkZXJSZWNlaXZlZCk6CisKIDIwMTItMTItMjMg IEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzEyODA4Mzc3PiBOZXR3b3JrIHByb2Nlc3Mgc2hvdWxkIHJlc3BlY3QgY29va2llIGFj Y2VwdCBwb2xpY3kKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv YmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAppbmRleCA3MzEzODQ2ODdhZWZjYzMzZmI2M2Qw ZDM3ZGE0Yzk3NGU1MzAxNjNjLi4zOGFmMjAwMjIxMjUyNjBlZDc4Y2I2NmE2M2QyOGFhMzBiZTRl Y2RjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVy cnkvTmV0d29ya0pvYi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9i bGFja2JlcnJ5L05ldHdvcmtKb2IuY3BwCkBAIC02Myw2ICs2MywyMiBAQCBpbmxpbmUgc3RhdGlj IGJvb2wgaXNVbmF1dGhvcml6ZWQoaW50IHN0YXR1c0NvZGUpCiAgICAgcmV0dXJuIHN0YXR1c0Nv ZGUgPT0gNDAxOwogfQogCitzdGF0aWMgY2hhciogY29uc3QgYXBwZW5kYWJsZUhlYWRlcnNbXSA9 IHsiYWNjZXNzLWNvbnRyb2wtYWxsb3ctb3JpZ2luIiwgImFsbG93IiwKKyAgICAic2V0LWNvb2tp ZSIsICJzZXQtY29va2llMiIsICJ2YXJ5IiwgInZpYSIsICJ3YXJuaW5nIn07CisKK3N0YXRpYyBi b29sIGlzQXBwZW5kYWJsZUhlYWRlcihjb25zdCBTdHJpbmcmIGtleSkKK3sKKyAgICAvLyBOb24t c3RhbmRhcmQgaGVhZGVyIGZpZWxkcyBhcmUgY29udmVudGlvbmFsbHkgbWFya2VkIGJ5IHByZWZp eGluZyB0aGUgZmllbGQgbmFtZSB3aXRoIFgtLgorICAgIGlmIChrZXkuc3RhcnRzV2l0aCgieC0i KSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBmb3IgKGludCBpID0gMDsgaSA8IHNpemVv ZihhcHBlbmRhYmxlSGVhZGVycykgL3NpemVvZihjaGFyKik7IGkrKykKKyAgICAgICAgaWYgKGtl eSA9PSBhcHBlbmRhYmxlSGVhZGVyc1tpXSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworCisg ICAgcmV0dXJuIGZhbHNlOworfQorCiBOZXR3b3JrSm9iOjpOZXR3b3JrSm9iKCkKICAgICA6IEZy YW1lRGVzdHJ1Y3Rpb25PYnNlcnZlcigwKQogICAgICwgbV9wbGF5ZXJJZCgwKQpAQCAtMzMzLDIw ICszNDksMTcgQEAgdm9pZCBOZXR3b3JrSm9iOjpoYW5kbGVOb3RpZnlIZWFkZXJSZWNlaXZlZChj b25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWwKICAgICAgICAgbV9jb250ZW50VHlw ZSA9IHZhbHVlLmxvd2VyKCk7CiAgICAgZWxzZSBpZiAobG93ZXJLZXkgPT0gImNvbnRlbnQtZGlz cG9zaXRpb24iKQogICAgICAgICBtX2NvbnRlbnREaXNwb3NpdGlvbiA9IHZhbHVlOwotICAgIGVs c2UgaWYgKGxvd2VyS2V5ID09ICJzZXQtY29va2llIikgewotICAgICAgICBpZiAobV9mcmFtZSAm JiBtX2ZyYW1lLT5sb2FkZXIoKSAmJiBtX2ZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCkKLSAgICAg ICAgICAgICYmIHN0YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeSo+KG1fZnJh bWUtPmxvYWRlcigpLT5jbGllbnQoKSktPmNvb2tpZXNFbmFibGVkKCkpIHsKLSAgICAgICAgICAg IGhhbmRsZVNldENvb2tpZUhlYWRlcih2YWx1ZSk7Ci0gICAgICAgICAgICAvLyBJZiB0aGVyZSBh cmUgc2V2ZXJhbCAiU2V0LUNvb2tpZSIgaGVhZGVycywgd2Ugc2hvdWxkIGNvbWJpbmUgdGhlIGZv bGxvd2luZyBvbmVzIHdpdGggdGhlIGZpcnN0LgotICAgICAgICAgICAgaWYgKG1fcmVzcG9uc2Uu aHR0cEhlYWRlckZpZWxkcygpLmNvbnRhaW5zKCJTZXQtQ29va2llIikpIHsKLSAgICAgICAgICAg ICAgICBtX3Jlc3BvbnNlLnNldEhUVFBIZWFkZXJGaWVsZChrZXksIG1fcmVzcG9uc2UuaHR0cEhl YWRlckZpZWxkKGtleSkgKyAiLCAiICsgdmFsdWUpOwotICAgICAgICAgICAgICAgIHJldHVybjsK LSAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAgIH0gZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nh c2Uoa2V5LCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OkhFQURFUl9CTEFD S0JFUlJZX0ZUUCkpCisgICAgZWxzZSBpZiAobG93ZXJLZXkgPT0gInNldC1jb29raWUiICYmIG1f ZnJhbWUgJiYgbV9mcmFtZS0+bG9hZGVyKCkgJiYgbV9mcmFtZS0+bG9hZGVyKCktPmNsaWVudCgp CisgICAgICAgICYmIHN0YXRpY19jYXN0PEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeSo+KG1f ZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKSktPmNvb2tpZXNFbmFibGVkKCkpCisgICAgICAgIGhh bmRsZVNldENvb2tpZUhlYWRlcih2YWx1ZSk7CisgICAgZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nh c2Uoa2V5LCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6TmV0d29ya1JlcXVlc3Q6OkhFQURFUl9CTEFD S0JFUlJZX0ZUUCkpCiAgICAgICAgIGhhbmRsZUZUUEhlYWRlcih2YWx1ZSk7CiAKLSAgICBtX3Jl c3BvbnNlLnNldEhUVFBIZWFkZXJGaWVsZChrZXksIHZhbHVlKTsKKyAgICBpZiAobV9yZXNwb25z ZS5odHRwSGVhZGVyRmllbGRzKCkuY29udGFpbnMoa2V5LnV0ZjgoKS5kYXRhKCkpICYmIGlzQXBw ZW5kYWJsZUhlYWRlcihsb3dlcktleSkpIHsKKyAgICAgICAgLy8gSWYgdGhlcmUgYXJlIHNldmVy YWwgaGVhZGVycyB3aXRoIHNhbWUga2V5LCB3ZSBzaG91bGQgY29tYmluZSB0aGUgZm9sbG93aW5n IG9uZXMgd2l0aCB0aGUgZmlyc3QuCisgICAgICAgIG1fcmVzcG9uc2Uuc2V0SFRUUEhlYWRlckZp ZWxkKGtleSwgbV9yZXNwb25zZS5odHRwSGVhZGVyRmllbGQoa2V5KSArICIsICIgKyB2YWx1ZSk7 CisgICAgfSBlbHNlCisgICAgICAgIG1fcmVzcG9uc2Uuc2V0SFRUUEhlYWRlckZpZWxkKGtleSwg dmFsdWUpOwogfQogCiB2b2lkIE5ldHdvcmtKb2I6OmhhbmRsZU5vdGlmeU11bHRpcGFydEhlYWRl clJlY2VpdmVkKGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlKQo=