update to the latest upstream release (1.15.0)

This commit is contained in:
Kamil Dudka 2016-09-26 12:37:48 +02:00
parent c75dcfd0f8
commit c60200ac90
3 changed files with 10 additions and 7 deletions

View File

@ -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;
}

View File

@ -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

View File

@ -1 +1 @@
f11be3a51af6e1f0a5539efdcb7d9e8f nghttp2-1.14.1.tar.xz
3ff131352e4076d78b69a7219d545181 nghttp2-1.15.0.tar.xz