64050 2011-07-06 19:27:24 -0700 nrwt: fix typo preventing http startup on windows 2011-07-06 20:19:01 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke oldest_to_newest 433171 0 dpranke 2011-07-06 19:27:24 -0700 nrwt: fix typo preventing http startup on windows 433182 1 99917 dpranke 2011-07-06 19:59:32 -0700 Created attachment 99917 Patch 433183 2 99917 eric 2011-07-06 20:02:58 -0700 Comment on attachment 99917 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=99917&action=review OK. > Tools/Scripts/webkitpy/layout_tests/layout_package/manager_unittest.py:231 > + > + > + I suspect pep8 would tell us that's 3 too many newlines. 433192 3 dpranke 2011-07-06 20:19:01 -0700 Committed r90528: <http://trac.webkit.org/changeset/90528> 99917 2011-07-06 19:59:32 -0700 2011-07-06 20:02:58 -0700 Patch bug-64050-20110706195931.patch text/plain 6868 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogOTA1MjAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkZmY4ZmRmMTQwMTFiNzJiZWY0MWVlZjhlY2EyYTIxYWQ0 YWFhYjJhLi42OTY3M2ZkNjZhNjUwZDQ3NTY4MGZkNzMzNjJkODFjMTdiZDhiYzY1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkg QEAKIDIwMTEtMDctMDYgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKKyAg ICAgICAgbnJ3dDogZml4IHR5cG8gcHJldmVudGluZyBodHRwIHN0YXJ0dXAgb24gd2luZG93cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQwNTAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOUldUIGNoZWNr cyB3aGV0aGVyIGl0IG5lZWRzIHRvIHN0YXJ0IHRoZSBzZXJ2ZXJzIGJ5IGxvb2tpbmcKKyAgICAg ICAgZm9yICIvaHR0cC8iIGluIHRoZSB0ZXN0IG5hbWVzLiBBZnRlciByOTA1MjAsIHRoZSBsZWFk aW5nIHNsYXNoCisgICAgICAgIGlzIG5vdCBwcmVzZW50LCBzbyB0aGUgY2hlY2sgaXNuJ3QgcXVp dGUgcmlnaHQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlv dXRfcGFja2FnZS9tYW5hZ2VyLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFnZXJfdW5pdHRlc3QucHk6CisKKzIwMTEtMDctMDYg IERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQg YnkgRXJpYyBTaWVkZWwuCiAKICAgICAgICAgbnJ3dDogbWFrZSB0aGUgY29kZSBiZSBjb25zaXN0 ZW50IGFib3V0IHVzaW5nIHRlc3QgbmFtZXMgaW5zdGVhZCBvZiBmaWxlbmFtZXMgb3IgcGF0aHMK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9w YWNrYWdlL21hbmFnZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9s YXlvdXRfcGFja2FnZS9tYW5hZ2VyLnB5CmluZGV4IGQyYjRhNjJlZjU1MjliNjA3YzA1ZmNjODY2 NjZiNDkyODliNjk2NDcuLmViNmQ1ZGNkMDE1MWUwYjBhMWVjMzIxMjMxMjQwOWI3YTNjMzNmZmQg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9w YWNrYWdlL21hbmFnZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbGF5b3V0X3BhY2thZ2UvbWFuYWdlci5weQpAQCAtMjg3LDYgKzI4Nyw4IEBAIGNsYXNzIE1h bmFnZXIob2JqZWN0KToKICAgICAgICAgIyAgICAgICAgb3B0aW9ucy5yZXN1bHRzX2RpcmVjdG9y eSwgdXNlX3Rscz1UcnVlLCBwb3J0PTkzMjMpCiAKICAgICAgICAgIyBhIHNldCBvZiB0ZXN0IGZp bGVzLCBhbmQgdGhlIHNhbWUgdGVzdHMgYXMgYSBsaXN0CisKKyAgICAgICAgIyBGSVhNRTogUmVu YW1lIHRvIHRlc3RfbmFtZXMuCiAgICAgICAgIHNlbGYuX3Rlc3RfZmlsZXMgPSBzZXQoKQogICAg ICAgICBzZWxmLl90ZXN0X2ZpbGVzX2xpc3QgPSBOb25lCiAgICAgICAgIHNlbGYuX3Jlc3VsdF9x dWV1ZSA9IFF1ZXVlLlF1ZXVlKCkKQEAgLTY2NCwxMiArNjY2LDYgQEAgY2xhc3MgTWFuYWdlcihv YmplY3QpOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGV4dHJhY3Rf YW5kX2ZsYXR0ZW4oc29tZV9zaGFyZHMpKSkKICAgICAgICAgcmV0dXJuIG5ld19zaGFyZHMKIAot ICAgIGRlZiBfY29udGFpbnNfdGVzdHMoc2VsZiwgc3ViZGlyKToKLSAgICAgICAgZm9yIHRlc3Rf ZmlsZSBpbiBzZWxmLl90ZXN0X2ZpbGVzOgotICAgICAgICAgICAgaWYgdGVzdF9maWxlLmZpbmQo c3ViZGlyKSA+PSAwOgotICAgICAgICAgICAgICAgIHJldHVybiBUcnVlCi0gICAgICAgIHJldHVy biBGYWxzZQotCiAgICAgZGVmIF9sb2dfbnVtX3dvcmtlcnMoc2VsZiwgbnVtX3dvcmtlcnMsIG51 bV9zaGFyZHMsIG51bV9sb2NrZWRfc2hhcmRzKToKICAgICAgICAgZHJpdmVyX25hbWUgPSBzZWxm Ll9wb3J0LmRyaXZlcl9uYW1lKCkKICAgICAgICAgaWYgbnVtX3dvcmtlcnMgPT0gMToKQEAgLTgx NCwxMyArODEwLDggQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogCiAgICAgICAgIHJldHVybiAo dGhyZWFkX3RpbWluZ3MsIHRlc3RfdGltaW5ncywgaW5kaXZpZHVhbF90ZXN0X3RpbWluZ3MpCiAK LSAgICBkZWYgbmVlZHNfaHR0cChzZWxmKToKLSAgICAgICAgIiIiUmV0dXJucyB3aGV0aGVyIHRo ZSB0ZXN0IHJ1bm5lciBuZWVkcyBhbiBIVFRQIHNlcnZlci4iIiIKLSAgICAgICAgcmV0dXJuIHNl bGYuX2NvbnRhaW5zX3Rlc3RzKHNlbGYuSFRUUF9TVUJESVIpCi0KLSAgICBkZWYgbmVlZHNfd2Vi c29ja2V0KHNlbGYpOgotICAgICAgICAiIiJSZXR1cm5zIHdoZXRoZXIgdGhlIHRlc3QgcnVubmVy IG5lZWRzIGEgV0VCU09DS0VUIHNlcnZlci4iIiIKLSAgICAgICAgcmV0dXJuIHNlbGYuX2NvbnRh aW5zX3Rlc3RzKHNlbGYuV0VCU09DS0VUX1NVQkRJUikKKyAgICBkZWYgbmVlZHNfc2VydmVycyhz ZWxmKToKKyAgICAgICAgcmV0dXJuIGFueShzZWxmLl90ZXN0X3JlcXVpcmVzX2xvY2sodGVzdF9u YW1lKSBmb3IgdGVzdF9uYW1lIGluIHNlbGYuX3Rlc3RfZmlsZXMpCiAKICAgICBkZWYgc2V0X3Vw X3J1bihzZWxmKToKICAgICAgICAgIiIiQ29uZmlndXJlcyB0aGUgc3lzdGVtIHRvIGJlIHJlYWR5 IHRvIHJ1biB0ZXN0cy4KQEAgLTgzNyw3ICs4MjgsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6 CiAgICAgICAgICMgQ2hlY2sgdGhhdCB0aGUgc3lzdGVtIGRlcGVuZGVuY2llcyAodGhlbWVzLCBm b250cywgLi4uKSBhcmUgY29ycmVjdC4KICAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMubm9j aGVja19zeXNfZGVwczoKICAgICAgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfdXBkYXRlKCJD aGVja2luZyBzeXN0ZW0gZGVwZW5kZW5jaWVzIC4uLiIpCi0gICAgICAgICAgICBpZiBub3Qgc2Vs Zi5fcG9ydC5jaGVja19zeXNfZGVwcyhzZWxmLm5lZWRzX2h0dHAoKSk6CisgICAgICAgICAgICBp ZiBub3Qgc2VsZi5fcG9ydC5jaGVja19zeXNfZGVwcyhzZWxmLm5lZWRzX3NlcnZlcnMoKSk6CiAg ICAgICAgICAgICAgICAgc2VsZi5fcG9ydC5zdG9wX2hlbHBlcigpCiAgICAgICAgICAgICAgICAg cmV0dXJuIE5vbmUKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbGF5b3V0X3BhY2thZ2UvbWFuYWdlcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFnZXJfdW5pdHRlc3QucHkK aW5kZXggNDk1NjM2YzczOGU1NWUyYTVmMDEzZTcxZjA2MzA5MWFiY2Q1YjZhYy4uYzI4MGVjMmRm NzEwNjkzYTE5MTE4NzlkM2Y0OTQ4M2I2OWViYWExZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWFuYWdlcl91bml0dGVzdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2Fn ZS9tYW5hZ2VyX3VuaXR0ZXN0LnB5CkBAIC0zMSw2ICszMSw3IEBACiAiIiJVbml0IHRlc3RzIGZv ciBtYW5hZ2VyLnB5LiIiIgogCiBpbXBvcnQgU3RyaW5nSU8KK2ltcG9ydCBzeXMKIGltcG9ydCB1 bml0dGVzdAogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0IGZpbGVzeXN0ZW1f bW9jawpAQCAtMzgsNiArMzksNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0 IG91dHB1dGNhcHR1cmUKIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5tb2NrIGltcG9ydCBNb2Nr CiBmcm9tIHdlYmtpdHB5IGltcG9ydCBsYXlvdXRfdGVzdHMKIGZyb20gd2Via2l0cHkubGF5b3V0 X3Rlc3RzIGltcG9ydCBwb3J0Citmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9y dCBwb3J0X3Rlc3RjYXNlCiAKIGZyb20gd2Via2l0cHkgaW1wb3J0IGxheW91dF90ZXN0cwogZnJv bSB3ZWJraXRweS5sYXlvdXRfdGVzdHMgaW1wb3J0IHJ1bl93ZWJraXRfdGVzdHMKQEAgLTE4Niw2 ICsxODgsNDcgQEAgY2xhc3MgTWFuYWdlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAg ICBtYW5hZ2VyLl9vcHRpb25zLmV4aXRfYWZ0ZXJfbl9mYWlsdXJlcyA9IDEwCiAgICAgICAgIGV4 Y2VwdGlvbiA9IHNlbGYuYXNzZXJ0UmFpc2VzKFRlc3RSdW5JbnRlcnJ1cHRlZEV4Y2VwdGlvbiwg bWFuYWdlci5faW50ZXJydXB0X2lmX2F0X2ZhaWx1cmVfbGltaXRzLCByZXN1bHRfc3VtbWFyeSkK IAorICAgIGRlZiB0ZXN0X25lZWRzX3NlcnZlcnMoc2VsZik6CisgICAgICAgIGRlZiBnZXRfbWFu YWdlcl93aXRoX3Rlc3RzKHRlc3RfbmFtZXMpOgorICAgICAgICAgICAgcG9ydCA9IE1vY2soKQor ICAgICAgICAgICAgcG9ydC5URVNUX1BBVEhfU0VQQVJBVE9SID0gJy8nCisgICAgICAgICAgICBt YW5hZ2VyID0gTWFuYWdlcihwb3J0LCBvcHRpb25zPU1vY2tPcHRpb25zKCksIHByaW50ZXI9TW9j aygpKQorICAgICAgICAgICAgbWFuYWdlci5fdGVzdF9maWxlcyA9IHNldCh0ZXN0X25hbWVzKQor ICAgICAgICAgICAgbWFuYWdlci5fdGVzdF9maWxlc19saXN0ID0gdGVzdF9uYW1lcworICAgICAg ICAgICAgcmV0dXJuIG1hbmFnZXIKKworICAgICAgICBtYW5hZ2VyID0gZ2V0X21hbmFnZXJfd2l0 aF90ZXN0cyhbJ2Zhc3QvaHRtbCddKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKG1hbmFnZXIu bmVlZHNfc2VydmVycygpKQorCisgICAgICAgIG1hbmFnZXIgPSBnZXRfbWFuYWdlcl93aXRoX3Rl c3RzKFsnaHR0cC90ZXN0cy9taXNjJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShtYW5hZ2Vy Lm5lZWRzX3NlcnZlcnMoKSkKKworICAgICAgICAjIEZJWE1FOiB3ZSBwcm9iYWJseSBuZWVkIHNv bWUgaW50ZWdyYXRpb24gdGVzdHMgdG8gZW5zdXJlIHRoaXMKKyAgICAgICAgIyB3b3JrcyBvbiB3 aW5kb3dzIGFzIHdlbGwuCisKKyAgICBkZWYgaW50ZWdyYXRpb25fdGVzdF9uZWVkc19zZXJ2ZXJz KHNlbGYpOgorICAgICAgICBkZWYgZ2V0X21hbmFnZXJfd2l0aF90ZXN0cyh0ZXN0X25hbWVzKToK KyAgICAgICAgICAgIHBvcnQgPSBsYXlvdXRfdGVzdHMucG9ydC5nZXQoKQorICAgICAgICAgICAg bWFuYWdlciA9IE1hbmFnZXIocG9ydCwgb3B0aW9ucz1Nb2NrT3B0aW9ucyh0ZXN0X2xpc3Q9Tm9u ZSksIHByaW50ZXI9TW9jaygpKQorICAgICAgICAgICAgbWFuYWdlci5jb2xsZWN0X3Rlc3RzKHRl c3RfbmFtZXMsIGxhc3RfdW5leHBlY3RlZF9yZXN1bHRzPVtdKQorICAgICAgICAgICAgcmV0dXJu IG1hbmFnZXIKKworICAgICAgICBtYW5hZ2VyID0gZ2V0X21hbmFnZXJfd2l0aF90ZXN0cyhbJ2Zh c3QvaHRtbCddKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKG1hbmFnZXIubmVlZHNfc2VydmVy cygpKQorCisgICAgICAgIG1hbmFnZXIgPSBnZXRfbWFuYWdlcl93aXRoX3Rlc3RzKFsnaHR0cC90 ZXN0cy9taW1lJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShtYW5hZ2VyLm5lZWRzX3NlcnZl cnMoKSkKKworICAgICAgICBpZiBzeXMucGxhdGZvcm0gPT0gJ3dpbjMyJzoKKyAgICAgICAgICAg IG1hbmFnZXIgPSBnZXRfbWFuYWdlcl93aXRoX3Rlc3RzKFsnZmFzdFxcaHRtbCddKQorICAgICAg ICAgICAgc2VsZi5hc3NlcnRGYWxzZShtYW5hZ2VyLm5lZWRzX3NlcnZlcnMoKSkKKworICAgICAg ICAgICAgbWFuYWdlciA9IGdldF9tYW5hZ2VyX3dpdGhfdGVzdHMoWydodHRwXFx0ZXN0c1xcbWlt ZSddKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKG1hbmFnZXIubmVlZHNfc2VydmVycygp KQorCisKKworCiAKIGNsYXNzIE5hdHVyYWxDb21wYXJlVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6 CiAgICAgZGVmIGFzc2VydF9jbXAoc2VsZiwgeCwgeSwgcmVzdWx0KToKQEAgLTIyOCw0ICsyNzEs NCBAQCBjbGFzcyBLZXlDb21wYXJlVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKIAogaWYgX19u YW1lX18gPT0gJ19fbWFpbl9fJzoKLSAgICB1bml0dGVzdC5tYWluKCkKKyAgICBwb3J0X3Rlc3Rj YXNlLm1haW4oKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcnVuX3dlYmtpdF90ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3J1bl93ZWJraXRfdGVzdHMucHkKaW5kZXggNjE0ZjY5Zjc2YjE4MjgwMjk5OWRhNGM3MmNl OGJiZTY1YTI2OTJiYS4uMzI4ZTYxOTBiOGM1Y2JlMjc4MjQxODlkZjEyMTAxOWUyYWY1MzlmNyAx MDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtp dF90ZXN0cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5f d2Via2l0X3Rlc3RzLnB5CkBAIC0xMTEsNyArMTExLDcgQEAgZGVmIHJ1bihwb3J0LCBvcHRpb25z LCBhcmdzLCByZWd1bGFyX291dHB1dD1zeXMuc3RkZXJyLAogICAgICAgICBtYW5hZ2VyLnBhcnNl X2V4cGVjdGF0aW9ucygpCiAKICAgICAgICAgcHJpbnRlci5wcmludF91cGRhdGUoIkNoZWNraW5n IGJ1aWxkIC4uLiIpCi0gICAgICAgIGlmIG5vdCBwb3J0LmNoZWNrX2J1aWxkKG1hbmFnZXIubmVl ZHNfaHR0cCgpKToKKyAgICAgICAgaWYgbm90IHBvcnQuY2hlY2tfYnVpbGQobWFuYWdlci5uZWVk c19zZXJ2ZXJzKCkpOgogICAgICAgICAgICAgX2xvZy5lcnJvcigiQnVpbGQgY2hlY2sgZmFpbGVk IikKICAgICAgICAgICAgIHJldHVybiAtMQogCg==