Merge branch 'master' into change-stream-priority

.travis.yml

@@ -27,12 +27,26 @@ before_install:
   - $CC --version
   - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
   - $CC --version
+  - go version
 before_script:
+  # First build spdylay, since integration tests require it.
+  # spdylay is going to be built under third-party/spdylay
+  - cd third-party
+  - git clone https://github.com/tatsuhiro-t/spdylay.git
+  - cd spdylay
+  - autoreconf -i
+  - ./configure --disable-src --disable-examples
+  - make check
+  - export SPDYLAY_HOME=$PWD
+  - cd ../..
+  # Now build nghttp2
   - autoreconf -i
-  - automake
-  - autoconf
   - git submodule update --init
-  - ./configure --enable-werror --with-mruby
+  - ./configure --enable-werror --with-mruby --with-neverbleed LIBSPDYLAY_CFLAGS="-I$SPDYLAY_HOME/lib/includes" LIBSPDYLAY_LIBS="-L$SPDYLAY_HOME/lib/.libs -lspdylay"
 script:
   - make
   - make check
+  - cd integration-tests
+  - export GOPATH="$PWD/integration-tests/golang"
+  - make itprep-local
+  - make it-local

src/h2load.cc

@@ -742,11 +742,20 @@ int Client::connection_made() {
         break;
       }
       duration = config.timings[reqidx];
+      if (reqidx == 0) {
+        // if reqidx wraps around back to 0, we uses up all lines and
+        // should break
+        break;
+      }
     }
 
+    if (duration >= 1e-9) {
+      // double check since we may have break due to reqidx wraps
+      // around back to 0
       request_timeout_watcher.repeat = duration;
       ev_timer_again(worker->loop, &request_timeout_watcher);
     }
+  }
   signal_write();
 
   return 0;

src/shrpx_http2_downstream_connection.cc

@@ -67,14 +67,8 @@ Http2DownstreamConnection::~Http2DownstreamConnection() {
       error_code = NGHTTP2_INTERNAL_ERROR;
     }
 
-    if (downstream_->get_downstream_stream_id() != -1) {
+    if (http2session_->get_state() == Http2Session::CONNECTED &&
-      if (LOG_ENABLED(INFO)) {
+        downstream_->get_downstream_stream_id() != -1) {
-        DCLOG(INFO, this) << "Submit RST_STREAM for DOWNSTREAM:" << downstream_
-                          << ", stream_id="
-                          << downstream_->get_downstream_stream_id()
-                          << ", error_code=" << error_code;
-      }
-
       submit_rst_stream(downstream_, error_code);
 
       http2session_->consume(downstream_->get_downstream_stream_id(),
@@ -143,7 +137,8 @@ int Http2DownstreamConnection::submit_rst_stream(Downstream *downstream,
       if (LOG_ENABLED(INFO)) {
         DCLOG(INFO, this) << "Submit RST_STREAM for DOWNSTREAM:" << downstream
                           << ", stream_id="
-                          << downstream->get_downstream_stream_id();
+                          << downstream->get_downstream_stream_id()
+                          << ", error_code=" << error_code;
       }
       rv = http2session_->submit_rst_stream(
           downstream->get_downstream_stream_id(), error_code);