Commit Graph
1346 Commits
Author SHA1 Message Date
Christian Grothoff 3de91d17fd From: Karlson2k <k2k@narod.ru>
Date: Wed, 12 Feb 2014 14:19:34 +0400
Subject: [PATCH] Fix _MHD_EXTERN if "platform.h" is included in external file
2014-02-12 16:36:42 +00:00
Christian Grothoff da3b07ecb8 clarification to documentation by Evgeny Grin 2014-02-11 18:43:17 +00:00
Christian Grothoff acfaee5a4f Patch from Karlson2k: fix MHD_get_fdset to accept NULL as max_fd, as described in
doxy
2014-02-11 16:44:27 +00:00
Christian Grothoff c07b4f1057 -doxygen, style and indentation fixes to microspdy.h 2014-02-08 14:22:22 +00:00
Christian Grothoff 5ae9cc7f06 size_t vs. int fixes by Evgeny Grin, plus some additional fixes by CG 2014-02-08 14:09:04 +00:00
Christian Grothoff a4e4998a29 -cosmetic patch from Evgeny Grin 2014-02-08 14:02:05 +00:00
Christian Grothoff e0c9a49f61 Karlson2k: fix makefiles: src/daemon -> src/microhttpd 2014-02-04 13:51:27 +00:00
Christian Grothoff 8251a574fb Karlson2k: Fix win32 cURL tests 2014-02-04 13:51:06 +00:00
LRN 0d8aeae6df Add decl check for _stati64 (required for newer plibc)
Remove redundant -no-undefined (it's part of mandatory MHD_LIB_LDFLAGS
now)

Remove --export-all-symbols for W32 (visibility is used instead)
Add -fvisibility=hidden configure check (shamelessly borrowed from GTK)

Remove unused -export-symbols-regex check

Define _MHD_EXTERN to "extern" if it's undefined (this is what clients
get)

Mark all public functions with _MHD_EXTERN

Remove HIDDEN_SYMBOL definition

Don't mark hidden functions with HIDDEN_SYMBOL (everything that is not
explicitly public is hidden by default now)

Change constructor macros a bit to apply _MHD_EXTERN to them cleanly

Use HIDDEN_VISIBILITY_CFLAGS when compiling libraries

Remove EXPORT.sym files, don't mention them in EXTRA_DIST, don't use
them to define a list of exported functions

Remove redundant -no-undefined, make sure only the one that gets into
Makefiles directly remains, remove -Wl prefix from it
2014-01-27 06:59:02 +00:00
Christian Grothoff 34644b55bb use -Wl on -no-undefined as it is a linker option: 2014-01-26 23:17:36 +00:00
Christian Grothoff 73659c8e20 -bump 2014-01-22 08:48:22 +00:00
Christian Grothoff dd902f337b Luke-Jr wrote:
MHD_USE_DUAL_STACK in libmicrohttpd currently just *inhibits setting* the 
IPV6_V6ONLY socket option, but per Microsoft's documentation 
http://msdn.microsoft.com/en-us/library/windows/desktop/bb513665(v=vs.85).aspx
the default on Windows is that this is enabled, thus MHD_USE_DUAL_STACK will 
not work (since it leaves the default). libmicrohttpd should probably just 
unconditionally set IPV6_V6ONLY to the desired value when the option is 
available.

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 0a33b77..3cbf28e 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3493,8 +3493,7 @@ MHD_start_daemon_va (unsigned int flags,
 	}
       daemon->socket_fd = socket_fd;
 
-      if ( (0 != (flags & MHD_USE_IPv6)) &&
-	   (MHD_USE_DUAL_STACK != (flags & MHD_USE_DUAL_STACK)) )
+      if (0 != (flags & MHD_USE_IPv6))
 	{
 #ifdef IPPROTO_IPV6
 #ifdef IPV6_V6ONLY
@@ -3503,10 +3502,11 @@ MHD_start_daemon_va (unsigned int flags,
 	     and may also be missing on older POSIX systems; good luck if you have 
any of those,
 	     your IPv6 socket may then also bind against IPv4 anyway... */
 #ifndef WINDOWS
-	  const int on = 1;
+	  const int
 #else
-	  const char on = 1;
+	  const char
 #endif
+		 on = (MHD_USE_DUAL_STACK != (flags & MHD_USE_DUAL_STACK));
 	  if ( (0 > SETSOCKOPT (socket_fd,
 				IPPROTO_IPV6, IPV6_V6ONLY,
 				&on, sizeof (on))) &&
2014-01-22 08:47:48 +00:00
Christian Grothoff 5534659f20 -grammar 2014-01-13 15:15:18 +00:00
Christian Grothoff 3d8a80474e -version bump 2014-01-01 20:51:45 +00:00
Christian Grothoff e4e05d001c enable use of keep-alive with http 1.0 if explicitly requested by the client 2014-01-01 20:43:44 +00:00
Andrey Uzunov cb11cac74d mhd2spdy: usage info 2013-12-28 20:45:25 +00:00
Andrey Uzunov c81afd7682 spdy: fixed bug when adding header with NULL value 2013-12-28 18:43:28 +00:00
Christian Grothoff d064f75e0d -fix dist by adding missing files 2013-12-28 14:40:26 +00:00
Christian Grothoff d5c3be3703 -ignore 2013-12-24 14:46:02 +00:00
Christian Grothoff 0feaaea8b0 -re-adding logic to restrict exported symbols via linker, unsure how/when that disappeared 2013-12-24 14:20:38 +00:00
Christian Grothoff e25c43fcc0 -hiding a few more 2013-12-24 11:32:11 +00:00
Christian Grothoff 9cc7bd0c77 -missing include 2013-12-24 11:29:09 +00:00
Christian Grothoff a372d23b4e -hide symbols 2013-12-24 11:28:30 +00:00
Christian Grothoff 324e9852db -work around compiler warnings 2013-12-22 13:55:17 +00:00
Christian Grothoff 33affa9d1e -releasing 0.9.33 2013-12-21 16:30:55 +00:00
Christian Grothoff 9889fd9eee add support for SNI 2013-12-21 16:28:54 +00:00
Christian Grothoff 00a9277f49 -fix postexample 2013-12-21 16:27:06 +00:00
Christian Grothoff 602e9c6829 -fix issue with sendfile incrementing buffer offset when it should not 2013-12-20 16:04:06 +00:00
Matthias Wachs 4eede83e0d remove debug message 2013-12-20 14:00:48 +00:00
Christian Grothoff fe6f6a8589 -sadly, this freaks out automake badly 2013-12-11 19:40:20 +00:00
Christian Grothoff 2aa75f592d -check for makeinfo 2013-12-10 13:04:15 +00:00
Christian Grothoff e82e13bba5 fixing #3179 2013-12-09 20:43:13 +00:00
Andrey Uzunov d7a7a47de5 mhd2spdy: minor bugs fixed 2013-12-08 22:05:57 +00:00
Christian Grothoff 38fad29b45 -fix build issue without HTTPS and compiler warnings, as reported by Dilyan Palauzov
on the mailinglist
2013-12-06 23:45:41 +00:00
Christian Grothoff d9999d6650 -version bumps and chlogs for 0.9.32 release 2013-12-03 20:33:47 +00:00
Christian Grothoff 1be2534e86 -fix tests for MHD_USE_SUSPEND_RESUME 2013-12-03 20:32:51 +00:00
Christian Grothoff 3b654bd5b7 -newline 2013-12-03 20:28:46 +00:00
Christian Grothoff 0ff9edee27 -bump version 2013-12-03 20:12:05 +00:00
Christian Grothoff 04ca76e78e Adding Matt Holiday's fixes to suspend/resume logic
(plus documentation updates).
2013-12-03 20:11:34 +00:00
Christian Grothoff 4245c6e9c3 eliminate theoretical stack overflow 2013-11-29 19:18:51 +00:00
Christian Grothoff ba6b6cad9a -handle case that original allocation request was zero 2013-11-28 10:05:52 +00:00
Christian Grothoff 2c771abfa3 -fix theoretical overflow issue reported by Florian Weimer 2013-11-28 09:16:38 +00:00
Christian Grothoff 76e66153b5 -fix year 2013-11-26 20:34:11 +00:00
Christian Grothoff 8ba82afc4b -fix shutdown race for wpipe on non-Linux systems 2013-11-26 00:28:14 +00:00
Christian Grothoff 74e0a68567 -fixes to MHD_suspend_connection 2013-11-25 21:51:08 +00:00
Christian Grothoff 015495e471 -removing whitespace 2013-11-17 15:52:01 +00:00
Christian Grothoff 802d528bad -fix warnings in manual build 2013-11-04 12:53:34 +00:00
LRN c23a68c7b3 Force the use of non-parallel testsuite 2013-10-30 15:34:40 +00:00
Christian Grothoff 3fb38e6948 -fix post processor, expanded test suite to cover garbage before payload 2013-10-30 08:35:28 +00:00
LRN e524263be2 Add a variant of multipart preprocessor test that splits data in two parts
before feeding it to the preprocessor, trying all possible points where data
can be split. Prior to r30427 this test would have crashed only if data is
split at the very beginning (< 11). After r30427 this test crashes every time
the data is split somewhere around the boundary.
At least that is the case on W32.
2013-10-30 00:53:38 +00:00