98071 2012-10-01 14:28:54 -0700 webkitpy should accept a different httpd.conf specified by the user 2012-10-01 16:26:26 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rakuco rakuco abarth dpranke ojan webkit.review.bot oldest_to_newest 731986 0 rakuco 2012-10-01 14:28:54 -0700 webkitpy should accept a different httpd.conf specified by the user 731998 1 166545 rakuco 2012-10-01 14:34:26 -0700 Created attachment 166545 Patch 732014 2 166545 dpranke 2012-10-01 14:50:23 -0700 Comment on attachment 166545 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166545&action=review > Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py:603 > + os.environ = saved_environ.copy() You should wrap these in a try-finally block to ensure that os.environ gets restored no matter what happens. Longer term we might want to consider enhancing the environment wrapper in webkitpy.common.system to make this more mockable. > Tools/Scripts/webkitpy/layout_tests/servers/http_server.py:103 > + base_conf_file = self._path_to_config_file() I'm not a fan of the duplication between this and the code in base.py. I'm also not sure that this is even worth doing since AFAIK only chromium uses this routine and we're not likely to set this. I appreciate your diligence, but how about we just add a FIXME to consider supporting the variable and otherwise leave the files alone? 732018 3 rakuco 2012-10-01 14:53:41 -0700 (In reply to comment #2) > (From update of attachment 166545 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=166545&action=review > > > Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py:603 > > + os.environ = saved_environ.copy() > > You should wrap these in a try-finally block to ensure that os.environ gets restored no matter what happens. Alright. > > Tools/Scripts/webkitpy/layout_tests/servers/http_server.py:103 > > + base_conf_file = self._path_to_config_file() > > I'm not a fan of the duplication between this and the code in base.py. I'm also not sure that this is even worth doing since AFAIK only chromium uses this routine and we're not likely to set this. I appreciate your diligence, but how about we just add a FIXME to consider supporting the variable and otherwise leave the files alone? I'm OK with that, but it might make my life more difficult if I want to run http tests in chromium ;) 732042 4 166556 rakuco 2012-10-01 15:20:37 -0700 Created attachment 166556 Patch for landing 732043 5 rakuco 2012-10-01 15:22:28 -0700 Committed r130083: <http://trac.webkit.org/changeset/130083> 732069 6 166556 ojan 2012-10-01 15:43:20 -0700 Comment on attachment 166556 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=166556&action=review > Tools/ChangeLog:21 > + In the long term, we should try to generate our configuration file > + and stop requiring all the different httpd.conf files we have as > + well as this hack. Yes please! 732111 7 dpranke 2012-10-01 16:26:26 -0700 (In reply to comment #3) > I'm OK with that, but it might make my life more difficult if I want to run http tests in chromium ;) Only on Windows, I'm assuming that's not a big concern for you. Chromium uses the Apache config on the other platforms 166545 2012-10-01 14:34:26 -0700 2012-10-01 15:20:21 -0700 Patch bug-98071-20121002003337.patch text/plain 8060 rakuco SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEzMDA3NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM2IEBACisyMDEyLTEwLTAxICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxyYXBoYWVsLmt1 Ym8uZGEuY29zdGFAaW50ZWwuY29tPgorCisgICAgICAgIHdlYmtpdHB5IHNob3VsZCBhY2NlcHQg YSBkaWZmZXJlbnQgaHR0cGQuY29uZiBzcGVjaWZpZWQgYnkgdGhlIHVzZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk4MDcxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGV4aXN0aW5nIGh0dHBkLmNv bmYgdmFyaWFudHMgKG9yIGxpZ2h0dHBkLmNvbmYsIGZvciB0aGF0CisgICAgICAgIG1hdHRlcikg d2UgaGF2ZSBkbyBub3QgYWx3YXlzIHN1aXQgdGhlIHVzZXIncyBzeXN0ZW0uIFRoaXMgaXMKKyAg ICAgICAgcGFydGljdWxhcmx5IHRydWUgb24gTGludXgvVW5peCwgd2hlcmUgQXBhY2hlIGNhbiBi ZSBpbnN0YWxsZWQgaW4KKyAgICAgICAgYSBwbGV0aG9yYSBvZiB3YXlzIGFuZCB0aGUgTG9hZE1v ZHVsZSBjYWxscyBjYW4gZmFpbCB0byBzcGVjaWZ5CisgICAgICAgIHRoZSBwcm9wZXIgbW9kdWxl IHBhdGhzLgorCisgICAgICAgIEZvciBub3csIHdlIHN0YXJ0IGFjY2VwdGluZyB0aGUgV0VCS0lU X0hUVFBfU0VSVkVSX0NPTkZfUEFUSAorICAgICAgICBlbnZpcm9ubWVudCB2YXJpYWJsZSwgd2hp Y2ggYWxsb3dzIHRoZSB1c2VyIHRvIHNwZWNpZnkgdGhlCisgICAgICAgIGFic29sdXRlIHBhdGgg dG8gYW5vdGhlciBodHRwIHNlcnZlciBjb25maWd1cmF0aW9uIGZpbGUgdGhhdCBtaWdodAorICAg ICAgICB3b3JrIG9uIHRoZSB1c2VyJ3Mgc3lzdGVtLgorCisgICAgICAgIEluIHRoZSBsb25nIHRl cm0sIHdlIHNob3VsZCB0cnkgdG8gZ2VuZXJhdGUgb3VyIGNvbmZpZ3VyYXRpb24gZmlsZQorICAg ICAgICBhbmQgc3RvcCByZXF1aXJpbmcgYWxsIHRoZSBkaWZmZXJlbnQgaHR0cGQuY29uZiBmaWxl cyB3ZSBoYXZlIGFzCisgICAgICAgIHdlbGwgYXMgdGhpcyBoYWNrLgorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5f cGF0aF90b19hcGFjaGVfY29uZmlnX2ZpbGUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvcG9ydF90ZXN0Y2FzZS5weToKKyAgICAgICAgKHRlc3RfcGF0aF90 b19hcGFjaGVfY29uZmlnX2ZpbGUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3NlcnZlcnMvaHR0cF9zZXJ2ZXIucHk6CisgICAgICAgIChMaWdodHRwZC5fcGF0aF90 b19jb25maWdfZmlsZSk6CisgICAgICAgIChMaWdodHRwZCk6CisgICAgICAgIChMaWdodHRwZC5f cHJlcGFyZV9jb25maWcpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3NlcnZlcnMvaHR0cF9zZXJ2ZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0SHR0cFNlcnZl ci50ZXN0X3N0YXJ0X2NtZCk6CisKIDIwMTItMTAtMDEgIE1pbmcgWGllICA8bXhpZUByaW0uY29t PgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBBZGQgYSBlYXJseSByZXR1cm4gaW4gYnVpbGRDTWFr ZVByb2plY3RPckV4aXQoKQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9iYXNlLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQkocmV2aXNpb24gMTMwMDY4KQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0x MTY1LDkgKzExNjUsMTggQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICByZXR1cm4gImFw YWNoZTItaHR0cGQuY29uZiIKIAogICAgIGRlZiBfcGF0aF90b19hcGFjaGVfY29uZmlnX2ZpbGUo c2VsZik6Ci0gICAgICAgICIiIlJldHVybnMgdGhlIGZ1bGwgcGF0aCB0byB0aGUgYXBhY2hlIGJp bmFyeS4KKyAgICAgICAgIiIiUmV0dXJucyB0aGUgZnVsbCBwYXRoIHRvIHRoZSBhcGFjaGUgY29u ZmlndXJhdGlvbiBmaWxlLgorCisgICAgICAgIElmIHRoZSBXRUJLSVRfSFRUUF9TRVJWRVJfQ09O Rl9QQVRIIGVudmlyb25tZW50IHZhcmlhYmxlIGlzIHNldCwgaXRzCisgICAgICAgIGNvbnRlbnRz IHdpbGwgYmUgdXNlZCBpbnN0ZWFkLgogCiAgICAgICAgIFRoaXMgaXMgbmVlZGVkIG9ubHkgYnkg cG9ydHMgdGhhdCB1c2UgdGhlIGFwYWNoZV9odHRwX3NlcnZlciBtb2R1bGUuIiIiCisgICAgICAg IGNvbmZpZ19maWxlX2Zyb21fZW52ID0gb3MuZW52aXJvbi5nZXQoJ1dFQktJVF9IVFRQX1NFUlZF Ul9DT05GX1BBVEgnKQorICAgICAgICBpZiBjb25maWdfZmlsZV9mcm9tX2VudjoKKyAgICAgICAg ICAgIGlmIG5vdCBzZWxmLl9maWxlc3lzdGVtLmV4aXN0cyhjb25maWdfZmlsZV9mcm9tX2Vudik6 CisgICAgICAgICAgICAgICAgcmFpc2UgSU9FcnJvcignJXMgd2FzIG5vdCBmb3VuZCBvbiB0aGUg c3lzdGVtJyAlIGNvbmZpZ19maWxlX2Zyb21fZW52KQorICAgICAgICAgICAgcmV0dXJuIGNvbmZp Z19maWxlX2Zyb21fZW52CisKICAgICAgICAgY29uZmlnX2ZpbGVfbmFtZSA9IHNlbGYuX2FwYWNo ZV9jb25maWdfZmlsZV9uYW1lX2Zvcl9wbGF0Zm9ybShzeXMucGxhdGZvcm0pCiAgICAgICAgIHJl dHVybiBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5sYXlvdXRfdGVzdHNfZGlyKCksICdodHRw JywgJ2NvbmYnLCBjb25maWdfZmlsZV9uYW1lKQogCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3BvcnRfdGVzdGNhc2UucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5CShy ZXZpc2lvbiAxMzAwNjgpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3BvcnRfdGVzdGNhc2UucHkJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAKIAog aW1wb3J0IGVycm5vCiBpbXBvcnQgbG9nZ2luZworaW1wb3J0IG9zCiBpbXBvcnQgc29ja2V0CiBp bXBvcnQgc3lzCiBpbXBvcnQgdGltZQpAQCAtNTgyLDEwICs1ODMsMjUgQEAgY2xhc3MgUG9ydFRl c3RDYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiB0ZXN0X3BhdGhfdG9fYXBhY2hl X2NvbmZpZ19maWxlKHNlbGYpOgogICAgICAgICBwb3J0ID0gVGVzdFdlYktpdFBvcnQoKQorCisg ICAgICAgIHNhdmVkX2Vudmlyb24gPSBvcy5lbnZpcm9uLmNvcHkoKQorICAgICAgICBvcy5lbnZp cm9uWydXRUJLSVRfSFRUUF9TRVJWRVJfQ09ORl9QQVRIJ10gPSAnL3BhdGgvdG8vaHR0cGQuY29u ZicKKyAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoSU9FcnJvciwgcG9ydC5fcGF0aF90b19hcGFj aGVfY29uZmlnX2ZpbGUpCisgICAgICAgIHBvcnQuX2ZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxl KCcvZXhpc3RpbmcvaHR0cGQuY29uZicsICdIZWxsbywgd29ybGQhJykKKyAgICAgICAgb3MuZW52 aXJvblsnV0VCS0lUX0hUVFBfU0VSVkVSX0NPTkZfUEFUSCddID0gJy9leGlzdGluZy9odHRwZC5j b25mJworICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0Ll9wYXRoX3RvX2FwYWNoZV9jb25m aWdfZmlsZSgpLCAnL2V4aXN0aW5nL2h0dHBkLmNvbmYnKQorICAgICAgICBvcy5lbnZpcm9uID0g c2F2ZWRfZW52aXJvbi5jb3B5KCkKKwogICAgICAgICAjIE1vY2sgb3V0IF9hcGFjaGVfY29uZmln X2ZpbGVfbmFtZV9mb3JfcGxhdGZvcm0gdG8gaWdub3JlIHRoZSBwYXNzZWQgc3lzLnBsYXRmb3Jt IHZhbHVlLgogICAgICAgICBwb3J0Ll9hcGFjaGVfY29uZmlnX2ZpbGVfbmFtZV9mb3JfcGxhdGZv cm0gPSBsYW1iZGEgcGxhdGZvcm06ICdodHRwZC5jb25mJwogICAgICAgICBzZWxmLmFzc2VydEVx dWFscyhwb3J0Ll9wYXRoX3RvX2FwYWNoZV9jb25maWdfZmlsZSgpLCAnL21vY2stY2hlY2tvdXQv TGF5b3V0VGVzdHMvaHR0cC9jb25mL2h0dHBkLmNvbmYnKQogCisgICAgICAgICMgQ2hlY2sgdGhh dCBldmVuIGlmIHdlIG1vY2sgb3V0IF9hcGFjaGVfY29uZmlnX2ZpbGVfbmFtZSwgdGhlIGVudmly b25tZW50IHZhcmlhYmxlIHRha2VzIHByZWNlZGVuY2UuCisgICAgICAgIHNhdmVkX2Vudmlyb24g PSBvcy5lbnZpcm9uLmNvcHkoKQorICAgICAgICBvcy5lbnZpcm9uWydXRUJLSVRfSFRUUF9TRVJW RVJfQ09ORl9QQVRIJ10gPSAnL2V4aXN0aW5nL2h0dHBkLmNvbmYnCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKHBvcnQuX3BhdGhfdG9fYXBhY2hlX2NvbmZpZ19maWxlKCksICcvZXhpc3Rpbmcv aHR0cGQuY29uZicpCisgICAgICAgIG9zLmVudmlyb24gPSBzYXZlZF9lbnZpcm9uLmNvcHkoKQor CiAgICAgZGVmIHRlc3RfY2hlY2tfYnVpbGQoc2VsZik6CiAgICAgICAgIHBvcnQgPSBzZWxmLm1h a2VfcG9ydChvcHRpb25zPU1vY2tPcHRpb25zKGJ1aWxkPVRydWUpKQogICAgICAgICBzZWxmLmJ1 aWxkX2NhbGxlZCA9IEZhbHNlCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9zZXJ2ZXJzL2h0dHBfc2VydmVyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0cF9zZXJ2ZXIucHkJKHJldmlzaW9uIDEz MDA2OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvaHR0 cF9zZXJ2ZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTg1LDkgKzg1LDIyIEBAIGNsYXNzIExpZ2h0 dHBkKGh0dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnYKICAgICAgICAgICAgICAgICB7J3BvcnQnOiA4 NDQzLCAnZG9jcm9vdCc6IHNlbGYuX3dlYmtpdF90ZXN0cywKICAgICAgICAgICAgICAgICAgJ3Nz bGNlcnQnOiBzZWxmLl9wZW1fZmlsZX1dKQogCi0gICAgZGVmIF9wcmVwYXJlX2NvbmZpZyhzZWxm KToKLSAgICAgICAgYmFzZV9jb25mX2ZpbGUgPSBzZWxmLl9wb3J0X29iai5wYXRoX2Zyb21fd2Vi a2l0X2Jhc2UoJ1Rvb2xzJywKKyAgICBkZWYgX3BhdGhfdG9fY29uZmlnX2ZpbGUoc2VsZik6Cisg ICAgICAgICIiIlJldHVybnMgdGhlIGZ1bGwgcGF0aCB0byB0aGUgbGlnaHR0cGQgY29uZmlndXJh dGlvbiBmaWxlLgorCisgICAgICAgIElmIHRoZSBXRUJLSVRfSFRUUF9TRVJWRVJfQ09ORl9QQVRI IGVudmlyb25tZW50IHZhcmlhYmxlIGlzIHNldCwgaXRzCisgICAgICAgIGNvbnRlbnRzIHdpbGwg YmUgdXNlZCBpbnN0ZWFkLiIiIgorICAgICAgICBjb25maWdfZmlsZV9mcm9tX2VudiA9IG9zLmVu dmlyb24uZ2V0KCdXRUJLSVRfSFRUUF9TRVJWRVJfQ09ORl9QQVRIJykKKyAgICAgICAgaWYgY29u ZmlnX2ZpbGVfZnJvbV9lbnY6CisgICAgICAgICAgICBpZiBub3Qgc2VsZi5fZmlsZXN5c3RlbS5l eGlzdHMoY29uZmlnX2ZpbGVfZnJvbV9lbnYpOgorICAgICAgICAgICAgICAgIHJhaXNlIElPRXJy b3IoJyVzIHdhcyBub3QgZm91bmQgb24gdGhlIHN5c3RlbScgJSBjb25maWdfZmlsZV9mcm9tX2Vu dikKKyAgICAgICAgICAgIHJldHVybiBjb25maWdfZmlsZV9mcm9tX2VudgorCisgICAgICAgIHJl dHVybiBzZWxmLl9wb3J0X29iai5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoJ1Rvb2xzJywKICAgICAg ICAgICAgICdTY3JpcHRzJywgJ3dlYmtpdHB5JywgJ2xheW91dF90ZXN0cycsICdzZXJ2ZXJzJywg J2xpZ2h0dHBkLmNvbmYnKQorCisgICAgZGVmIF9wcmVwYXJlX2NvbmZpZyhzZWxmKToKKyAgICAg ICAgYmFzZV9jb25mX2ZpbGUgPSBzZWxmLl9wYXRoX3RvX2NvbmZpZ19maWxlKCkKICAgICAgICAg b3V0X2NvbmZfZmlsZSA9IG9zLnBhdGguam9pbihzZWxmLl9vdXRwdXRfZGlyLCAnbGlnaHR0cGQu Y29uZicpCiAgICAgICAgIHRpbWVfc3RyID0gdGltZS5zdHJmdGltZSgiJWQlYiVZLSVIJU0lUyIp CiAgICAgICAgIGFjY2Vzc19maWxlX25hbWUgPSAiYWNjZXNzLmxvZy0iICsgdGltZV9zdHIgKyAi LnR4dCIKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMv aHR0cF9zZXJ2ZXJfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9odHRwX3NlcnZlcl91bml0dGVzdC5weQkocmV2aXNp b24gMTMwMDY4KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVy cy9odHRwX3NlcnZlcl91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjYsOSArMjYsMTAg QEAKICMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBP RiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKLWltcG9ydCB1bml0dGVzdAoraW1w b3J0IG9zCiBpbXBvcnQgcmUKIGltcG9ydCBzeXMKK2ltcG9ydCB1bml0dGVzdAogCiBmcm9tIHdl YmtpdHB5LmNvbW1vbi5ob3N0X21vY2sgaW1wb3J0IE1vY2tIb3N0CiBmcm9tIHdlYmtpdHB5Lmxh eW91dF90ZXN0cy5wb3J0IGltcG9ydCB0ZXN0CkBAIC01Myw2ICs1NCwxNiBAQCBjbGFzcyBUZXN0 SHR0cFNlcnZlcih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICAgICAgICAgICAg IGFkZGl0aW9uYWxfZGlycz17CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL21vY2sv b25lLWFkZGl0aW9uYWwtZGlyIjogIi9tb2NrLWNoZWNrb3V0L29uZS1hZGRpdGlvbmFsLWRpciIs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL21vY2svYW5vdGhlci1hZGRpdGlvbmFs LWRpciI6ICIvbW9jay1jaGVja291dC9vbmUtYWRkaXRpb25hbC1kaXIifSkKKworICAgICAgICBz YXZlZF9lbnZpcm9uID0gb3MuZW52aXJvbi5jb3B5KCkKKyAgICAgICAgb3MuZW52aXJvblsiV0VC S0lUX0hUVFBfU0VSVkVSX0NPTkZfUEFUSCJdID0gIi9kb2VzL25vdC9leGlzdC9odHRwZC5jb25m IgorICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhJT0Vycm9yLCBzZXJ2ZXIuX3BhdGhfdG9fY29u ZmlnX2ZpbGUpCisgICAgICAgIGhvc3QuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoIi90aGlz L29uZS9leGlzdHMvaHR0cGQuY29uZiIsICJNb2NrIENvbmZpZ1xuIikKKyAgICAgICAgb3MuZW52 aXJvblsiV0VCS0lUX0hUVFBfU0VSVkVSX0NPTkZfUEFUSCJdID0gIi90aGlzL29uZS9leGlzdHMv aHR0cGQuY29uZiIKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZXJ2ZXIuX3BhdGhfdG9fY29u ZmlnX2ZpbGUoKSwgIi90aGlzL29uZS9leGlzdHMvaHR0cGQuY29uZiIpCisgICAgICAgIG9zLmVu dmlyb24gPSBzYXZlZF9lbnZpcm9uLmNvcHkoKQorCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo c2VydmVyLl9wYXRoX3RvX2NvbmZpZ19maWxlKCksICIvbW9jay1jaGVja291dC9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2xpZ2h0dHBkLmNvbmYiKQogICAgICAg ICBzZWxmLmFzc2VydFJhaXNlcyhTZXJ2ZXJFcnJvciwgc2VydmVyLnN0YXJ0KQogCiAgICAgICAg IGNvbmZpZ19maWxlID0gaG9zdC5maWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKCIvbW9jay9vdXRw dXRfZGlyL2xpZ2h0dHBkLmNvbmYiKQo= 166556 2012-10-01 15:20:37 -0700 2012-10-01 15:43:20 -0700 Patch for landing bug-98071-20121002011948.patch text/plain 4609 rakuco SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEzMDA4MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMwIEBACisyMDEyLTEwLTAxICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxyYXBoYWVsLmt1 Ym8uZGEuY29zdGFAaW50ZWwuY29tPgorCisgICAgICAgIHdlYmtpdHB5IHNob3VsZCBhY2NlcHQg YSBkaWZmZXJlbnQgaHR0cGQuY29uZiBzcGVjaWZpZWQgYnkgdGhlIHVzZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk4MDcxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgRGlyayBQcmFua2UuCisKKyAgICAgICAgVGhlIGV4aXN0aW5nIGh0dHBkLmNvbmYg dmFyaWFudHMgKG9yIGxpZ2h0dHBkLmNvbmYsIGZvciB0aGF0CisgICAgICAgIG1hdHRlcikgd2Ug aGF2ZSBkbyBub3QgYWx3YXlzIHN1aXQgdGhlIHVzZXIncyBzeXN0ZW0uIFRoaXMgaXMKKyAgICAg ICAgcGFydGljdWxhcmx5IHRydWUgb24gTGludXgvVW5peCwgd2hlcmUgQXBhY2hlIGNhbiBiZSBp bnN0YWxsZWQgaW4KKyAgICAgICAgYSBwbGV0aG9yYSBvZiB3YXlzIGFuZCB0aGUgTG9hZE1vZHVs ZSBjYWxscyBjYW4gZmFpbCB0byBzcGVjaWZ5CisgICAgICAgIHRoZSBwcm9wZXIgbW9kdWxlIHBh dGhzLgorCisgICAgICAgIEZvciBub3csIHdlIHN0YXJ0IGFjY2VwdGluZyB0aGUgV0VCS0lUX0hU VFBfU0VSVkVSX0NPTkZfUEFUSAorICAgICAgICBlbnZpcm9ubWVudCB2YXJpYWJsZSwgd2hpY2gg YWxsb3dzIHRoZSB1c2VyIHRvIHNwZWNpZnkgdGhlCisgICAgICAgIGFic29sdXRlIHBhdGggdG8g YW5vdGhlciBodHRwIHNlcnZlciBjb25maWd1cmF0aW9uIGZpbGUgdGhhdCBtaWdodAorICAgICAg ICB3b3JrIG9uIHRoZSB1c2VyJ3Mgc3lzdGVtLgorCisgICAgICAgIEluIHRoZSBsb25nIHRlcm0s IHdlIHNob3VsZCB0cnkgdG8gZ2VuZXJhdGUgb3VyIGNvbmZpZ3VyYXRpb24gZmlsZQorICAgICAg ICBhbmQgc3RvcCByZXF1aXJpbmcgYWxsIHRoZSBkaWZmZXJlbnQgaHR0cGQuY29uZiBmaWxlcyB3 ZSBoYXZlIGFzCisgICAgICAgIHdlbGwgYXMgdGhpcyBoYWNrLgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5OgorICAgICAgICAoUG9ydC5fcGF0 aF90b19hcGFjaGVfY29uZmlnX2ZpbGUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvcG9ydF90ZXN0Y2FzZS5weToKKyAgICAgICAgKHRlc3RfcGF0aF90b19h cGFjaGVfY29uZmlnX2ZpbGUpOgorCiAyMDEyLTEwLTAxICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCB1cGdyYWRlIGVhZSB0byByZXZpZXdl ci4gCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2Uu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9iYXNlLnB5CShyZXZpc2lvbiAxMzAwODEpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Jhc2UucHkJKHdvcmtpbmcgY29weSkKQEAgLTExNjUsOSArMTE2NSwx OCBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIHJldHVybiAiYXBhY2hlMi1odHRwZC5j b25mIgogCiAgICAgZGVmIF9wYXRoX3RvX2FwYWNoZV9jb25maWdfZmlsZShzZWxmKToKLSAgICAg ICAgIiIiUmV0dXJucyB0aGUgZnVsbCBwYXRoIHRvIHRoZSBhcGFjaGUgYmluYXJ5LgorICAgICAg ICAiIiJSZXR1cm5zIHRoZSBmdWxsIHBhdGggdG8gdGhlIGFwYWNoZSBjb25maWd1cmF0aW9uIGZp bGUuCisKKyAgICAgICAgSWYgdGhlIFdFQktJVF9IVFRQX1NFUlZFUl9DT05GX1BBVEggZW52aXJv bm1lbnQgdmFyaWFibGUgaXMgc2V0LCBpdHMKKyAgICAgICAgY29udGVudHMgd2lsbCBiZSB1c2Vk IGluc3RlYWQuCiAKICAgICAgICAgVGhpcyBpcyBuZWVkZWQgb25seSBieSBwb3J0cyB0aGF0IHVz ZSB0aGUgYXBhY2hlX2h0dHBfc2VydmVyIG1vZHVsZS4iIiIKKyAgICAgICAgY29uZmlnX2ZpbGVf ZnJvbV9lbnYgPSBvcy5lbnZpcm9uLmdldCgnV0VCS0lUX0hUVFBfU0VSVkVSX0NPTkZfUEFUSCcp CisgICAgICAgIGlmIGNvbmZpZ19maWxlX2Zyb21fZW52OgorICAgICAgICAgICAgaWYgbm90IHNl bGYuX2ZpbGVzeXN0ZW0uZXhpc3RzKGNvbmZpZ19maWxlX2Zyb21fZW52KToKKyAgICAgICAgICAg ICAgICByYWlzZSBJT0Vycm9yKCclcyB3YXMgbm90IGZvdW5kIG9uIHRoZSBzeXN0ZW0nICUgY29u ZmlnX2ZpbGVfZnJvbV9lbnYpCisgICAgICAgICAgICByZXR1cm4gY29uZmlnX2ZpbGVfZnJvbV9l bnYKKwogICAgICAgICBjb25maWdfZmlsZV9uYW1lID0gc2VsZi5fYXBhY2hlX2NvbmZpZ19maWxl X25hbWVfZm9yX3BsYXRmb3JtKHN5cy5wbGF0Zm9ybSkKICAgICAgICAgcmV0dXJuIHNlbGYuX2Zp bGVzeXN0ZW0uam9pbihzZWxmLmxheW91dF90ZXN0c19kaXIoKSwgJ2h0dHAnLCAnY29uZicsIGNv bmZpZ19maWxlX25hbWUpCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvcG9ydF90ZXN0Y2FzZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3BvcnRfdGVzdGNhc2UucHkJKHJldmlzaW9uIDEzMDA4 MSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcG9ydF90ZXN0 Y2FzZS5weQkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsNyBAQAogCiBpbXBvcnQgZXJybm8K IGltcG9ydCBsb2dnaW5nCitpbXBvcnQgb3MKIGltcG9ydCBzb2NrZXQKIGltcG9ydCBzeXMKIGlt cG9ydCB0aW1lCkBAIC01ODIsMTAgKzU4MywyOSBAQCBjbGFzcyBQb3J0VGVzdENhc2UodW5pdHRl c3QuVGVzdENhc2UpOgogCiAgICAgZGVmIHRlc3RfcGF0aF90b19hcGFjaGVfY29uZmlnX2ZpbGUo c2VsZik6CiAgICAgICAgIHBvcnQgPSBUZXN0V2ViS2l0UG9ydCgpCisKKyAgICAgICAgc2F2ZWRf ZW52aXJvbiA9IG9zLmVudmlyb24uY29weSgpCisgICAgICAgIHRyeToKKyAgICAgICAgICAgIG9z LmVudmlyb25bJ1dFQktJVF9IVFRQX1NFUlZFUl9DT05GX1BBVEgnXSA9ICcvcGF0aC90by9odHRw ZC5jb25mJworICAgICAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoSU9FcnJvciwgcG9ydC5fcGF0 aF90b19hcGFjaGVfY29uZmlnX2ZpbGUpCisgICAgICAgICAgICBwb3J0Ll9maWxlc3lzdGVtLndy aXRlX3RleHRfZmlsZSgnL2V4aXN0aW5nL2h0dHBkLmNvbmYnLCAnSGVsbG8sIHdvcmxkIScpCisg ICAgICAgICAgICBvcy5lbnZpcm9uWydXRUJLSVRfSFRUUF9TRVJWRVJfQ09ORl9QQVRIJ10gPSAn L2V4aXN0aW5nL2h0dHBkLmNvbmYnCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0 Ll9wYXRoX3RvX2FwYWNoZV9jb25maWdfZmlsZSgpLCAnL2V4aXN0aW5nL2h0dHBkLmNvbmYnKQor ICAgICAgICBmaW5hbGx5OgorICAgICAgICAgICAgb3MuZW52aXJvbiA9IHNhdmVkX2Vudmlyb24u Y29weSgpCisKICAgICAgICAgIyBNb2NrIG91dCBfYXBhY2hlX2NvbmZpZ19maWxlX25hbWVfZm9y X3BsYXRmb3JtIHRvIGlnbm9yZSB0aGUgcGFzc2VkIHN5cy5wbGF0Zm9ybSB2YWx1ZS4KICAgICAg ICAgcG9ydC5fYXBhY2hlX2NvbmZpZ19maWxlX25hbWVfZm9yX3BsYXRmb3JtID0gbGFtYmRhIHBs YXRmb3JtOiAnaHR0cGQuY29uZicKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocG9ydC5fcGF0 aF90b19hcGFjaGVfY29uZmlnX2ZpbGUoKSwgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL2h0 dHAvY29uZi9odHRwZC5jb25mJykKIAorICAgICAgICAjIENoZWNrIHRoYXQgZXZlbiBpZiB3ZSBt b2NrIG91dCBfYXBhY2hlX2NvbmZpZ19maWxlX25hbWUsIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJs ZSB0YWtlcyBwcmVjZWRlbmNlLgorICAgICAgICBzYXZlZF9lbnZpcm9uID0gb3MuZW52aXJvbi5j b3B5KCkKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgb3MuZW52aXJvblsnV0VCS0lUX0hUVFBf U0VSVkVSX0NPTkZfUEFUSCddID0gJy9leGlzdGluZy9odHRwZC5jb25mJworICAgICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbHMocG9ydC5fcGF0aF90b19hcGFjaGVfY29uZmlnX2ZpbGUoKSwgJy9l eGlzdGluZy9odHRwZC5jb25mJykKKyAgICAgICAgZmluYWxseToKKyAgICAgICAgICAgIG9zLmVu dmlyb24gPSBzYXZlZF9lbnZpcm9uLmNvcHkoKQorCiAgICAgZGVmIHRlc3RfY2hlY2tfYnVpbGQo c2VsZik6CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChvcHRpb25zPU1vY2tPcHRpb25z KGJ1aWxkPVRydWUpKQogICAgICAgICBzZWxmLmJ1aWxkX2NhbGxlZCA9IEZhbHNlCg==