<!DOCTYPE html>
<html>
  <head>
  </head>
  <body>
    <dl style="line-height: 1.5; margin-left: 2em">
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
      <dd style="margin-left: 8.5em">YUKI Hiroshi &lt;shimo****@clear*****&gt;</dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
      <dd style="margin-left: 8.5em">2015-04-20 16:14:03 +0900 (Mon, 20 Apr 2015)</dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
      <dd style="margin-left: 8.5em"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc">4c0673dd1acb85c25f390ce6fd3c786fc029bdcc</a></dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
      <dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">Use timeout parameter only when it is given</pre></dd>
      <dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
      <dd style="margin-left: 8.5em">
        <ul>
          <li><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#diff-0">lib/adapter/api/droonga.js</a></li>
        </ul>
      </dd>
    </dl>

    <div class="diff-section" style="clear: both">
      <table style="border-collapse: collapse; border: 1px solid #aaa">
        <thead>
          <tr class="diff-header" style="border: 1px solid #aaa">
            <td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">  Modified: lib/adapter/api/droonga.js (+6 -2)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
            </td>
          </tr>
        </thead>
        <tbody>
          <tr>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L13">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L14">14</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L15">15</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L16">16</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L17">17</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L18">18</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L19">19</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L20">20</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L29">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L30">30</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L31">31</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L32">32</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L33">33</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L34">34</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L35">35</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0L36">36</a></span>
</pre>
            </th>
            <th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R13">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R14">14</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R15">15</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R16">16</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R17">17</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R18">18</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R19">19</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R20">20</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R21">21</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R22">22</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R31">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R32">32</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R33">33</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R34">34</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre">&nbsp;</span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R35">35</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R36">36</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R37">37</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R38">38</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R39">39</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/4c0673dd1acb85c25f390ce6fd3c786fc029bdcc#L0R40">40</a></span>
</pre>
            </th>
            <td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, &quot;Liberation Mono&quot;, Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -14,7 +14,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">module.exports = {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre">     onRequest: function(request, connection) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre">       var messageType = pathToMessageType(request.params[0]);</span>
<span class="diff-not-changed" style="display: block; white-space: pre">       var body = {};</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-      body.timeout = body.timeout || request.query.timeout;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+      if (typeof body.timeout != 'number' &amp;&amp;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+          typeof request.query.timeout == 'number')</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+        body.timeout = request.query.timeout;</span>
<span class="diff-not-changed" style="display: block; white-space: pre">       connection.emit(messageType, body);</span>
<span class="diff-not-changed" style="display: block; white-space: pre">     }</span>
<span class="diff-not-changed" style="display: block; white-space: pre">   }),</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -30,7 +32,9 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">module.exports = {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre">       });</span>
<span class="diff-not-changed" style="display: block; white-space: pre">       request.on('end', function() {</span>
<span class="diff-not-changed" style="display: block; white-space: pre">         body = JSON.parse(body);</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-        body.timeout = body.timeout || request.query.timeout;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+        if (typeof body.timeout != 'number' &amp;&amp;</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+            typeof request.query.timeout == 'number')</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+          body.timeout = request.query.timeout;</span>
<span class="diff-not-changed" style="display: block; white-space: pre">         body.type = body.type || 'droonga-' + messageType;</span>
<span class="diff-not-changed" style="display: block; white-space: pre">         connection.emit(messageType, body);</span>
<span class="diff-not-changed" style="display: block; white-space: pre">       });</span>
</pre>
            </td>
          </tr>
        </tbody>
      </table>
    </div>
  </body>
</html>