[GNUnet-SVN] r36243 - in libmicrohttpd: . src/include src/microhttpd

[gnunet]

Author: grothoff
Date: 2015-08-14 14:19:43 +0200 (Fri, 14 Aug 2015)
New Revision: 36243

Removed:
   libmicrohttpd/src/microhttpd/reason_phrase.h
Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/microhttpd/Makefile.am
   libmicrohttpd/src/microhttpd/connection.c
   libmicrohttpd/src/microhttpd/connection_https.c
   libmicrohttpd/src/microhttpd/reason_phrase.c
   libmicrohttpd/src/microhttpd/response.c
Log:
export MHD_get_reason_phrase_for

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2015-08-11 16:37:13 UTC (rev 36242)
+++ libmicrohttpd/ChangeLog     2015-08-14 12:19:43 UTC (rev 36243)
@@ -1,3 +1,6 @@
+Fri Aug 14 14:13:55 CEST 2015
+       Export MHD_get_reason_phrase_for() symbol. -CG
+
 Sat Aug  8 12:19:47 CEST 2015
        Added checks for overflows and buffer overruns, fixed
        possible buffer overrun.

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2015-08-11 16:37:13 UTC (rev 
36242)
+++ libmicrohttpd/src/include/microhttpd.h      2015-08-14 12:19:43 UTC (rev 
36243)
@@ -130,7 +130,7 @@
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00094208
+#define MHD_VERSION 0x00094209
 
 /**
  * MHD-internal return code for "YES".
@@ -341,6 +341,16 @@
 /** @} */ /* end of group httpcode */
 
 /**
+ * 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);
+
+
+/**
  * Flag to be or-ed with MHD_HTTP status code for
  * SHOUTcast.  This will cause the response to begin
  * with the SHOUTcast "ICY" line instad of "HTTP".

Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am    2015-08-11 16:37:13 UTC (rev 
36242)
+++ libmicrohttpd/src/microhttpd/Makefile.am    2015-08-14 12:19:43 UTC (rev 
36243)
@@ -58,7 +58,7 @@
 
 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 \

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2015-08-11 16:37:13 UTC (rev 
36242)
+++ libmicrohttpd/src/microhttpd/connection.c   2015-08-14 12:19:43 UTC (rev 
36243)
@@ -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 */

Modified: libmicrohttpd/src/microhttpd/connection_https.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection_https.c     2015-08-11 16:37:13 UTC 
(rev 36242)
+++ libmicrohttpd/src/microhttpd/connection_https.c     2015-08-14 12:19:43 UTC 
(rev 36243)
@@ -30,7 +30,6 @@
 #include "connection.h"
 #include "memorypool.h"
 #include "response.h"
-#include "reason_phrase.h"
 #include <gnutls/gnutls.h>
 
 

Modified: libmicrohttpd/src/microhttpd/reason_phrase.c
===================================================================
--- libmicrohttpd/src/microhttpd/reason_phrase.c        2015-08-11 16:37:13 UTC 
(rev 36242)
+++ libmicrohttpd/src/microhttpd/reason_phrase.c        2015-08-14 12:19:43 UTC 
(rev 36243)
@@ -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

Deleted: libmicrohttpd/src/microhttpd/reason_phrase.h
===================================================================
--- libmicrohttpd/src/microhttpd/reason_phrase.h        2015-08-11 16:37:13 UTC 
(rev 36242)
+++ libmicrohttpd/src/microhttpd/reason_phrase.h        2015-08-14 12:19:43 UTC 
(rev 36243)
@@ -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

Modified: libmicrohttpd/src/microhttpd/response.c
===================================================================
--- libmicrohttpd/src/microhttpd/response.c     2015-08-11 16:37:13 UTC (rev 
36242)
+++ libmicrohttpd/src/microhttpd/response.c     2015-08-14 12:19:43 UTC (rev 
36243)
@@ -432,7 +432,7 @@
   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,