commit 44daba8d2be7d7c482577c0efa7073de3aaff69e
parent 70ef51f7da140c03d6a18b1201c693b154341d14
Author: Christian Grothoff <christian@grothoff.org>
Date: Tue, 17 Jul 2012 20:15:45 +0000
-fixing sendfile mess
Diffstat:
3 files changed, 28 insertions(+), 482 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -89,9 +89,6 @@ fi
# for pkg-config
MHD_LIBDEPS=""
-# for sendfile test
-SENDFILE_SOURCE_DIR=$srcdir
-
# Check system type
case "$host_os" in
*darwin* | *rhapsody* | *macosx*)
@@ -154,7 +151,6 @@ netbsd*)
# check if PlibC is available
CHECK_PLIBC
LIBS="$PLIBC_LIBS $LIBS"
- SENDFILE_SOURCE_DIR=$(cd $srcdir ; pwd -W)
AC_SUBST(PLIBC_LIBS)
AC_SUBST(PLIBC_LDFLAGS)
AC_SUBST(PLIBC_CPPFLAGS)
@@ -176,8 +172,6 @@ netbsd*)
;;
esac
-AC_SUBST(SENDFILE_SOURCE_DIR)
-
CHECK_PTHREAD
LIBS="$PTHREAD_LIBS $LIBS"
AC_SUBST(PTHREAD_LIBS)
@@ -431,7 +425,6 @@ src/include/plibc/Makefile
src/daemon/Makefile
src/examples/Makefile
src/testcurl/Makefile
-src/testcurl/daemontest_get_sendfile.c
src/testcurl/https/Makefile
src/testzzuf/Makefile])
AC_OUTPUT
diff --git a/src/testcurl/daemontest_get_sendfile.c b/src/testcurl/daemontest_get_sendfile.c
@@ -1,4 +1,3 @@
-/* DO NOT CHANGE THIS LINE */
/*
This file is part of libmicrohttpd
(C) 2007, 2009 Christian Grothoff
@@ -40,7 +39,9 @@
#include <unistd.h>
#endif
-#define TESTSTR "/* DO NOT CHANGE THIS LINE */"
+#define TESTSTR "This is the content of the test file we are sending using sendfile (if available)"
+
+char *sourcefile;
static int oneone;
@@ -87,11 +88,11 @@ ahc_echo (void *cls,
return MHD_YES;
}
*unused = NULL;
- fd = open ("daemontest_get_sendfile.c", O_RDONLY);
+ fd = open (sourcefile, O_RDONLY);
if (fd == -1)
{
fprintf (stderr, "Failed to open `%s': %s\n",
- "daemontest_get_sendfile.c",
+ sourcefile,
STRERROR (errno));
exit (1);
}
@@ -452,7 +453,27 @@ int
main (int argc, char *const *argv)
{
unsigned int errorCount = 0;
-
+ const char *tmp;
+ FILE *f;
+
+ if ( (NULL == (tmp = getenv ("TMPDIR"))) &&
+ (NULL == (tmp = getenv ("TMP"))) )
+ tmp = "/tmp";
+ sourcefile = malloc (strlen (tmp) + 32);
+ sprintf (sourcefile,
+ "%s%s%s",
+ tmp,
+ DIR_SEPARATOR_STR,
+ "test-mhd-sendfile");
+ f = fopen (sourcefile, "w");
+ if (NULL == f)
+ {
+ fprintf (stderr, "failed to write test file\n");
+ free (sourcefile);
+ return 1;
+ }
+ fwrite (TESTSTR, strlen (TESTSTR), 1, f);
+ fclose (f);
oneone = NULL != strstr (argv[0], "11");
if (0 != curl_global_init (CURL_GLOBAL_WIN32))
return 2;
@@ -464,5 +485,7 @@ main (int argc, char *const *argv)
if (errorCount != 0)
fprintf (stderr, "Error (code: %u)\n", errorCount);
curl_global_cleanup ();
+ UNLINK (sourcefile);
+ free (sourcefile);
return errorCount != 0; /* 0 == pass */
}
diff --git a/src/testcurl/daemontest_get_sendfile.c.in b/src/testcurl/daemontest_get_sendfile.c.in
@@ -1,470 +0,0 @@
-/* DO NOT CHANGE THIS LINE */
-/*
- This file is part of libmicrohttpd
- (C) 2007, 2009 Christian Grothoff
-
- libmicrohttpd is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- libmicrohttpd 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
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with libmicrohttpd; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file daemontest_get_sendfile.c
- * @brief Testcase for libmicrohttpd response from FD
- * @author Christian Grothoff
- */
-
-#include "MHD_config.h"
-#include "platform.h"
-#include <curl/curl.h>
-#include <microhttpd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <sys/types.h>
-#include <fcntl.h>
-
-#ifndef WINDOWS
-#include <sys/socket.h>
-#include <unistd.h>
-#endif
-
-#define TESTSTR "/* DO NOT CHANGE THIS LINE */"
-
-char *sourcefile = "@SENDFILE_SOURCE_DIR@/src/testcurl/daemontest_get_sendfile.c";
-
-static int oneone;
-
-struct CBC
-{
- char *buf;
- size_t pos;
- size_t size;
-};
-
-static size_t
-copyBuffer (void *ptr, size_t size, size_t nmemb, void *ctx)
-{
- struct CBC *cbc = ctx;
-
- if (cbc->pos + size * nmemb > cbc->size)
- return 0; /* overflow */
- memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb);
- cbc->pos += size * nmemb;
- return size * nmemb;
-}
-
-
-static int
-ahc_echo (void *cls,
- struct MHD_Connection *connection,
- const char *url,
- const char *method,
- const char *version,
- const char *upload_data, size_t *upload_data_size,
- void **unused)
-{
- static int ptr;
- const char *me = cls;
- struct MHD_Response *response;
- int ret;
- int fd;
-
- if (0 != strcmp (me, method))
- return MHD_NO; /* unexpected method */
- if (&ptr != *unused)
- {
- *unused = &ptr;
- return MHD_YES;
- }
- *unused = NULL;
- fd = open (sourcefile, O_RDONLY);
- if (fd == -1)
- {
- fprintf (stderr, "Failed to open `%s': %s\n",
- sourcefile,
- STRERROR (errno));
- exit (1);
- }
- response = MHD_create_response_from_fd (strlen (TESTSTR), fd);
- ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
- MHD_destroy_response (response);
- if (ret == MHD_NO)
- abort ();
- return ret;
-}
-
-
-static int
-testInternalGet ()
-{
- struct MHD_Daemon *d;
- CURL *c;
- char buf[2048];
- struct CBC cbc;
- CURLcode errornum;
-
- cbc.buf = buf;
- cbc.size = 2048;
- cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG,
- 11080, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
- if (d == NULL)
- return 1;
- c = curl_easy_init ();
- curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:11080/");
- curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer);
- curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc);
- curl_easy_setopt (c, CURLOPT_FAILONERROR, 1);
- curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L);
- curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L);
- if (oneone)
- curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
- else
- curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
- /* NOTE: use of CONNECTTIMEOUT without also
- setting NOSIGNAL results in really weird
- crashes on my system!*/
- curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1);
- if (CURLE_OK != (errornum = curl_easy_perform (c)))
- {
- fprintf (stderr,
- "curl_easy_perform failed: `%s'\n",
- curl_easy_strerror (errornum));
- curl_easy_cleanup (c);
- MHD_stop_daemon (d);
- return 2;
- }
- curl_easy_cleanup (c);
- MHD_stop_daemon (d);
- if (cbc.pos != strlen (TESTSTR))
- return 4;
- if (0 != strncmp (TESTSTR, cbc.buf, strlen (TESTSTR)))
- return 8;
- return 0;
-}
-
-static int
-testMultithreadedGet ()
-{
- struct MHD_Daemon *d;
- CURL *c;
- char buf[2048];
- struct CBC cbc;
- CURLcode errornum;
-
- cbc.buf = buf;
- cbc.size = 2048;
- cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_DEBUG,
- 1081, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
- if (d == NULL)
- return 16;
- c = curl_easy_init ();
- curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/");
- curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer);
- curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc);
- curl_easy_setopt (c, CURLOPT_FAILONERROR, 1);
- curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L);
- if (oneone)
- curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
- else
- curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
- curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L);
- /* NOTE: use of CONNECTTIMEOUT without also
- setting NOSIGNAL results in really weird
- crashes on my system! */
- curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1);
- if (CURLE_OK != (errornum = curl_easy_perform (c)))
- {
- fprintf (stderr,
- "curl_easy_perform failed: `%s'\n",
- curl_easy_strerror (errornum));
- curl_easy_cleanup (c);
- MHD_stop_daemon (d);
- return 32;
- }
- curl_easy_cleanup (c);
- MHD_stop_daemon (d);
- if (cbc.pos != strlen (TESTSTR))
- return 64;
- if (0 != strncmp (TESTSTR, cbc.buf, strlen (TESTSTR)))
- return 128;
- return 0;
-}
-
-static int
-testMultithreadedPoolGet ()
-{
- struct MHD_Daemon *d;
- CURL *c;
- char buf[2048];
- struct CBC cbc;
- CURLcode errornum;
-
- cbc.buf = buf;
- cbc.size = 2048;
- cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG,
- 1081, NULL, NULL, &ahc_echo, "GET",
- MHD_OPTION_THREAD_POOL_SIZE, 4, MHD_OPTION_END);
- if (d == NULL)
- return 16;
- c = curl_easy_init ();
- curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1081/");
- curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer);
- curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc);
- curl_easy_setopt (c, CURLOPT_FAILONERROR, 1);
- curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L);
- if (oneone)
- curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
- else
- curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
- curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L);
- /* NOTE: use of CONNECTTIMEOUT without also
- setting NOSIGNAL results in really weird
- crashes on my system!*/
- curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1);
- if (CURLE_OK != (errornum = curl_easy_perform (c)))
- {
- fprintf (stderr,
- "curl_easy_perform failed: `%s'\n",
- curl_easy_strerror (errornum));
- curl_easy_cleanup (c);
- MHD_stop_daemon (d);
- return 32;
- }
- curl_easy_cleanup (c);
- MHD_stop_daemon (d);
- if (cbc.pos != strlen (TESTSTR))
- return 64;
- if (0 != strncmp (TESTSTR, cbc.buf, strlen (TESTSTR)))
- return 128;
- return 0;
-}
-
-static int
-testExternalGet ()
-{
- struct MHD_Daemon *d;
- CURL *c;
- char buf[2048];
- struct CBC cbc;
- CURLM *multi;
- CURLMcode mret;
- fd_set rs;
- fd_set ws;
- fd_set es;
- int max;
- int running;
- struct CURLMsg *msg;
- time_t start;
- struct timeval tv;
-
- multi = NULL;
- cbc.buf = buf;
- cbc.size = 2048;
- cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_DEBUG,
- 1082, NULL, NULL, &ahc_echo, "GET", MHD_OPTION_END);
- if (d == NULL)
- return 256;
- c = curl_easy_init ();
- curl_easy_setopt (c, CURLOPT_URL, "http://127.0.0.1:1082/");
- curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer);
- curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc);
- curl_easy_setopt (c, CURLOPT_FAILONERROR, 1);
- if (oneone)
- curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
- else
- curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
- curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L);
- curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L);
- /* NOTE: use of CONNECTTIMEOUT without also
- setting NOSIGNAL results in really weird
- crashes on my system! */
- curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1);
-
-
- multi = curl_multi_init ();
- if (multi == NULL)
- {
- curl_easy_cleanup (c);
- MHD_stop_daemon (d);
- return 512;
- }
- mret = curl_multi_add_handle (multi, c);
- if (mret != CURLM_OK)
- {
- curl_multi_cleanup (multi);
- curl_easy_cleanup (c);
- MHD_stop_daemon (d);
- return 1024;
- }
- start = time (NULL);
- while ((time (NULL) - start < 5) && (multi != NULL))
- {
- max = 0;
- FD_ZERO (&rs);
- FD_ZERO (&ws);
- FD_ZERO (&es);
- curl_multi_perform (multi, &running);
- mret = curl_multi_fdset (multi, &rs, &ws, &es, &max);
- if (mret != CURLM_OK)
- {
- curl_multi_remove_handle (multi, c);
- curl_multi_cleanup (multi);
- curl_easy_cleanup (c);
- MHD_stop_daemon (d);
- return 2048;
- }
- if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &max))
- {
- curl_multi_remove_handle (multi, c);
- curl_multi_cleanup (multi);
- curl_easy_cleanup (c);
- MHD_stop_daemon (d);
- return 4096;
- }
- tv.tv_sec = 0;
- tv.tv_usec = 1000;
- select (max + 1, &rs, &ws, &es, &tv);
- curl_multi_perform (multi, &running);
- if (running == 0)
- {
- msg = curl_multi_info_read (multi, &running);
- if (msg == NULL)
- break;
- if (msg->msg == CURLMSG_DONE)
- {
- if (msg->data.result != CURLE_OK)
- printf ("%s failed at %s:%d: `%s'\n",
- "curl_multi_perform",
- __FILE__,
- __LINE__, curl_easy_strerror (msg->data.result));
- curl_multi_remove_handle (multi, c);
- curl_multi_cleanup (multi);
- curl_easy_cleanup (c);
- c = NULL;
- multi = NULL;
- }
- }
- MHD_run (d);
- }
- if (multi != NULL)
- {
- curl_multi_remove_handle (multi, c);
- curl_easy_cleanup (c);
- curl_multi_cleanup (multi);
- }
- MHD_stop_daemon (d);
- if (cbc.pos != strlen (TESTSTR))
- return 8192;
- if (0 != strncmp (TESTSTR, cbc.buf, strlen (TESTSTR)))
- return 16384;
- return 0;
-}
-
-static int
-testUnknownPortGet ()
-{
- struct MHD_Daemon *d;
- const union MHD_DaemonInfo *di;
- CURL *c;
- char buf[2048];
- struct CBC cbc;
- CURLcode errornum;
-
- struct sockaddr_in addr;
- socklen_t addr_len = sizeof(addr);
- memset(&addr, 0, sizeof(addr));
- addr.sin_family = AF_INET;
- addr.sin_port = 0;
- addr.sin_addr.s_addr = INADDR_ANY;
-
- cbc.buf = buf;
- cbc.size = 2048;
- cbc.pos = 0;
- d = MHD_start_daemon (MHD_USE_SELECT_INTERNALLY | MHD_USE_DEBUG,
- 1, NULL, NULL, &ahc_echo, "GET",
- MHD_OPTION_SOCK_ADDR, &addr,
- MHD_OPTION_END);
- if (d == NULL)
- return 32768;
-
- di = MHD_get_daemon_info (d, MHD_DAEMON_INFO_LISTEN_FD);
- if (di == NULL)
- return 65536;
-
- if (0 != getsockname(di->listen_fd, &addr, &addr_len))
- return 131072;
-
- if (addr.sin_family != AF_INET)
- return 26214;
-
- snprintf(buf, sizeof(buf), "http://127.0.0.1:%hu/",
- ntohs(addr.sin_port));
-
- c = curl_easy_init ();
- curl_easy_setopt (c, CURLOPT_URL, buf);
- curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer);
- curl_easy_setopt (c, CURLOPT_WRITEDATA, &cbc);
- curl_easy_setopt (c, CURLOPT_FAILONERROR, 1);
- curl_easy_setopt (c, CURLOPT_TIMEOUT, 150L);
- curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT, 15L);
- if (oneone)
- curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
- else
- curl_easy_setopt (c, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
- /* NOTE: use of CONNECTTIMEOUT without also
- setting NOSIGNAL results in really weird
- crashes on my system! */
- curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1);
- if (CURLE_OK != (errornum = curl_easy_perform (c)))
- {
- fprintf (stderr,
- "curl_easy_perform failed: `%s'\n",
- curl_easy_strerror (errornum));
- curl_easy_cleanup (c);
- MHD_stop_daemon (d);
- return 524288;
- }
- curl_easy_cleanup (c);
- MHD_stop_daemon (d);
- if (cbc.pos != strlen (TESTSTR))
- return 1048576;
- if (0 != strncmp (TESTSTR, cbc.buf, strlen (TESTSTR)))
- return 2097152;
- return 0;
-}
-
-
-int
-main (int argc, char *const *argv)
-{
- unsigned int errorCount = 0;
-
- oneone = NULL != strstr (argv[0], "11");
- if (0 != curl_global_init (CURL_GLOBAL_WIN32))
- return 2;
- errorCount += testInternalGet ();
- errorCount += testMultithreadedGet ();
- errorCount += testMultithreadedPoolGet ();
- errorCount += testExternalGet ();
- errorCount += testUnknownPortGet ();
- if (errorCount != 0)
- fprintf (stderr, "Error (code: %u)\n", errorCount);
- curl_global_cleanup ();
- return errorCount != 0; /* 0 == pass */
-}
