From c60200ac90cfeac383bbab914500e3fbe3557024 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 26 Sep 2016 12:37:48 +0200
Subject: [PATCH] update to the latest upstream release (1.15.0)

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

diff --git a/0001-nghttp2-1.13.0-armv7hl-sigsegv.patch b/0001-nghttp2-1.13.0-armv7hl-sigsegv.patch
index 655e4aa..ad89cc2 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
-@@ -612,18 +612,18 @@ int ClientHandler::validate_next_proto() {
+@@ -616,18 +616,18 @@ int ClientHandler::validate_next_proto() {
    return -1;
  }
  
@@ -42,10 +42,10 @@ 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
-@@ -167,8 +167,10 @@ private:
-   // The client address used in "for" parameter of Forwarded header
-   // field.
+@@ -177,8 +177,10 @@ private:
    std::string forwarded_for_;
+   // lowercased TLS SNI which client sent.
+   std::string sni_;
 -  std::function<int(ClientHandler &)> read_, write_;
 -  std::function<int(ClientHandler &)> on_read_, on_write_;
 +  int (ClientHandler::*read_)();
@@ -59,7 +59,7 @@ 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
-@@ -1184,13 +1184,13 @@ int HttpDownstreamConnection::connected() {
+@@ -1201,13 +1201,13 @@ int HttpDownstreamConnection::connected() {
    return 0;
  }
  
diff --git a/nghttp2.spec b/nghttp2.spec
index 093d170..9125035 100644
--- a/nghttp2.spec
+++ b/nghttp2.spec
@@ -1,6 +1,6 @@
 Summary: Experimental HTTP/2 client, server and proxy
 Name: nghttp2
-Version: 1.14.1
+Version: 1.15.0
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -105,6 +105,9 @@ make %{?_smp_mflags} check
 
 
 %changelog
+* Mon Sep 26 2016 Kamil Dudka <kdudka@redhat.com> 1.15.0-1
+- update to the latest upstream release
+
 * Mon Sep 12 2016 Kamil Dudka <kdudka@redhat.com> 1.14.1-1
 - update to the latest upstream release
 
diff --git a/sources b/sources
index 5fab780..8dab558 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f11be3a51af6e1f0a5539efdcb7d9e8f  nghttp2-1.14.1.tar.xz
+3ff131352e4076d78b69a7219d545181  nghttp2-1.15.0.tar.xz