From 551f635f500f17062eee74542cb5587ae66e8990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Mon, 15 May 2017 09:13:31 +0300
Subject: [PATCH] MXS-1220: Make the http.hh header public

As it contains utility functions for formatting time_t values to HTTP-date
values, there's no real need to make it an internal header.
---
 {server/core => include}/maxscale/http.hh | 0
 server/core/admin.cc                      | 4 ++--
 server/core/config.cc                     | 1 +
 server/core/maxscale/httprequest.hh       | 3 +--
 server/core/maxscale/httpresponse.hh      | 3 +--
 server/core/maxscale/resource.hh          | 2 +-
 server/core/resource.cc                   | 2 +-
 server/core/test/testhttp.cc              | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)
 rename {server/core => include}/maxscale/http.hh (100%)

diff --git a/server/core/maxscale/http.hh b/include/maxscale/http.hh
similarity index 100%
rename from server/core/maxscale/http.hh
rename to include/maxscale/http.hh
diff --git a/server/core/admin.cc b/server/core/admin.cc
index bd97bdd94..2ff66894a 100644
--- a/server/core/admin.cc
+++ b/server/core/admin.cc
@@ -24,6 +24,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
+#include <sys/stat.h>
 
 #include <maxscale/atomic.h>
 #include <maxscale/debug.h>
@@ -31,10 +32,9 @@
 #include <maxscale/utils.h>
 #include <maxscale/config.h>
 #include <maxscale/hk_heartbeat.h>
-#include <sys/stat.h>
+#include <maxscale/http.hh>
 
 #include "maxscale/resource.hh"
-#include "maxscale/http.hh"
 
 using std::string;
 using std::ifstream;
diff --git a/server/core/config.cc b/server/core/config.cc
index 06408c03c..8e8acbad6 100644
--- a/server/core/config.cc
+++ b/server/core/config.cc
@@ -41,6 +41,7 @@
 #include <maxscale/utils.h>
 #include <maxscale/paths.h>
 #include <maxscale/json_api.h>
+#include <maxscale/http.hh>
 
 #include "maxscale/config.h"
 #include "maxscale/filter.h"
diff --git a/server/core/maxscale/httprequest.hh b/server/core/maxscale/httprequest.hh
index 1cd405f05..f487730ae 100644
--- a/server/core/maxscale/httprequest.hh
+++ b/server/core/maxscale/httprequest.hh
@@ -23,8 +23,7 @@
 
 #include <maxscale/jansson.hh>
 #include <maxscale/utils.hh>
-
-#include "http.hh"
+#include <maxscale/http.hh>
 
 // The API version part of the URL
 #define MXS_REST_API_VERSION "v1"
diff --git a/server/core/maxscale/httpresponse.hh b/server/core/maxscale/httpresponse.hh
index 4e5801f45..4ed545ff5 100644
--- a/server/core/maxscale/httpresponse.hh
+++ b/server/core/maxscale/httpresponse.hh
@@ -20,8 +20,7 @@
 #include <microhttpd.h>
 
 #include <maxscale/jansson.hh>
-
-#include "http.hh"
+#include <maxscale/http.hh>
 
 /**
  * A list of default headers that are generated with each response
diff --git a/server/core/maxscale/resource.hh b/server/core/maxscale/resource.hh
index c92c77611..15a4dc284 100644
--- a/server/core/maxscale/resource.hh
+++ b/server/core/maxscale/resource.hh
@@ -20,8 +20,8 @@
 #include <deque>
 
 #include <maxscale/server.h>
+#include <maxscale/http.hh>
 
-#include "http.hh"
 #include "httprequest.hh"
 #include "httpresponse.hh"
 #include "monitor.h"
diff --git a/server/core/resource.cc b/server/core/resource.cc
index 1f78f5750..3c4359647 100644
--- a/server/core/resource.cc
+++ b/server/core/resource.cc
@@ -21,6 +21,7 @@
 #include <maxscale/spinlock.hh>
 #include <maxscale/json_api.h>
 #include <maxscale/housekeeper.h>
+#include <maxscale/http.hh>
 
 #include "maxscale/httprequest.hh"
 #include "maxscale/httpresponse.hh"
@@ -31,7 +32,6 @@
 #include "maxscale/config_runtime.h"
 #include "maxscale/modules.h"
 #include "maxscale/worker.h"
-#include "maxscale/http.hh"
 
 using std::list;
 using std::map;
diff --git a/server/core/test/testhttp.cc b/server/core/test/testhttp.cc
index 04e439459..a27e46feb 100644
--- a/server/core/test/testhttp.cc
+++ b/server/core/test/testhttp.cc
@@ -14,7 +14,7 @@
 #include <iostream>
 
 #include <maxscale/debug.h>
-#include "../maxscale/http.hh"
+#include <maxscale/http.hh>
 
 using std::string;
 using std::cout;