[GNUnet-SVN] r5281 - libmicrohttpd/src/daemon

[gnunet]

Author: grothoff
Date: 2007-07-08 21:22:52 -0600 (Sun, 08 Jul 2007)
New Revision: 5281

Modified:
   libmicrohttpd/src/daemon/connection.c
   libmicrohttpd/src/daemon/daemon.c
   libmicrohttpd/src/daemon/internal.h
   libmicrohttpd/src/daemon/minimal_example.c
Log:
fix

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2007-07-09 03:20:57 UTC (rev 
5280)
+++ libmicrohttpd/src/daemon/connection.c       2007-07-09 03:22:52 UTC (rev 
5281)
@@ -531,6 +531,7 @@
                       connection,
                       connection->url,
                       connection->method,
+                      connection->version,
                       connection->read_buffer,
                       &processed)) {
     /* serios internal error, close connection */

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2007-07-09 03:20:57 UTC (rev 5280)
+++ libmicrohttpd/src/daemon/daemon.c   2007-07-09 03:22:52 UTC (rev 5281)
@@ -461,7 +461,8 @@
                 MHD_AcceptPolicyCallback apc,
                 void * apc_cls,
                 MHD_AccessHandlerCallback dh,
-                void * dh_cls) {
+                void * dh_cls,
+                ...) {
   struct MHD_Daemon * retVal;
   int socket_fd;
   struct sockaddr_in servaddr; 
@@ -470,8 +471,6 @@
     return NULL;
   if ((options & MHD_USE_IPv6) != 0)
     return NULL;
-  if ((options & MHD_USE_IPv4) == 0)
-    return NULL;
   if ( (port == 0) ||
        (dh == NULL) )
     return NULL;

Modified: libmicrohttpd/src/daemon/internal.h
===================================================================
--- libmicrohttpd/src/daemon/internal.h 2007-07-09 03:20:57 UTC (rev 5280)
+++ libmicrohttpd/src/daemon/internal.h 2007-07-09 03:22:52 UTC (rev 5281)
@@ -156,8 +156,8 @@
 
 
 
-struct MHD_Session {
-  struct MHD_Session * next;
+struct MHD_Connection {
+  struct MHD_Connection * next;
 
   struct MHD_Daemon * daemon;
 
@@ -196,7 +196,7 @@
   struct sockaddr_in * addr;
 
   /**
-   * Thread for this session (if we are using
+   * Thread for this connection (if we are using
    * one thread per connection).
    */
   pthread_t pid;
@@ -279,7 +279,7 @@
 
   struct MHD_Access_Handler default_handler;
 
-  struct MHD_Session * connections;
+  struct MHD_Connection * connections;
 
   MHD_AcceptPolicyCallback apc;
 

Modified: libmicrohttpd/src/daemon/minimal_example.c
===================================================================
--- libmicrohttpd/src/daemon/minimal_example.c  2007-07-09 03:20:57 UTC (rev 
5280)
+++ libmicrohttpd/src/daemon/minimal_example.c  2007-07-09 03:22:52 UTC (rev 
5281)
@@ -42,10 +42,11 @@
 }
 
 static int ahc_echo(void * cls,
-                   struct MHD_Session * session,
+                   struct MHD_Connection * connection,
                    const char * url,
                    const char * method,
                    const char * upload_data,
+                   const char * version,
                    unsigned int * upload_data_size) {
   const char * me = cls;
   struct MHD_Response * response;
@@ -57,7 +58,7 @@
                                           (void*) me,
                                           MHD_NO,
                                           MHD_NO);
-  ret = MHD_queue_response(session,
+  ret = MHD_queue_response(connection,
                           MHD_HTTP_OK,
                           response);
   MHD_destroy_response(response);
@@ -73,12 +74,13 @@
           argv[0]);
     return 1;
   }
-  d = MHD_start_daemon(MHD_USE_THREAD_PER_CONNECTION | MHD_USE_IPv4 | 
MHD_USE_DEBUG,
+  d = MHD_start_daemon(MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG,
                       atoi(argv[1]),
                       &apc_all,
                       NULL,
                       &ahc_echo,
-                      PAGE);
+                      PAGE,
+                      MHD_OPTION_END);
   if (d == NULL)
     return 1;
   sleep(atoi(argv[2]));