[libmicrohttpd] branch master updated (60cdf5f9 -> c2c728bc)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 60cdf5f9 chunked responses: alway unlock response if closing the 
connection
     new af75c70b Further improved PAGESIZE macro detection
     new c2c728bc Added new W32 project files to the tarball

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile.am                 | 11 ++++++-
 configure.ac                | 74 +++++++++++++++++++++++++++++++++++++++++++--
 src/microhttpd/memorypool.c |  9 +++++-
 3 files changed, 90 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7ef2f823..bf4e422c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,10 +32,19 @@ W32VS2019 = w32/VS2019/libmicrohttpd.vcxproj 
w32/VS2019/libmicrohttpd.vcxproj.fi
   w32/VS2019/hellobrowser.vcxproj w32/VS2019/hellobrowser.vcxproj.filters \
   w32/VS2019/simplepost.vcxproj w32/VS2019/largepost.vcxproj \
   w32/VS2019/libmicrohttpd.sln
+W32VS2022 = w32/VS2022/libmicrohttpd.vcxproj 
w32/VS2022/libmicrohttpd.vcxproj.filters \
+  w32/VS2022/hellobrowser.vcxproj w32/VS2022/hellobrowser.vcxproj.filters \
+  w32/VS2022/simplepost.vcxproj w32/VS2022/largepost.vcxproj \
+  w32/VS2022/libmicrohttpd.sln
+W32VSAV = w32/VS-Any-Version/libmicrohttpd.vcxproj 
w32/VS-Any-Version/libmicrohttpd.vcxproj.filters \
+  w32/VS-Any-Version/hellobrowser.vcxproj 
w32/VS-Any-Version/hellobrowser.vcxproj.filters \
+  w32/VS-Any-Version/simplepost.vcxproj w32/VS-Any-Version/largepost.vcxproj \
+  w32/VS-Any-Version/libmicrohttpd.sln
+
 EXTRA_DIST = \
   acinclude.m4 \
   libmicrohttpd.pc.in \
-  $(W32COMMON) $(W32VS2013) $(W32VS2015) $(W32VS2017) $(W32VS2019)
+  $(W32COMMON) $(W32VS2013) $(W32VS2015) $(W32VS2017) $(W32VS2019) 
$(W32VS2022) $(W32VSAV)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libmicrohttpd.pc
diff --git a/configure.ac b/configure.ac
index b922e2c3..169a4019 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1393,7 +1393,42 @@ choke me now
   ]
 )
 AS_VAR_IF([[mhd_cv_macro_pagesize_usable]], [["yes"]],
-  [AC_DEFINE([[MHD_USE_PAGESIZE_MACRO]],[[1]],[Define if you have usable 
PAGESIZE macro])],
+  [
+    AC_DEFINE([[MHD_USE_PAGESIZE_MACRO]],[[1]],[Define if you have usable 
PAGESIZE macro])
+    AC_CACHE_CHECK([whether PAGESIZE macro could be used for static init], 
[mhd_cv_macro_pagesize_usable_static],
+      [
+        AC_LINK_IFELSE(
+          [
+            AC_LANG_PROGRAM(
+              [[
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifndef PAGESIZE
+#error No PAGESIZE macro defined
+choke me now
+#endif
+static long ac_pgsz = PAGESIZE + 0;
+              ]],
+              [[
+                if (1 > ac_pgsz) return 1;
+              ]]
+            )
+          ],
+          [[mhd_cv_macro_pagesize_usable_static="yes"]], 
[[mhd_cv_macro_pagesize_usable_static="no"]]
+        )
+      ]
+    )
+    AS_VAR_IF([[mhd_cv_macro_pagesize_usable_static]], [["yes"]],
+      [AC_DEFINE([[MHD_USE_PAGESIZE_MACRO_STATIC]],[[1]],[Define if you have 
PAGESIZE macro usable for static init])]
+    )
+  ],
   [
     AC_CACHE_CHECK([for usable PAGE_SIZE macro], 
[mhd_cv_macro_page_size_usable],
       [
@@ -1426,7 +1461,42 @@ choke me now
       ]
     )
     AS_VAR_IF([[mhd_cv_macro_page_size_usable]], [["yes"]],
-      [AC_DEFINE([[MHD_USE_PAGE_SIZE_MACRO]],[[1]],[Define if you have usable 
PAGE_SIZE macro])]
+      [
+        AC_DEFINE([[MHD_USE_PAGE_SIZE_MACRO]],[[1]],[Define if you have usable 
PAGE_SIZE macro])
+        AC_CACHE_CHECK([whether PAGE_SIZE macro could be used for static 
init], [mhd_cv_macro_page_size_usable_static],
+          [
+            AC_LINK_IFELSE(
+              [
+                AC_LANG_PROGRAM(
+                  [[
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifndef PAGE_SIZE
+#error No PAGE_SIZE macro defined
+choke me now
+#endif
+static long ac_pgsz = PAGE_SIZE + 0;
+                  ]],
+                  [[
+                    if (1 > ac_pgsz) return 1;
+                  ]]
+                )
+              ],
+              [[mhd_cv_macro_page_size_usable_static="yes"]], 
[[mhd_cv_macro_page_size_usable_static="no"]]
+            )
+          ]
+        )
+        AS_VAR_IF([[mhd_cv_macro_page_size_usable_static]], [["yes"]],
+          [AC_DEFINE([[MHD_USE_PAGE_SIZE_MACRO_STATIC]],[[1]],[Define if you 
have PAGE_SIZE macro usable for static init])]
+        )
+      ]
     )
   ]
 )
diff --git a/src/microhttpd/memorypool.c b/src/microhttpd/memorypool.c
index cf0b897e..f963031e 100644
--- a/src/microhttpd/memorypool.c
+++ b/src/microhttpd/memorypool.c
@@ -120,7 +120,14 @@
 /**
  * Size of memory page
  */
-static size_t MHD_sys_page_size_ = _MHD_FALLBACK_PAGE_SIZE; /* Default 
fallback value */
+static size_t MHD_sys_page_size_ =
+#if defined(MHD_USE_PAGESIZE_MACRO_STATIC)
+  PAGESIZE;
+#elif defined(MHD_USE_PAGE_SIZE_MACRO_STATIC)
+  PAGE_SIZE;
+#else  /* ! MHD_USE_PAGE_SIZE_MACRO_STATIC */
+  _MHD_FALLBACK_PAGE_SIZE;   /* Default fallback value */
+#endif /* ! MHD_USE_PAGE_SIZE_MACRO_STATIC */
 
 /**
  * Initialise values for memory pools

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.