Sophie

Sophie

distrib > Mageia > 6 > armv7hl > media > core-updates-src > by-pkgid > dbb814079718415fcd2677f0ad42dd9f > files > 1

nghttp2-1.9.2-1.1.mga6.src.rpm

diff -Naurp nghttp2-1.8.0/configure nghttp2-1.8.0.oden/configure
--- nghttp2-1.8.0/configure	2016-02-25 16:51:38.000000000 +0100
+++ nghttp2-1.8.0.oden/configure	2016-03-02 12:34:51.118273438 +0100
@@ -18382,7 +18382,7 @@ else
 fi
 
 if test "x${have_libev}" = "xyes"; then
-  ac_fn_c_check_header_mongrel "$LINENO" "ev.h" "ac_cv_header_ev_h" "$ac_includes_default"
+  ac_fn_c_check_header_mongrel "$LINENO" "libev/ev.h" "ac_cv_header_ev_h" "$ac_includes_default"
 if test "x$ac_cv_header_ev_h" = xyes; then :
   have_libev=yes
 else
diff -Naurp nghttp2-1.8.0/configure.ac nghttp2-1.8.0.oden/configure.ac
--- nghttp2-1.8.0/configure.ac	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/configure.ac	2016-03-02 12:34:51.118273438 +0100
@@ -314,7 +314,7 @@ save_LIBS=$LIBS
 # android requires -lm for floor
 AC_CHECK_LIB([ev], [ev_time], [have_libev=yes], [have_libev=no], [-lm])
 if test "x${have_libev}" = "xyes"; then
-  AC_CHECK_HEADER([ev.h], [have_libev=yes], [have_libev=no])
+  AC_CHECK_HEADER([libev/ev.h], [have_libev=yes], [have_libev=no])
   if test "x${have_libev}" = "xyes"; then
     LIBEV_LIBS=-lev
     LIBEV_CFLAGS=
diff -Naurp nghttp2-1.8.0/src/h2load.h nghttp2-1.8.0.oden/src/h2load.h
--- nghttp2-1.8.0/src/h2load.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/h2load.h	2016-03-02 12:34:51.118273438 +0100
@@ -45,7 +45,7 @@
 
 #include <nghttp2/nghttp2.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <openssl/ssl.h>
 
diff -Naurp nghttp2-1.8.0/src/HttpServer.h nghttp2-1.8.0.oden/src/HttpServer.h
--- nghttp2-1.8.0/src/HttpServer.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/HttpServer.h	2016-03-02 12:34:51.118273438 +0100
@@ -39,7 +39,7 @@
 
 #include <openssl/ssl.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
diff -Naurp nghttp2-1.8.0/src/nghttp.h nghttp2-1.8.0.oden/src/nghttp.h
--- nghttp2-1.8.0/src/nghttp.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/nghttp.h	2016-03-02 12:34:51.118273438 +0100
@@ -43,7 +43,7 @@
 
 #include <openssl/ssl.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
diff -Naurp nghttp2-1.8.0/src/shrpx_accept_handler.h nghttp2-1.8.0.oden/src/shrpx_accept_handler.h
--- nghttp2-1.8.0/src/shrpx_accept_handler.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_accept_handler.h	2016-03-02 12:34:51.118273438 +0100
@@ -27,7 +27,7 @@
 
 #include "shrpx.h"
 
-#include <ev.h>
+#include <libev/ev.h>
 
 namespace shrpx {
 
diff -Naurp nghttp2-1.8.0/src/shrpx.cc nghttp2-1.8.0.oden/src/shrpx.cc
--- nghttp2-1.8.0/src/shrpx.cc	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx.cc	2016-03-02 12:34:51.118273438 +0100
@@ -68,7 +68,7 @@
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
diff -Naurp nghttp2-1.8.0/src/shrpx_client_handler.h nghttp2-1.8.0.oden/src/shrpx_client_handler.h
--- nghttp2-1.8.0/src/shrpx_client_handler.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_client_handler.h	2016-03-02 12:34:51.118273438 +0100
@@ -29,7 +29,7 @@
 
 #include <memory>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <openssl/ssl.h>
 
diff -Naurp nghttp2-1.8.0/src/shrpx_config.h nghttp2-1.8.0.oden/src/shrpx_config.h
--- nghttp2-1.8.0/src/shrpx_config.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_config.h	2016-03-02 12:34:51.118273438 +0100
@@ -46,7 +46,7 @@
 
 #include <openssl/ssl.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
diff -Naurp nghttp2-1.8.0/src/shrpx_connect_blocker.h nghttp2-1.8.0.oden/src/shrpx_connect_blocker.h
--- nghttp2-1.8.0/src/shrpx_connect_blocker.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_connect_blocker.h	2016-03-02 12:34:51.118273438 +0100
@@ -29,7 +29,7 @@
 
 #include <random>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 namespace shrpx {
 
diff -Naurp nghttp2-1.8.0/src/shrpx_connection.h nghttp2-1.8.0.oden/src/shrpx_connection.h
--- nghttp2-1.8.0/src/shrpx_connection.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_connection.h	2016-03-02 12:34:51.118273438 +0100
@@ -29,7 +29,7 @@
 
 #include <sys/uio.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <openssl/ssl.h>
 
diff -Naurp nghttp2-1.8.0/src/shrpx_connection_handler.h nghttp2-1.8.0.oden/src/shrpx_connection_handler.h
--- nghttp2-1.8.0/src/shrpx_connection_handler.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_connection_handler.h	2016-03-02 12:34:51.118273438 +0100
@@ -41,7 +41,7 @@
 
 #include <openssl/ssl.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #ifdef HAVE_NEVERBLEED
 #include <neverbleed.h>
diff -Naurp nghttp2-1.8.0/src/shrpx_downstream.h nghttp2-1.8.0.oden/src/shrpx_downstream.h
--- nghttp2-1.8.0/src/shrpx_downstream.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_downstream.h	2016-03-02 12:34:51.118273438 +0100
@@ -33,7 +33,7 @@
 #include <memory>
 #include <chrono>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
diff -Naurp nghttp2-1.8.0/src/shrpx_http2_session.h nghttp2-1.8.0.oden/src/shrpx_http2_session.h
--- nghttp2-1.8.0/src/shrpx_http2_session.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_http2_session.h	2016-03-02 12:34:51.118273438 +0100
@@ -32,7 +32,7 @@
 
 #include <openssl/ssl.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
diff -Naurp nghttp2-1.8.0/src/shrpx_http2_upstream.h nghttp2-1.8.0.oden/src/shrpx_http2_upstream.h
--- nghttp2-1.8.0/src/shrpx_http2_upstream.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_http2_upstream.h	2016-03-02 12:34:51.118273438 +0100
@@ -29,7 +29,7 @@
 
 #include <memory>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <nghttp2/nghttp2.h>
 
diff -Naurp nghttp2-1.8.0/src/shrpx_io_control.h nghttp2-1.8.0.oden/src/shrpx_io_control.h
--- nghttp2-1.8.0/src/shrpx_io_control.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_io_control.h	2016-03-02 12:34:51.118273438 +0100
@@ -29,7 +29,7 @@
 
 #include <vector>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include "shrpx_rate_limit.h"
 
diff -Naurp nghttp2-1.8.0/src/shrpx_memcached_connection.h nghttp2-1.8.0.oden/src/shrpx_memcached_connection.h
--- nghttp2-1.8.0/src/shrpx_memcached_connection.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_memcached_connection.h	2016-03-02 12:34:51.118273438 +0100
@@ -30,7 +30,7 @@
 #include <memory>
 #include <deque>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include "shrpx_connection.h"
 #include "buffer.h"
diff -Naurp nghttp2-1.8.0/src/shrpx_memcached_dispatcher.h nghttp2-1.8.0.oden/src/shrpx_memcached_dispatcher.h
--- nghttp2-1.8.0/src/shrpx_memcached_dispatcher.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_memcached_dispatcher.h	2016-03-02 12:34:51.118273438 +0100
@@ -29,7 +29,7 @@
 
 #include <memory>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <openssl/ssl.h>
 
diff -Naurp nghttp2-1.8.0/src/shrpx_rate_limit.h nghttp2-1.8.0.oden/src/shrpx_rate_limit.h
--- nghttp2-1.8.0/src/shrpx_rate_limit.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_rate_limit.h	2016-03-02 12:34:51.118273438 +0100
@@ -27,7 +27,7 @@
 
 #include "shrpx.h"
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <openssl/ssl.h>
 
diff -Naurp nghttp2-1.8.0/src/shrpx_spdy_upstream.h nghttp2-1.8.0.oden/src/shrpx_spdy_upstream.h
--- nghttp2-1.8.0/src/shrpx_spdy_upstream.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_spdy_upstream.h	2016-03-02 12:34:51.118273438 +0100
@@ -29,7 +29,7 @@
 
 #include <memory>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include <spdylay/spdylay.h>
 
diff -Naurp nghttp2-1.8.0/src/shrpx_ssl.h nghttp2-1.8.0.oden/src/shrpx_ssl.h
--- nghttp2-1.8.0/src/shrpx_ssl.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_ssl.h	2016-03-02 12:34:51.118273438 +0100
@@ -33,7 +33,7 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #ifdef HAVE_NEVERBLEED
 #include <neverbleed.h>
diff -Naurp nghttp2-1.8.0/src/shrpx_worker.h nghttp2-1.8.0.oden/src/shrpx_worker.h
--- nghttp2-1.8.0/src/shrpx_worker.h	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_worker.h	2016-03-02 12:34:51.118273438 +0100
@@ -40,7 +40,7 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include "shrpx_config.h"
 #include "shrpx_downstream_connection_pool.h"
diff -Naurp nghttp2-1.8.0/src/shrpx_worker_process.cc nghttp2-1.8.0.oden/src/shrpx_worker_process.cc
--- nghttp2-1.8.0/src/shrpx_worker_process.cc	2016-02-25 16:51:02.000000000 +0100
+++ nghttp2-1.8.0.oden/src/shrpx_worker_process.cc	2016-03-02 12:34:51.118273438 +0100
@@ -36,7 +36,7 @@
 
 #include <openssl/rand.h>
 
-#include <ev.h>
+#include <libev/ev.h>
 
 #include "shrpx_config.h"
 #include "shrpx_connection_handler.h"