From 03459c63fe6dfe5327de4ebf2766158bf8e9fa06 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Feb 27 2017 08:48:15 +0000 Subject: apply 0001-nghttp2-1.13.0-armv7hl-sigsegv.patch with zero offset --- diff --git a/0001-nghttp2-1.13.0-armv7hl-sigsegv.patch b/0001-nghttp2-1.13.0-armv7hl-sigsegv.patch index 23f52d6..f7912cf 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 -@@ -653,12 +653,12 @@ int ClientHandler::validate_next_proto() { +@@ -654,12 +654,12 @@ int ClientHandler::validate_next_proto() { return -1; } @@ -31,7 +31,7 @@ index 2c9b2a1..890143e 100644 if (rv != 0) { return rv; } -@@ -666,7 +666,7 @@ int ClientHandler::on_read() { +@@ -667,7 +667,7 @@ int ClientHandler::on_read() { conn_.handle_tls_pending_read(); return 0; } @@ -44,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 -@@ -182,8 +182,10 @@ private: +@@ -187,8 +187,10 @@ private: StringRef forwarded_for_; // lowercased TLS SNI which client sent. StringRef sni_; @@ -61,7 +61,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 -@@ -1435,13 +1435,13 @@ int HttpDownstreamConnection::connected() { +@@ -1449,13 +1449,13 @@ int HttpDownstreamConnection::connected() { return 0; }