[GNUnet-SVN] r7404 - in libmicrohttpd/src: daemon testcurl

[gnunet]

Author: lv-426
Date: 2008-07-09 13:26:24 -0600 (Wed, 09 Jul 2008)
New Revision: 7404

Modified:
   libmicrohttpd/src/daemon/connection.c
   libmicrohttpd/src/daemon/daemon.c
   libmicrohttpd/src/testcurl/Makefile.am
Log:
preprocessing tags

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2008-07-09 18:43:15 UTC (rev 
7403)
+++ libmicrohttpd/src/daemon/connection.c       2008-07-09 19:26:24 UTC (rev 
7404)
@@ -1594,6 +1594,7 @@
               break;
             }
           /* TODO clean - missing MSG_NOSIGNAL on gnutls record send call */
+#if HTTPS_SUPPORT
           if (connection->daemon->options & MHD_USE_SSL)
             {
               ret = gnutls_record_send (connection->tls_session,
@@ -1606,6 +1607,7 @@
                                          response->data_start));
             }
           else
+#endif
             {
               ret = SEND (connection->socket_fd,
                           &response->data[connection->

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2008-07-09 18:43:15 UTC (rev 7403)
+++ libmicrohttpd/src/daemon/daemon.c   2008-07-09 19:26:24 UTC (rev 7404)
@@ -864,6 +864,7 @@
   retVal->max_connections = MHD_MAX_CONNECTIONS_DEFAULT;
   retVal->pool_size = MHD_POOL_SIZE_DEFAULT;
   retVal->connection_timeout = 0;       /* no timeout */
+#if HTTPS_SUPPORT
   if (options & MHD_USE_SSL)
     {
       /* lock gnutls_global mutex since it uses reference counting */
@@ -874,7 +875,7 @@
       gnutls_priority_init (&retVal->priority_cache,
                             "NONE:+AES-256-CBC:+RSA:+SHA1:+COMP-NULL", NULL);
     }
-
+#endif
   /* initializes the argument pointer variable */
   va_start (ap, dh_cls);
   /*

Modified: libmicrohttpd/src/testcurl/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/Makefile.am      2008-07-09 18:43:15 UTC (rev 
7403)
+++ libmicrohttpd/src/testcurl/Makefile.am      2008-07-09 19:26:24 UTC (rev 
7404)
@@ -1,5 +1,9 @@
-SUBDIRS  = . https
+SUBDIRS  = .
 
+if ENABLE_HTTPS
+SUBDIRS += https
+endif
+
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/daemon/https/includes \
 -I$(top_srcdir)/src/daemon \