7 files changed, 58 insertions, 40 deletions

diff --git a/src/daemon/EXPORT.sym b/src/daemon/EXPORT.sym
index 32096ad6..53bd960b 100644
--- a/src/daemon/EXPORT.sym
+++ b/src/daemon/EXPORT.sym
@@ -10,6 +10,7 @@ MHD_lookup_connection_value
 MHD_queue_response
 MHD_create_response_from_callback
 MHD_create_response_from_data
+MHD_create_response_from_fd
 MHD_destroy_response
 MHD_add_response_header
 MHD_del_response_header
diff --git a/src/daemon/connection.c b/src/daemon/connection.c
index dab19472..a56106a4 100644
--- a/src/daemon/connection.c
+++ b/src/daemon/connection.c
@@ -1,6 +1,6 @@
 /*
     This file is part of libmicrohttpd
-     (C) 2007, 2008 Daniel Pittman and Christian Grothoff
+     (C) 2007, 2008, 2009, 2010 Daniel Pittman and Christian Grothoff
 
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Lesser General Public
@@ -336,7 +336,10 @@ try_ready_normal_body (struct MHD_Connection *connection)
 #if LINUX
   if ( (response->fd != -1) &&
        (0 == (connection->daemon->options & MHD_USE_SSL)) )
-    return MHD_YES; /* will use sendfile */
+    {
+      /* will use sendfile, no need to bother response crc */
+      return MHD_YES; 
+    }
 #endif
   ret = response->crc (response->crc_cls,
                        connection->response_write_position,
diff --git a/src/daemon/connection_https.c b/src/daemon/connection_https.c
index b00da807..e24da021 100644
--- a/src/daemon/connection_https.c
+++ b/src/daemon/connection_https.c
@@ -198,7 +198,7 @@ MHD_tls_connection_handle_write (struct MHD_Connection *connection)
  * the processing of this secure connection.
  */
 void
-MHD_set_https_calbacks (struct MHD_Connection *connection)
+MHD_set_https_callbacks (struct MHD_Connection *connection)
 {
   connection->read_handler = &MHD_tls_connection_handle_read;
   connection->write_handler = &MHD_tls_connection_handle_write;
diff --git a/src/daemon/connection_https.h b/src/daemon/connection_https.h
index ef6f5dc6..8a5cf380 100644
--- a/src/daemon/connection_https.h
+++ b/src/daemon/connection_https.h
@@ -29,7 +29,7 @@
 #include "internal.h"
 
 #if HTTPS_SUPPORT
-void MHD_set_https_calbacks (struct MHD_Connection *connection);
+void MHD_set_https_callbacks (struct MHD_Connection *connection);
 #endif
 
 #endif
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index f704382d..73a0f163 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -1,6 +1,6 @@
 /*
   This file is part of libmicrohttpd
-  (C) 2007, 2008, 2009 Daniel Pittman and Christian Grothoff
+  (C) 2007, 2008, 2009, 2010 Daniel Pittman and Christian Grothoff
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -387,8 +387,8 @@ MHD_init_daemon_certificate (struct MHD_Daemon *daemon)
       cert.size = strlen (daemon->https_mem_cert);
 
       return gnutls_certificate_set_x509_key_mem (daemon->x509_cred,
-                                                       &cert, &key,
-                                                       GNUTLS_X509_FMT_PEM);
+                                                  &cert, &key,
+                                                  GNUTLS_X509_FMT_PEM);
     }
 #if HAVE_MESSAGES
   MHD_DLOG (daemon, "You need to specify a certificate and key location\n");
@@ -625,21 +625,28 @@ send_param_adapter (struct MHD_Connection *connection,
 #if LINUX
   int fd;
   off_t offset;
+  int ret;
 #endif
   if (connection->socket_fd == -1)
     return -1;
   if (0 != (connection->daemon->options & MHD_USE_SSL))
     return SEND (connection->socket_fd, other, i, MSG_NOSIGNAL);
 #if LINUX
-  if ( (NULL != connection->response) &&
+  if ( (connection->write_buffer_append_offset ==
+        connection->write_buffer_send_offset) &&
+       (NULL != connection->response) &&
        (-1 != (fd = connection->response->fd)) )
     {
       /* can use sendfile */
       offset = (off_t) connection->response_write_position;
-      return sendfile (connection->socket_fd, 
-                       fd,
-                       &offset,
-                       i);
+      ret = sendfile (connection->socket_fd, 
+                      fd,
+                      &offset,
+                      connection->response->total_size - offset);
+      if ( (ret == -1) &&
+           (errno == EINTR) )
+        return 0;
+      return ret;
     }
 #endif
   return SEND (connection->socket_fd, other, i, MSG_NOSIGNAL | MSG_DONTWAIT);
@@ -819,7 +826,7 @@ MHD_accept_connection (struct MHD_Daemon *daemon)
       connection->recv_cls = &recv_tls_adapter;
       connection->send_cls = &send_tls_adapter;
       connection->state = MHD_TLS_CONNECTION_INIT;
-      MHD_set_https_calbacks (connection);
+      MHD_set_https_callbacks (connection);
       gnutls_init (&connection->tls_session, GNUTLS_SERVER);
       gnutls_priority_set (connection->tls_session,
                            daemon->priority_cache);
@@ -1664,7 +1671,10 @@ MHD_start_daemon_va (unsigned int options,
           return NULL;
         }      
     }
-
+  else
+    {
+      socket_fd = retVal->socket_fd;
+    }
 #ifndef WINDOWS
   if ( (socket_fd >= FD_SETSIZE) &&
        (0 == (options & MHD_USE_POLL)) )
diff --git a/src/daemon/internal.h b/src/daemon/internal.h
index a026eeef..f3f47ce0 100644
--- a/src/daemon/internal.h
+++ b/src/daemon/internal.h
@@ -1,21 +1,21 @@
 /*
- This file is part of libmicrohttpd
- (C) 2007 Daniel Pittman and Christian Grothoff
-
- 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
- */
+  This file is part of libmicrohttpd
+  (C) 2007, 2008, 2009, 2010 Daniel Pittman and Christian Grothoff
+  
+  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 internal.h
diff --git a/src/daemon/response.c b/src/daemon/response.c
index 0f5501ee..f1379301 100644
--- a/src/daemon/response.c
+++ b/src/daemon/response.c
@@ -1,6 +1,6 @@
 /*
      This file is part of libmicrohttpd
-     (C) 2007, 2009 Daniel Pittman and Christian Grothoff
+     (C) 2007, 2009, 2010 Daniel Pittman and Christian Grothoff
 
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Lesser General Public
@@ -210,7 +210,7 @@ MHD_create_response_from_callback (uint64_t size,
  * Given a file descriptor, read data from the file
  * to generate the response.
  * 
- * @param cls pointer to the file descriptor
+ * @param cls pointer to the response
  * @param pos offset in the file to access
  * @param buf where to write the data
  * @param max number of bytes to write at most
@@ -219,10 +219,14 @@ MHD_create_response_from_callback (uint64_t size,
 static int
 file_reader (void *cls, uint64_t pos, char *buf, int max)
 {
-  int *fd = cls;
+  struct MHD_Response *response = cls;
+  int ret;
 
-  (void) lseek (*fd, pos, SEEK_SET);
-  return read (*fd, buf, max);
+  pthread_mutex_lock (&response->mutex);
+  (void) lseek (response->fd, pos, SEEK_SET);
+  ret = read (response->fd, buf, max);
+  pthread_mutex_unlock (&response->mutex);
+  return ret;
 }
 
 
@@ -235,9 +239,9 @@ file_reader (void *cls, uint64_t pos, char *buf, int max)
 static void
 free_callback (void *cls)
 {
-  int *fd = cls;
-  close (*fd);
-  *fd = -1;
+  struct MHD_Response *response = cls;
+  (void) close (response->fd);
+  response->fd = -1;
 }
 
 
@@ -262,7 +266,7 @@ struct MHD_Response *MHD_create_response_from_fd (size_t size,
   if (ret == NULL)
     return NULL;
   ret->fd = fd;
-  ret->crc_cls = &ret->fd;
+  ret->crc_cls = ret;
   return ret;
 }