SLFO-pool/libmicrohttpd
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main libmicrohttpd revision cc04b13fdae944e36b965eef5b5d3437

Browse Source
This commit is contained in:
Adrian Schröter
2025-05-23 18:27:16 +02:00
parent 14654083c5
commit 3381e2d459
7 changed files with 106 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
libmicrohttpd-0.9.77.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

BIN
libmicrohttpd-0.9.77.tar.gz.sig
View File

Binary file not shown.

63
libmicrohttpd-1.0.1-curl-8.13.0.patch Normal file
View File

@@ -0,0 +1,63 @@
From 036f8fdec2802e48e2555b2caf381bb1c565ab82 Mon Sep 17 00:00:00 2001
From: "Evgeny Grin (Karlson2k)" <k2k@narod.ru>
Date: Fri, 11 Apr 2025 20:13:48 +0300
Subject: test_tricky.c: applied a minimal fix for the libcurl >= 8.13.0
---
src/testcurl/test_tricky.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/src/testcurl/test_tricky.c b/src/testcurl/test_tricky.c
index 8cb53a80..bcbcf1ce 100644
--- a/src/testcurl/test_tricky.c
+++ b/src/testcurl/test_tricky.c
@@ -452,6 +452,11 @@ struct curlQueryParams
CURLU *url;
#endif /* CURL_AT_LEAST_VERSION(7, 62, 0) */
+#if CURL_AT_LEAST_VERSION (7, 55, 0)
+ /* A string used as the request target directly, without modifications */
+ const char *queryTarget;
+#endif /* CURL_AT_LEAST_VERSION(7, 55, 0) */
+
/* Custom query method, NULL for default */
const char *method;
@@ -520,6 +525,16 @@ curlEasyInitForTest (struct curlQueryParams *p,
libcurlErrorExitDesc ("curl_easy_setopt() failed");
}
#endif /* CURL_AT_LEAST_VERSION(7, 62, 0) */
+
+#if CURL_AT_LEAST_VERSION (7, 55, 0)
+ if (NULL != p->queryTarget)
+ {
+ if (CURLE_OK != curl_easy_setopt (c, CURLOPT_REQUEST_TARGET,
+ p->queryTarget))
+ libcurlErrorExitDesc ("curl_easy_setopt() failed");
+ }
+#endif /* CURL_AT_LEAST_VERSION(7, 55, 0) */
+
return c;
}
@@ -738,6 +753,9 @@ performTestQueries (struct MHD_Daemon *d, uint16_t d_port,
qParam.queryPort = d_port;
qParam.method = NULL; /* Use libcurl default: GET */
qParam.queryPath = URL_SCHEME_HOST EXPECTED_URI_BASE_PATH;
+#if CURL_AT_LEAST_VERSION (7, 55, 0)
+ qParam.queryTarget = NULL;
+#endif /* CURL_AT_LEAST_VERSION(7, 55, 0) */
#if CURL_AT_LEAST_VERSION (7, 62, 0)
qParam.url = NULL;
#endif /* CURL_AT_LEAST_VERSION(7, 62, 0) */
@@ -781,6 +799,7 @@ performTestQueries (struct MHD_Daemon *d, uint16_t d_port,
libcurlErrorExit ();
qParam.queryPath = NULL;
+ qParam.queryTarget = EXPECTED_URI_BASE_PATH_TRICKY;
uri_cb_param->uri = EXPECTED_URI_BASE_PATH_TRICKY;
ahc_param->rq_url = EXPECTED_URI_BASE_PATH_TRICKY;
--
cgit v1.2.3

BIN
libmicrohttpd-1.0.1.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
libmicrohttpd-1.0.1.tar.gz.sig Normal file
View File

Binary file not shown.

35
libmicrohttpd.changes
View File

@@ -1,3 +1,32 @@
-------------------------------------------------------------------
Fri Apr 11 18:04:05 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
- fix build with curl 8.13.0 (boo#1241036)
add libmicrohttpd-1.0.1-curl-8.13.0.patch
-------------------------------------------------------------------
Sat Feb 24 18:15:45 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
- libmicrohttpd 1.0.1:
* build system fixes
-------------------------------------------------------------------
Mon Feb 5 18:21:53 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
- libmicrohttpd 1.0.0:
* first stable release
* Client request parsing was rewritten to RFC 9910 and RFC 9112
* Support for strict and lenient specification enforcement
* Digest Auth was reworked, improved support for RFC 7617
* Improved functionality in multi-threading environment,
especially with external sockets polling modes.
* Reworked Basic Auth, adding new convenient API functions.
* Re-implemented GnuTLS initialisation. Now supported
libmicrohttpd-specific system-wide configuration, as well as
generic GnuTLS system-wide configuration. Application may adjust
settings based on system configuration instead of specifying its
own full configuration.
-------------------------------------------------------------------
Wed May 31 04:59:03 UTC 2023 - Andreas Stieger <Andreas.Stieger@gmx.de>
@@ -7,7 +36,7 @@ Wed May 31 04:59:03 UTC 2023 - Andreas Stieger <Andreas.Stieger@gmx.de>
* fix processing of folded headers in requests
* fix functionality with blocking sockets
- update upstream signing key
-------------------------------------------------------------------
Tue Feb 28 21:20:34 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
@@ -75,7 +104,7 @@ Sat Jul 4 17:40:48 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
- libmicrohttpd 0.9.71:
* Fix buffer overflow issue in URL parser [boo#1173718]
* Fixed PostProcessor bug
* Documentation and example fixes
* Documentation and example fixes
-------------------------------------------------------------------
Sun Feb 9 10:15:21 UTC 2020 - Martin Hauke <mardnh@gmx.de>
@@ -467,7 +496,7 @@ Sun May 3 10:26:32 UTC 2015 - astieger@suse.com
- update to 0.9.41:
* fix bugs relating to various threading modes
* fix some HTTP 1.0 tests
* fix some HTTP 1.0 tests
-------------------------------------------------------------------
Mon Apr 13 11:39:23 UTC 2015 - meissner@suse.com

18
libmicrohttpd.spec
View File

@@ -3,6 +3,7 @@
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2010,2011,2012 Stephan Kleine
# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +21,7 @@
%global sover 12
%global libname %{name}%{sover}
Name: libmicrohttpd
Version: 0.9.77
Version: 1.0.1
Release: 0
Summary: Small Embeddable HTTP Server Library
# Some internal tests are licenced as GPL-3.0+ - they are only used in
@@ -31,6 +32,7 @@ URL: https://www.gnu.org/software/libmicrohttpd/
Source0: https://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
Source1: https://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz.sig
Source2: https://savannah.gnu.org/people/viewgpg.php?user_id=90068#/%{name}.keyring
Patch0: libmicrohttpd-1.0.1-curl-8.13.0.patch
BuildRequires: libtool
BuildRequires: makeinfo
BuildRequires: pkgconfig >= 0.9.0
@@ -85,7 +87,7 @@ Headers, pkg-config files, so link and other development files for %{name}
(%{summary}).
%prep
%setup -q
%autosetup -p1
%build
%configure \
@@ -97,8 +99,8 @@ Headers, pkg-config files, so link and other development files for %{name}
--enable-https \
--enable-curl \
--disable-static \
--disable-examples
--disable-examples \
%{nil}
%make_build
%install
@@ -107,13 +109,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
rm -v %{buildroot}%{_infodir}/%{name}_performance_data.png
%check
# Parallel execution of tests fail
# Tests randomly fail so keep them in log for inspection rather than for valid
# verification of anything.
%make_build -j1 check || :
%make_build check
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
%ldconfig_scriptlets -n %{libname}
%files -n %{libname}
%license COPYING