<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179550] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179550">179550</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-02-03 09:39:01 -0800 (Tue, 03 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Attempt to improve the reliability of HTTP service
https://bugs.webkit.org/show_bug.cgi?id=141191
Reviewed by Darin Adler.
* Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
(LayoutTestApacheHttpd.__init__): Use default XAMPP pidfile location.
(LayoutTestApacheHttpd._stop_running_server): Delete the abandoned PID file
when stopping the service doesn't do so on its own (for Windows runs).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsserversapache_http_serverpy">trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179549 => 179550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-03 17:27:55 UTC (rev 179549)
+++ trunk/Tools/ChangeLog 2015-02-03 17:39:01 UTC (rev 179550)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-02-03 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Attempt to improve the reliability of HTTP service
+ https://bugs.webkit.org/show_bug.cgi?id=141191
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
+ (LayoutTestApacheHttpd.__init__): Use default XAMPP pidfile location.
+ (LayoutTestApacheHttpd._stop_running_server): Delete the abandoned PID file
+ when stopping the service doesn't do so on its own (for Windows runs).
+
</ins><span class="cx"> 2015-02-03 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Web platform test server should not need to create __init__.py files
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsserversapache_http_serverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py (179549 => 179550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py 2015-02-03 17:27:55 UTC (rev 179549)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py 2015-02-03 17:39:01 UTC (rev 179550)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> output_dir = precompiledDrive.sub("C:", output_dir)
</span><span class="cx"> test_dir = precompiledBuildbot.sub("C:/cygwin/home/buildbot", test_dir)
</span><span class="cx"> test_dir = precompiledDrive.sub("C:", test_dir)
</span><del>- self._pid_file = self._pid_file.replace("/tmp", "C:/cygwin/tmp")
</del><ins>+ self._pid_file = self._filesystem.join("C:/xampp/apache/logs", '%s.pid' % self._name)
</ins><span class="cx">
</span><span class="cx"> js_test_resources_dir = self._filesystem.join(test_dir, "resources")
</span><span class="cx"> media_resources_dir = self._filesystem.join(test_dir, "media")
</span><span class="lines">@@ -198,6 +198,10 @@
</span><span class="cx"> # the stop command returns, so we wait a little while longer for the
</span><span class="cx"> # pid file to be removed.
</span><span class="cx"> if not self._wait_for_action(lambda: not self._filesystem.exists(self._pid_file)):
</span><ins>+ if self._port_obj.host.platform.is_win():
+ self._remove_pid_file()
+ return
+
</ins><span class="cx"> raise http_server_base.ServerError('Failed to stop %s: pid file still exists' % self._name)
</span><span class="cx">
</span><span class="cx"> def _run(self, cmd):
</span></span></pre>
</div>
</div>
</body>
</html>