6 files changed, 3 insertions, 43 deletions

diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index dbf3bac8..40879036 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -58,7 +58,7 @@ endif
 
 libmicrohttpd_la_SOURCES = \
   connection.c connection.h \
-  reason_phrase.c reason_phrase.h \
+  reason_phrase.c \
   daemon.c  \
   internal.c internal.h \
   memorypool.c memorypool.h \
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index b4125211..06823edb 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -30,7 +30,6 @@
 #include "connection.h"
 #include "memorypool.h"
 #include "response.h"
-#include "reason_phrase.h"
 
 #if HAVE_NETINET_TCP_H
 /* for TCP_CORK */
diff --git a/src/microhttpd/connection_https.c b/src/microhttpd/connection_https.c
index 834d52e0..af359fac 100644
--- a/src/microhttpd/connection_https.c
+++ b/src/microhttpd/connection_https.c
@@ -30,7 +30,6 @@
 #include "connection.h"
 #include "memorypool.h"
 #include "response.h"
-#include "reason_phrase.h"
 #include <gnutls/gnutls.h>
 
 
diff --git a/src/microhttpd/reason_phrase.c b/src/microhttpd/reason_phrase.c
index 3afe8af8..541efa20 100644
--- a/src/microhttpd/reason_phrase.c
+++ b/src/microhttpd/reason_phrase.c
@@ -17,7 +17,6 @@
      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
-
 /**
  * @file reason_phrase.c
  * @brief  Tables of the string response phrases
@@ -25,7 +24,7 @@
  * @author Christian Grothoff (minor code clean up)
  */
 #include "platform.h"
-#include "reason_phrase.h"
+#include "microhttpd.h"
 
 #ifndef NULL
 #define NULL (void*)0
diff --git a/src/microhttpd/reason_phrase.h b/src/microhttpd/reason_phrase.h
deleted file mode 100644
index e4422329..00000000
--- a/src/microhttpd/reason_phrase.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-     This file is part of libmicrohttpd
-     Copyright (C) 2007 Lymba
-
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     version 2.1 of the License, or (at your option) any later version.
-
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-/**
- * @file reason_phrase.c
- * @brief  Tables of the string response phrases
- * @author Elliot Glaysher
- */
-
-#ifndef REASON_PHRASE_H
-#define REASON_PHRASE_H
-
-/**
- * Returns the string reason phrase for a response code.
- *
- * If we don't have a string for a status code, we give the first
- * message in that status code class.
- */
-const char *MHD_get_reason_phrase_for (unsigned int code);
-
-#endif
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
index a5ea15e0..12948352 100644
--- a/src/microhttpd/response.c
+++ b/src/microhttpd/response.c
@@ -432,7 +432,7 @@ MHD_create_response_from_fd_at_offset64 (uint64_t size,
   if ((int64_t)size < 0 || (int64_t)offset < 0 || (int64_t)(size + offset) < 0)
     return NULL;
 
-  response = MHD_create_response_from_callback(size,
+  response = MHD_create_response_from_callback (size,
                                                 4 * 1024,
                                                 &file_reader,
                                                 NULL,