From a0da281f7095a5416a0e6b28c0e2ebbab0040746 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 25 Jan 2017 13:12:09 +0100
Subject: [PATCH] update to the latest upstream release (1.19.0)

---
 0001-nghttp2-1.13.0-armv7hl-sigsegv.patch | 40 ++++++++++++-----------
 nghttp2.spec                              |  5 ++-
 sources                                   |  2 +-
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/0001-nghttp2-1.13.0-armv7hl-sigsegv.patch b/0001-nghttp2-1.13.0-armv7hl-sigsegv.patch
index aa8f4d4..23f52d6 100644
--- a/0001-nghttp2-1.13.0-armv7hl-sigsegv.patch
+++ b/0001-nghttp2-1.13.0-armv7hl-sigsegv.patch
@@ -15,7 +15,7 @@ diff --git a/src/shrpx_client_handler.cc b/src/shrpx_client_handler.cc
 index 2c9b2a1..890143e 100644
 --- a/src/shrpx_client_handler.cc
 +++ b/src/shrpx_client_handler.cc
-@@ -642,18 +642,18 @@ int ClientHandler::validate_next_proto() {
+@@ -653,12 +653,12 @@ int ClientHandler::validate_next_proto() {
    return -1;
  }
  
@@ -25,11 +25,13 @@ index 2c9b2a1..890143e 100644
 +int ClientHandler::do_write() { return (this->*write_)(); }
  
  int ClientHandler::on_read() {
--  auto rv = on_read_(*this);
-+  auto rv = (this->*on_read_)();
-   if (rv != 0) {
-     return rv;
-   }
+   if (rb_.chunk_avail()) {
+-    auto rv = on_read_(*this);
++    auto rv = (this->*on_read_)();
+     if (rv != 0) {
+       return rv;
+     }
+@@ -666,7 +666,7 @@ int ClientHandler::on_read() {
    conn_.handle_tls_pending_read();
    return 0;
  }
@@ -42,7 +44,7 @@ diff --git a/src/shrpx_client_handler.h b/src/shrpx_client_handler.h
 index bdfdafd..08f42b3 100644
 --- a/src/shrpx_client_handler.h
 +++ b/src/shrpx_client_handler.h
-@@ -185,8 +185,10 @@ private:
+@@ -182,8 +182,10 @@ private:
    StringRef forwarded_for_;
    // lowercased TLS SNI which client sent.
    StringRef sni_;
@@ -59,20 +61,20 @@ diff --git a/src/shrpx_http_downstream_connection.cc b/src/shrpx_http_downstream
 index 077844c..8a38788 100644
 --- a/src/shrpx_http_downstream_connection.cc
 +++ b/src/shrpx_http_downstream_connection.cc
-@@ -1426,13 +1426,13 @@ int HttpDownstreamConnection::connected() {
+@@ -1435,13 +1435,13 @@ int HttpDownstreamConnection::connected() {
    return 0;
  }
  
--int HttpDownstreamConnection::on_read() { return do_read_(*this); }
-+int HttpDownstreamConnection::on_read() { return (this->*do_read_)(); }
+-int HttpDownstreamConnection::on_read() { return on_read_(*this); }
++int HttpDownstreamConnection::on_read() { return (this->*on_read_)(); }
  
--int HttpDownstreamConnection::on_write() { return do_write_(*this); }
-+int HttpDownstreamConnection::on_write() { return (this->*do_write_)(); }
+-int HttpDownstreamConnection::on_write() { return on_write_(*this); }
++int HttpDownstreamConnection::on_write() { return (this->*on_write_)(); }
  
  void HttpDownstreamConnection::on_upstream_change(Upstream *upstream) {}
  
--void HttpDownstreamConnection::signal_write() { do_signal_write_(*this); }
-+void HttpDownstreamConnection::signal_write() { (this->*do_signal_write_)(); }
+-void HttpDownstreamConnection::signal_write() { signal_write_(*this); }
++void HttpDownstreamConnection::signal_write() { (this->*signal_write_)(); }
  
  int HttpDownstreamConnection::actual_signal_write() {
    ev_feed_event(conn_.loop, &conn_.wev, EV_WRITE);
@@ -84,11 +86,11 @@ index 8fad535..0ab430c 100644
  
  private:
    Connection conn_;
--  std::function<int(HttpDownstreamConnection &)> do_read_, do_write_,
--      do_signal_write_;
-+  int (HttpDownstreamConnection::*do_read_)();
-+  int (HttpDownstreamConnection::*do_write_)();
-+  int (HttpDownstreamConnection::*do_signal_write_)();
+-  std::function<int(HttpDownstreamConnection &)> on_read_, on_write_,
+-      signal_write_;
++  int (HttpDownstreamConnection::*on_read_)();
++  int (HttpDownstreamConnection::*on_write_)();
++  int (HttpDownstreamConnection::*signal_write_)();
    Worker *worker_;
    // nullptr if TLS is not used.
    SSL_CTX *ssl_ctx_;
diff --git a/nghttp2.spec b/nghttp2.spec
index b376a92..5229c96 100644
--- a/nghttp2.spec
+++ b/nghttp2.spec
@@ -1,6 +1,6 @@
 Summary: Experimental HTTP/2 client, server and proxy
 Name: nghttp2
-Version: 1.18.1
+Version: 1.19.0
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -106,6 +106,9 @@ make %{?_smp_mflags} check
 
 
 %changelog
+* Wed Jan 25 2017 Kamil Dudka <kdudka@redhat.com> 1.19.0-1
+- update to the latest upstream release
+
 * Thu Jan 05 2017 Kamil Dudka <kdudka@redhat.com> 1.18.1-1
 - update to the latest upstream release
 
diff --git a/sources b/sources
index 961f97a..ab84e59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nghttp2-1.18.1.tar.xz) = 7cc0e270bfce2cc094a6135540183bd6ed7336628d85d983b481faea1c10bf4e20b1d4526e1e4be364305500ec43691c2b86d7a8972455c4491ef008f6234e84
+SHA512 (nghttp2-1.19.0.tar.xz) = 848c25ad8ef3cf3388e35f0ee074441a4e0bc0a68739f8eaecb6185f3e1bb9cf190df75fda2c0182d93500522663549309a20ded4803dcb5b5731f9748e98f4f