From 42ff5b5c04d3aab4da7a6d9f2d9b028d3b1f7682 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Mon, 22 Jul 2013 22:12:54 +0900
Subject: [PATCH] Rename nghttp2_ssl as app_helper

---
 src/HttpServer.cc                     | 2 +-
 src/Makefile.am                       | 4 ++--
 src/{nghttp2_ssl.cc => app_helper.cc} | 2 +-
 src/{nghttp2_ssl.h => app_helper.h}   | 8 +++-----
 src/nghttp.cc                         | 2 +-
 src/nghttpd.cc                        | 2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)
 rename src/{nghttp2_ssl.cc => app_helper.cc} (99%)
 rename src/{nghttp2_ssl.h => app_helper.h} (96%)

diff --git a/src/HttpServer.cc b/src/HttpServer.cc
index a4410476..3bcef6a9 100644
--- a/src/HttpServer.cc
+++ b/src/HttpServer.cc
@@ -44,7 +44,7 @@
 #include <event2/bufferevent_ssl.h>
 #include <event2/listener.h>
 
-#include "nghttp2_ssl.h"
+#include "app_helper.h"
 #include "util.h"
 #include "EventPoll.h"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index e0d7cd55..9915d9bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,8 +41,8 @@ if HAVE_LIBEVENT_OPENSSL
 # bin_PROGRAMS += shrpx
 endif # HAVE_LIBEVENT_OPENSSL
 
-HELPER_OBJECTS = util.cc timegm.c nghttp2_ssl.cc
-HELPER_HFILES = util.h timegm.h nghttp2_ssl.h nghttp2_config.h
+HELPER_OBJECTS = util.cc timegm.c app_helper.cc
+HELPER_HFILES = util.h timegm.h app_helper.h nghttp2_config.h
 
 EVENT_OBJECTS =
 EVENT_HFILES = EventPoll.h EventPollEvent.h
diff --git a/src/nghttp2_ssl.cc b/src/app_helper.cc
similarity index 99%
rename from src/nghttp2_ssl.cc
rename to src/app_helper.cc
index 57dac029..2e79c656 100644
--- a/src/nghttp2_ssl.cc
+++ b/src/app_helper.cc
@@ -43,7 +43,7 @@
 #include <iomanip>
 #include <fstream>
 
-#include "nghttp2_ssl.h"
+#include "app_helper.h"
 #include "util.h"
 
 namespace nghttp2 {
diff --git a/src/nghttp2_ssl.h b/src/app_helper.h
similarity index 96%
rename from src/nghttp2_ssl.h
rename to src/app_helper.h
index 30f4d3b0..291f9711 100644
--- a/src/nghttp2_ssl.h
+++ b/src/app_helper.h
@@ -22,8 +22,8 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef NGHTTP2_SSL_H
-#define NGHTTP2_SSL_H
+#ifndef APP_HELPER_H
+#define APP_HELPER_H
 
 #include "nghttp2_config.h"
 
@@ -33,8 +33,6 @@
 #include <poll.h>
 #include <map>
 
-#include <openssl/ssl.h>
-#include <openssl/err.h>
 #include <nghttp2/nghttp2.h>
 
 namespace nghttp2 {
@@ -92,4 +90,4 @@ void set_color_output(bool f);
 
 } // namespace nghttp2
 
-#endif // NGHTTP2_SSL_H
+#endif // APP_HELPER_H
diff --git a/src/nghttp.cc b/src/nghttp.cc
index 01a7f025..970703d0 100644
--- a/src/nghttp.cc
+++ b/src/nghttp.cc
@@ -62,7 +62,7 @@
 
 #include "http-parser/http_parser.h"
 
-#include "nghttp2_ssl.h"
+#include "app_helper.h"
 #include "HtmlParser.h"
 #include "util.h"
 
diff --git a/src/nghttpd.cc b/src/nghttpd.cc
index 3e8c0bd3..1e5420f2 100644
--- a/src/nghttpd.cc
+++ b/src/nghttpd.cc
@@ -37,7 +37,7 @@
 #include <openssl/err.h>
 #include <nghttp2/nghttp2.h>
 
-#include "nghttp2_ssl.h"
+#include "app_helper.h"
 #include "HttpServer.h"
 
 namespace nghttp2 {