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

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r5283 - libmicrohttpd/src/daemon

From:	gnunet
Subject:	[GNUnet-SVN] r5283 - libmicrohttpd/src/daemon
Date:	Sun, 8 Jul 2007 21:27:24 -0600 (MDT)
Author: grothoff
Date: 2007-07-08 21:27:23 -0600 (Sun, 08 Jul 2007)
New Revision: 5283

Modified:
   libmicrohttpd/src/daemon/daemontest.c
   libmicrohttpd/src/daemon/daemontest_get.c
   libmicrohttpd/src/daemon/daemontest_post.c
   libmicrohttpd/src/daemon/daemontest_put.c
Log:
compile

Modified: libmicrohttpd/src/daemon/daemontest.c
===================================================================
--- libmicrohttpd/src/daemon/daemontest.c       2007-07-09 03:23:53 UTC (rev 
5282)
+++ libmicrohttpd/src/daemon/daemontest.c       2007-07-09 03:27:23 UTC (rev 
5283)
@@ -53,11 +53,11 @@
 }
 
 static int ahc_nothing(void * cls,
-                      struct MHD_Session * session,
+                      struct MHD_Connection * connection,
                       const char * url,
                       const char * method,
+                      const char * version,
                       const char * upload_data,
-                      const char * version,
                       unsigned int * upload_data_size) {
   return MHD_NO;
 }

Modified: libmicrohttpd/src/daemon/daemontest_get.c
===================================================================
--- libmicrohttpd/src/daemon/daemontest_get.c   2007-07-09 03:23:53 UTC (rev 
5282)
+++ libmicrohttpd/src/daemon/daemontest_get.c   2007-07-09 03:27:23 UTC (rev 
5283)
@@ -61,9 +61,10 @@
 }
 
 static int ahc_echo(void * cls,
-                   struct MHD_Session * session,
+                   struct MHD_Connection * connection,
                    const char * url,
                    const char * method,
+                   const char * version,
                    const char * upload_data,
                    unsigned int * upload_data_size) {
   const char * me = cls;
@@ -76,7 +77,7 @@
                                           (void*) url,
                                           MHD_NO,
                                           MHD_YES);
-  ret = MHD_queue_response(session,
+  ret = MHD_queue_response(connection,
                           MHD_HTTP_OK,
                           response);
   MHD_destroy_response(response);
@@ -93,12 +94,13 @@
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-  d = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY | MHD_USE_IPv4 | 
MHD_USE_DEBUG,
+  d = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG,
                       1080,
                       &apc_all,
                       NULL,
                       &ahc_echo,
-                      "GET");
+                      "GET",
+                      MHD_OPTION_END);
   if (d == NULL)
     return 1;
   c = curl_easy_init();
@@ -157,12 +159,13 @@
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-  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,
                       1081,
                       &apc_all,
                       NULL,
                       &ahc_echo,
-                      "GET");
+                      "GET",
+                      MHD_OPTION_END);
   if (d == NULL)
     return 16;
   c = curl_easy_init();
@@ -231,12 +234,13 @@
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-  d = MHD_start_daemon(MHD_USE_IPv4 | MHD_USE_DEBUG,
+  d = MHD_start_daemon(MHD_USE_DEBUG,
                       1082,
                       &apc_all,
                       NULL,
                       &ahc_echo,
-                      "GET");
+                      "GET",
+                      MHD_OPTION_END);
   if (d == NULL)
     return 256;
   c = curl_easy_init();

Modified: libmicrohttpd/src/daemon/daemontest_post.c
===================================================================
--- libmicrohttpd/src/daemon/daemontest_post.c  2007-07-09 03:23:53 UTC (rev 
5282)
+++ libmicrohttpd/src/daemon/daemontest_post.c  2007-07-09 03:27:23 UTC (rev 
5283)
@@ -65,9 +65,10 @@
 }
 
 static int ahc_echo(void * cls,
-                   struct MHD_Session * session,
+                   struct MHD_Connection * connection,
                    const char * url,
                    const char * method,
+                   const char * version,
                    const char * upload_data,
                    unsigned int * upload_data_size) {
   struct MHD_Response * response;
@@ -77,12 +78,12 @@
     printf("METHOD: %s\n", method);
     return MHD_NO; /* unexpected method */
   }
-  /* FIXME: check session headers... */
+  /* FIXME: check connection headers... */
   response = MHD_create_response_from_data(strlen(url),
                                           (void*) url,
                                           MHD_NO,
                                           MHD_YES);
-  ret = MHD_queue_response(session,
+  ret = MHD_queue_response(connection,
                           MHD_HTTP_OK,
                           response);
   MHD_destroy_response(response);
@@ -99,12 +100,13 @@
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-  d = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY | MHD_USE_IPv4 | 
MHD_USE_DEBUG,
+  d = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG,
                       1080,
                       &apc_all,
                       NULL,
                       &ahc_echo,
-                      NULL);
+                      NULL,
+                      MHD_OPTION_END);
   if (d == NULL)
     return 1;
   c = curl_easy_init();
@@ -169,12 +171,13 @@
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-  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,
                       1081,
                       &apc_all,
                       NULL,
                       &ahc_echo,
-                      NULL);
+                      NULL,
+                      MHD_OPTION_END);
   if (d == NULL)
     return 16;
   c = curl_easy_init();
@@ -250,12 +253,13 @@
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-  d = MHD_start_daemon(MHD_USE_IPv4 | MHD_USE_DEBUG,
+  d = MHD_start_daemon(MHD_USE_DEBUG,
                       1082,
                       &apc_all,
                       NULL,
                       &ahc_echo,
-                      NULL);
+                      NULL,
+                      MHD_OPTION_END);
   if (d == NULL)
     return 256;
   c = curl_easy_init();

Modified: libmicrohttpd/src/daemon/daemontest_put.c
===================================================================
--- libmicrohttpd/src/daemon/daemontest_put.c   2007-07-09 03:23:53 UTC (rev 
5282)
+++ libmicrohttpd/src/daemon/daemontest_put.c   2007-07-09 03:27:23 UTC (rev 
5283)
@@ -77,9 +77,10 @@
 }
 
 static int ahc_echo(void * cls,
-                   struct MHD_Session * session,
+                   struct MHD_Connection * connection,
                    const char * url,
                    const char * method,
+                   const char * version,
                    const char * upload_data,
                    unsigned int * upload_data_size) {
   int * done = cls;
@@ -107,7 +108,7 @@
                                           (void*) url,
                                           MHD_NO,
                                           MHD_YES);
-  ret = MHD_queue_response(session,
+  ret = MHD_queue_response(connection,
                           MHD_HTTP_OK,
                           response);
   MHD_destroy_response(response);
@@ -126,12 +127,13 @@
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-  d = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY | MHD_USE_IPv4 | 
MHD_USE_DEBUG,
+  d = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG,
                       1080,
                       &apc_all,
                       NULL,
                       &ahc_echo,
-                      &done_flag);
+                      &done_flag,
+                      MHD_OPTION_END);
   if (d == NULL)
     return 1;
   c = curl_easy_init();
@@ -204,12 +206,13 @@
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-  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,
                       1081,
                       &apc_all,
                       NULL,
                       &ahc_echo,
-                      &done_flag);
+                      &done_flag,
+                      MHD_OPTION_END);
   if (d == NULL)
     return 16;
   c = curl_easy_init();
@@ -293,12 +296,13 @@
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
-  d = MHD_start_daemon(MHD_USE_IPv4 | MHD_USE_DEBUG,
+  d = MHD_start_daemon(MHD_USE_DEBUG,
                       1082,
                       &apc_all,
                       NULL,
                       &ahc_echo,
-                      &done_flag);
+                      &done_flag,
+                      MHD_OPTION_END);
   if (d == NULL)
     return 256;
   c = curl_easy_init();
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r5283 - libmicrohttpd/src/daemon, gnunet <=
Prev by Date: [GNUnet-SVN] r5282 - libmicrohttpd/src/daemon
Next by Date: [GNUnet-SVN] r5284 - in libmicrohttpd: . src/daemon
Previous by thread: [GNUnet-SVN] r5282 - libmicrohttpd/src/daemon
Next by thread: [GNUnet-SVN] r5284 - in libmicrohttpd: . src/daemon
Index(es):
- Date
- Thread