[GNUnet-SVN] r12675 - in libmicrohttpd: . src/daemon

[gnunet]

Author: grothoff
Date: 2010-08-19 14:37:20 +0200 (Thu, 19 Aug 2010)
New Revision: 12675

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/README
   libmicrohttpd/configure.ac
   libmicrohttpd/src/daemon/Makefile.am
Log:
changing default feature set to include HTTPS and allowing disabling of post 
processor

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2010-08-19 12:36:15 UTC (rev 12674)
+++ libmicrohttpd/ChangeLog     2010-08-19 12:37:20 UTC (rev 12675)
@@ -1,3 +1,9 @@
+Thu Aug 19 14:15:01 CEST 2010
+       Changed code to enable error messages and HTTPS by default;
+       added option to disable post processor API (use
+       breaks binary compatibility, should only be done
+       for embedded systems that require minimal footprint). -CG
+
 Thu Aug 19 13:26:00 CEST 2010
        Patches for Windows to ease compilation trouble. -GT/CG
 
@@ -2,3 +8,3 @@
 Sat Aug 14 15:43:30 CEST 2010
-       Fixed small, largely hypothetical leaks. 
+       Fixed small, largely hypothetical leaks.
        Reduced calls to strlen for header processing. -CG

Modified: libmicrohttpd/README
===================================================================
--- libmicrohttpd/README        2010-08-19 12:36:15 UTC (rev 12674)
+++ libmicrohttpd/README        2010-08-19 12:37:20 UTC (rev 12675)
@@ -16,19 +16,26 @@
 In order to run the testcases, you need a recent version of libcurl.
 libcurl is not required if you just want to install the library.
 
+Especially for development, do use the MHD_USE_DEBUG option to get
+error messages.
 
+
 Configure options
 =================
 
-Especially for development, use "--enable-messages" to enable error
-reporting (and use MHD_USE_DEBUG).  Error reporting is not enabled by
-default to reduce the size of the library (error messages take
-space!).  If you are concerned about space, you should set "CFLAGS" to
-"-Os -fomit-frame-pointer" to have gcc generate tight code.  The
-resulting binary should be about 30k (without SSL support) depending 
-on the platform.
 
+If you are concerned about space, you should set "CFLAGS" to "-Os
+-fomit-frame-pointer" to have gcc generate tight code.
 
+You can use the following options to disable certain MHD features:
+
+--disable-https: no HTTPS / TLS / SSL support (significant reduction)
+--disable-messages: no error messages (they take space!)
+--disable-postprocessor: no MHD_PostProcessor API
+
+The resulting binary should be about 32k depending on the platform.
+
+
 Portability
 ===========
 

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2010-08-19 12:36:15 UTC (rev 12674)
+++ libmicrohttpd/configure.ac  2010-08-19 12:37:20 UTC (rev 12675)
@@ -222,17 +222,32 @@
 # optional: have error messages ?
 AC_MSG_CHECKING(whether to enable error messages)
 AC_ARG_ENABLE(messages,
-   [AS_HELP_STRING([--enable-messages],
-               [enable MHD error messages])],
-   [enable_messages=$enableval],
-   [enable_messages="no"])
-AC_MSG_RESULT($enable_messages)
-if test "$enable_messages" = "yes"
+   [AS_HELP_STRING([--disable-messages],
+               [disable MHD error messages])],
+   [disable_messages=$enableval],
+   [disable_messages="no"])
+AC_MSG_RESULT($disable_messages)
+if test "$disable_messages" = "no"
 then
  AC_DEFINE([HAVE_MESSAGES],[1],[Include error messages])
 fi
 
 
+# optional: have postprocessor?
+AC_MSG_CHECKING(whether to enable postprocessor)
+AC_ARG_ENABLE(postprocessor,
+   [AS_HELP_STRING([--disable-postprocessor],
+               [disable MHD PostProcessor functionality])],
+   [disable_postprocessor=$enableval],
+   [disable_postprocessor="no"])
+AC_MSG_RESULT($disable_postprocessor)
+if test "$disable_postprocessor" = "no"
+then
+ AC_DEFINE([HAVE_POSTPROCESSOR],[1],[Include postprocessor])
+fi
+AM_CONDITIONAL([HAVE_POSTPROCESSOR],test x$disable_postprocessor = xno)
+
+
 # optional: have zzuf, socat?
 AC_CHECK_PROG([HAVE_ZZUF],[zzuf], 1, 0)
 AC_CHECK_PROG([HAVE_SOCAT],[socat], 1, 0)
@@ -284,11 +299,11 @@
 # optional: HTTPS support.  Enabled by default
 AC_MSG_CHECKING(whether to enable HTTPS support)
 AC_ARG_ENABLE([https],
-   [AS_HELP_STRING([--enable-https],
-               [enable HTTPS support (default is yes)])],
-   [enable_https=$enableval],
-   [enable_https="yes"])
-if test "$enable_https" = "yes"
+   [AS_HELP_STRING([--disable-https],
+               [disable HTTPS support (default is enabled)])],
+   [disable_https=$enableval],
+   [disable_https="no"])
+if test "$disable_https" = "no"
 then
  if test "$gcrypt" = "true" -a "$gnutls" = "true"
  then
@@ -301,9 +316,9 @@
 else
  AC_DEFINE([HTTPS_SUPPORT],[0],[disable HTTPS support])
 fi
-AC_MSG_RESULT($enable_https)
+AC_MSG_RESULT($disable_https)
 
-AM_CONDITIONAL(ENABLE_HTTPS, test "$enable_https" = "yes")
+AM_CONDITIONAL(ENABLE_HTTPS, test "$disable_https" = "no")
 
 MHD_LIB_LDFLAGS="-export-dynamic -no-undefined"
 
@@ -375,14 +390,15 @@
 
 AC_MSG_NOTICE([Configuration Summary:  
   Operating System:  ${host_os}
-  Target directory:  ${prefix}
-  Messages:          ${enable_messages}
   libgcrypt:         ${MSG_GCRYPT}
   libcurl (testing): ${MSG_CURL}
-  HTTPS support:     ${enable_https}
+  Target directory:  ${prefix}
+  Messages disabled: ${disable_messages}
+  Postproc disabled: ${disable_postprocessor}
+  HTTPS disabled:    ${disable_https}
 ])
 
-if test "$enable_https" = "yes"
+if test "$disable_https" = "no"
 then
  AC_MSG_NOTICE([HTTPS subsystem configuration:
   License         :  LGPL only

Modified: libmicrohttpd/src/daemon/Makefile.am
===================================================================
--- libmicrohttpd/src/daemon/Makefile.am        2010-08-19 12:36:15 UTC (rev 
12674)
+++ libmicrohttpd/src/daemon/Makefile.am        2010-08-19 12:37:20 UTC (rev 
12675)
@@ -13,13 +13,17 @@
 lib_LTLIBRARIES = \
   libmicrohttpd.la
 
+if HAVE_POSTPROCESSOR
+  SUPPORT_POSTPROCESSOR = postprocessor.c
+endif
+
 libmicrohttpd_la_SOURCES = \
   connection.c connection.h \
   reason_phrase.c reason_phrase.h \
   daemon.c  \
   internal.c internal.h \
   memorypool.c memorypool.h \
-  postprocessor.c \
+  $(SUPPORT_POSTPROCESSOR) \
   response.c response.h
 libmicrohttpd_la_LDFLAGS = \
   $(MHD_LIB_LDFLAGS) \