update to the latest upstream release (1.16.0)
This commit is contained in:
parent
c60200ac90
commit
597aa303be
@ -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
|
||||
@@ -616,18 +616,18 @@ int ClientHandler::validate_next_proto() {
|
||||
@@ -642,18 +642,18 @@ int ClientHandler::validate_next_proto() {
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -36,16 +36,16 @@ index 2c9b2a1..890143e 100644
|
||||
-int ClientHandler::on_write() { return on_write_(*this); }
|
||||
+int ClientHandler::on_write() { return (this->*on_write_)(); }
|
||||
|
||||
const std::string &ClientHandler::get_ipaddr() const { return ipaddr_; }
|
||||
const StringRef &ClientHandler::get_ipaddr() const { return ipaddr_; }
|
||||
|
||||
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
|
||||
@@ -177,8 +177,10 @@ private:
|
||||
std::string forwarded_for_;
|
||||
@@ -183,8 +183,10 @@ private:
|
||||
StringRef forwarded_for_;
|
||||
// lowercased TLS SNI which client sent.
|
||||
std::string sni_;
|
||||
StringRef 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
|
||||
@@ -1201,13 +1201,13 @@ int HttpDownstreamConnection::connected() {
|
||||
@@ -1209,13 +1209,13 @@ int HttpDownstreamConnection::connected() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
Summary: Experimental HTTP/2 client, server and proxy
|
||||
Name: nghttp2
|
||||
Version: 1.15.0
|
||||
Version: 1.16.0
|
||||
Release: 1%{?dist}
|
||||
License: MIT
|
||||
Group: Applications/Internet
|
||||
@ -105,6 +105,9 @@ make %{?_smp_mflags} check
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Oct 24 2016 Kamil Dudka <kdudka@redhat.com> 1.16.0-1
|
||||
- update to the latest upstream release
|
||||
|
||||
* Mon Sep 26 2016 Kamil Dudka <kdudka@redhat.com> 1.15.0-1
|
||||
- update to the latest upstream release
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user