libmicrohttpd

commit 08ee1d01c9a343b41697b803150e712bd713c582
parent 8a60f9f2fa63377eb8f1b9aac491b610eb78dba4
Author: lv-426 <oxcafebaby@yahoo.com>
Date:   Wed,  9 Jul 2008 19:26:24 +0000

preprocessing tags

Diffstat:
M
src/daemon/connection.c
 | 
2
++
M
src/daemon/daemon.c
 | 
3
++-
M
src/testcurl/Makefile.am
 | 
6
+++++-

3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/daemon/connection.c b/src/daemon/connection.c
@@ -1594,6 +1594,7 @@ MHD_connection_handle_write (struct MHD_Connection *connection)
               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 @@ MHD_connection_handle_write (struct MHD_Connection *connection)
                                          response->data_start));
             }
           else
+#endif
             {
               ret = SEND (connection->socket_fd,
                           &response->data[connection->
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
@@ -864,6 +864,7 @@ MHD_start_daemon (unsigned int options,
   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 @@ MHD_start_daemon (unsigned int options,
       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);
   /*
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS  = . https
+SUBDIRS  = .
+
+if ENABLE_HTTPS
+SUBDIRS += https
+endif
 
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/daemon/https/includes \