Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2020-04-07 10:25:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2 (Old) and /work/SRC/openSUSE:Factory/.apache2.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2" Tue Apr 7 10:25:21 2020 rev:167 rq:791205 version:2.4.43 Changes: -------- --- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2020-02-29 21:19:53.002008040 +0100 +++ /work/SRC/openSUSE:Factory/.apache2.new.3248/apache2.changes 2020-04-07 10:25:46.350126082 +0200 @@ -1,0 +2,128 @@ +Fri Apr 3 12:09:55 UTC 2020 - pgaj...@suse.com + +- declare ap_sock_disable_nagle to fix loading mod_proxy_http2 + (thanks to mli...@suse.com) +- modified patches + % httpd-visibility.patch (refreshed) + +------------------------------------------------------------------- +Thu Apr 2 08:56:48 UTC 2020 - pgaj...@suse.com + +- version update to 2.4.43 + *) mod_ssl: Fix memory leak of OCSP stapling response. [Yann Ylavic] + *) mod_proxy_http: Fix the forwarding of requests with content body when a + balancer member is unavailable; the retry on the next member was issued + with an empty body (regression introduced in 2.4.41). PR63891. + [Yann Ylavic] + *) mod_http2: Fixes issue where mod_unique_id would generate non-unique request + identifier under load, see <https://github.com/icing/mod_h2/issues/195>. + [Michael Kaufmann, Stefan Eissing] + *) mod_proxy_hcheck: Allow healthcheck expressions to use %{Content-Type}. + PR64140. [Renier Velazco <renier.velazco upr.edu>] + *) mod_authz_groupfile: Drop AH01666 from loglevel "error" to "info". + PR64172. + *) mod_usertrack: Add CookieSameSite, CookieHTTPOnly, and CookieSecure + to allow customization of the usertrack cookie. PR64077. + [Prashant Keshvani <prashant2400 gmail.com>, Eric Covener] + *) mod_proxy_ajp: Add "secret" parameter to proxy workers to implement legacy + AJP13 authentication. PR 53098. [Dmitry A. Bakshaev <dab1818 gmail com>] + *) mpm_event: avoid possible KeepAliveTimeout off by -100 ms. + [Eric Covener, Yann Ylavic] + *) Add a config layout for OpenWRT. [Graham Leggett] + *) Add support for cross compiling to apxs. If apxs is being executed from + somewhere other than its target location, add that prefix to includes and + library directories. Without this, apxs would fail to find config_vars.mk + and exit. [Graham Leggett] + *) mod_ssl: Disable client verification on ACME ALPN challenges. Fixes github + issue mod_md#172 (https://github.com/icing/mod_md/issues/172). + [Michael Kaufmann <mail michael-kaufmann.ch>, Stefan Eissing] + *) mod_ssl: use OPENSSL_init_ssl() to initialise OpenSSL on versions 1.1+. + [Graham Leggett] + *) mod_ssl: Support use of private keys and certificates from an + OpenSSL ENGINE via PKCS#11 URIs in SSLCertificateFile/KeyFile. + [Anderson Sasaki <ansasaki redhat.com>, Joe Orton] + *) mod_md: + - Prefer MDContactEmail directive to ServerAdmin for registration. New directive + thanks to Timothe Litt (@tlhackque). + - protocol check for pre-configured "tls-alpn-01" challenge has been improved. It will now + check all matching virtual hosts for protocol support. Thanks to @mkauf. + - Corrected a check when OCSP stapling was configured for hosts + where the responsible MDomain is not clear, by Michal Karm Babacek (@Karm). + - Softening the restrictions where mod_md configuration directives may appear. This should + allow for use in <If> and <Macro> sections. If all possible variations lead to the configuration + you wanted in the first place, is another matter. + [Michael Kaufmann <mail michael-kaufmann.ch>, Timothe Litt (@tlhackque), + Michal Karm Babacek (@Karm), Stefan Eissing (@icing)] + *) test: Added continuous testing with Travis CI. + This tests various scenarios on Ubuntu with the full test suite. + Architectures tested: amd64, s390x, ppc64le, arm64 + The tests pass successfully. + [Luca Toscano, Joe Orton, Mike Rumph, and others] + *) core: Be stricter in parsing of Transfer-Encoding headers. + [ZeddYu <zeddyu.lu gmail.com>, Eric Covener] + *) mod_ssl: negotiate the TLS protocol version per name based vhost + configuration, when linked with OpenSSL-1.1.1 or later. The base vhost's + SSLProtocol (from the first vhost declared on the IP:port) is now only + relevant if no SSLProtocol is declared for the vhost or globally, + otherwise the vhost or global value apply. [Yann Ylavic] + *) mod_cgi, mod_cgid: Fix a memory leak in some error cases with large script + output. PR 64096. [Joe Orton] + *) config: Speed up graceful restarts by using pre-hashed command table. PR 64066. + [Giovanni Bechis <giovanni paclan.it>, Jim Jagielski] + *) mod_systemd: New module providing integration with systemd. [Jan Kaluza] + *) mod_lua: Add r:headers_in_table, r:headers_out_table, r:err_headers_out_table, + r:notes_table, r:subprocess_env_table as read-only native table alternatives + that can be iterated over. [Eric Covener] + *) mod_http2: Fixed rare cases where a h2 worker could deadlock the main connection. + [Yann Ylavic, Stefan Eissing] + *) mod_lua: Accept nil assignments to the exposed tables (r.subprocess_env, + r.headers_out, etc) to remove the key from the table. PR63971. + [Eric Covener] + *) mod_http2: Fixed interaction with mod_reqtimeout. A loaded mod_http2 was disabling the + ssl handshake timeouts. Also, fixed a mistake of the last version that made `H2Direct` + always `on`, regardless of configuration. Found and reported by + <armin.abfalte...@united-security-providers.ch> and + <marcial.r...@united-security-providers.ch>. [Stefan Eissing] + *) mod_http2: Multiple field length violations in the same request no longer cause + several log entries to be written. [@mkauf] + *) mod_ssl: OCSP does not apply to proxy mode. PR 63679. + [Lubos Uhliarik <luhliari redhat.com>, Yann Ylavic] + *) mod_proxy_html, mod_xml2enc: Fix build issues with macOS due to r1864469 + [Jim Jagielski] + *) mod_authn_socache: Increase the maximum length of strings that can be cached by + the module from 100 to 256. PR 62149 [<thorsten.meinl knime.com>] + *) mod_proxy: Fix crash by resolving pool concurrency problems. PR 63503 + [Ruediger Pluem, Eric Covener] + *) core: On Windows, fix a start-up crash if <IfFile ...> is used with a path that is not + valid (For example, testing for a file on a flash drive that is not mounted) + [Christophe Jaillet] + *) mod_deflate, mod_brotli: honor "Accept-Encoding: foo;q=0" as per RFC 7231; which + means 'foo' is "not acceptable". PR 58158 [Chistophe Jaillet] + *) mod_md v2.2.3: + - Configuring MDCAChallenges replaces any previous existing challenge configuration. It + had been additive before which was not the intended behaviour. [@mkauf] + - Fixing order of ACME challenges used when nothing else configured. Code now behaves as + documented for `MDCAChallenges`. Fixes #156. Thanks again to @mkauf for finding this. + - Fixing a potential, low memory null pointer dereference [thanks to @uhliarik]. + - Fixing an incompatibility with a change in libcurl v7.66.0 that added unwanted + "transfer-encoding" to POST requests. This failed in directy communication with + Let's Encrypt boulder server. Thanks to @mkauf for finding and fixing. [Stefan Eissing] + *) mod_md: Adding the several new features. + The module offers an implementation of OCSP Stapling that can replace fully or + for a limited set of domains the existing one from mod_ssl. OCSP handling + is part of mod_md's monitoring and message notifications. If can be used + for sites that do not have ACME certificates. + The url for a CTLog Monitor can be configured. It is used in the server-status + to link to the external status page of a certicate. + The MDMessageCmd is called with argument "installed" when a new certificate + has been activated on server restart/reload. This allows for processing of + the new certificate, for example to applications that require it in different + locations or formats. + [Stefan Eissing] + *) mod_proxy_balancer: Fix case-sensitive referer check related to CSRF/XSS + protection. PR 63688. [Armin Abfalterer <a.abfalterer gmail.com>] +- deleted patches + - apache2-load-private-keys-from-pkcs11.patch (upstreamed) + - httpd-2.4.3-mod_systemd.patch (upstreamed) + +------------------------------------------------------------------- Old: ---- apache2-load-private-keys-from-pkcs11.patch httpd-2.4.3-mod_systemd.patch httpd-2.4.41.tar.bz2 httpd-2.4.41.tar.bz2.asc New: ---- httpd-2.4.43.tar.bz2 httpd-2.4.43.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.Cvtzlq/_old 2020-04-07 10:25:49.142129186 +0200 +++ /var/tmp/diff_new_pack.Cvtzlq/_new 2020-04-07 10:25:49.146129191 +0200 @@ -1,7 +1,7 @@ # # spec file for package apache2 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -65,12 +65,12 @@ %define build_http2 0 %endif Name: apache2 -Version: 2.4.41 +Version: 2.4.43 Release: 0 Summary: The Apache Web Server License: Apache-2.0 Group: Productivity/Networking/Web/Servers -Url: http://httpd.apache.org/ +URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/%{src_name}.tar.bz2 Source1: http://www.apache.org/dist/httpd/%{src_name}.tar.bz2.asc Source2: apache2.keyring @@ -140,14 +140,10 @@ Patch68: httpd-2.x.x-logresolve.patch Patch69: httpd-2.4.9-bnc690734.patch Patch70: httpd-implicit-pointer-decl.patch -# PATCH-FEATURE-UPSTREAM httpd-2.4.3-mod_systemd.patch crrodrig...@opensuse.org simple module provides systemd integration. -Patch109: httpd-2.4.3-mod_systemd.patch Patch111: httpd-visibility.patch # PATCH-FEATURE-UPSTREAM kstreit...@suse.com -- backport of HttpContentLengthHeadZero and HttpExpectStrict Patch115: httpd-2.4.x-fate317766-config-control-two-protocol-options.diff Patch116: deprecated-scripts-arch.patch -# https://svn.apache.org/viewvc?view=revision&revision=1874196 -Patch117: apache2-load-private-keys-from-pkcs11.patch BuildRequires: apache-rpm-macros-control BuildRequires: apr-util-devel #Since 2.4.7 the event MPM requires apr 1.5.0 or later. @@ -331,16 +327,11 @@ %patch68 -p1 %patch69 %patch70 -p1 -# Systemd module enabling patch -%if 0%{?suse_version} >= 1210 -%patch109 -p1 -%endif %patch111 -p1 %patch115 -p1 %if 0%{?suse_version} == 1110 %patch116 -p1 %endif -%patch117 -p1 cat %{_sourcedir}/SUSE-NOTICE >> NOTICE # install READMEs a=$(basename %{SOURCE22}) @@ -1359,7 +1350,6 @@ %{_sbindir}/rotatelogs %{_sbindir}/rotatelogs2 - %define install_httpd_link() \ ( \ # it might happen that apache2 including \ ++++++ httpd-2.4.41.tar.bz2 -> httpd-2.4.43.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/apache2/httpd-2.4.41.tar.bz2 /work/SRC/openSUSE:Factory/.apache2.new.3248/httpd-2.4.43.tar.bz2 differ: char 11, line 1 ++++++ httpd-visibility.patch ++++++ --- /var/tmp/diff_new_pack.Cvtzlq/_old 2020-04-07 10:25:49.738129849 +0200 +++ /var/tmp/diff_new_pack.Cvtzlq/_new 2020-04-07 10:25:49.742129854 +0200 @@ -1,7 +1,7 @@ -Index: httpd-2.4.25/include/ap_config.h +Index: httpd-2.4.43/include/ap_config.h =================================================================== ---- httpd-2.4.25.orig/include/ap_config.h 2012-08-15 01:59:24.000000000 +0200 -+++ httpd-2.4.25/include/ap_config.h 2017-01-02 10:33:40.411244315 +0100 +--- httpd-2.4.43.orig/include/ap_config.h 2020-04-03 13:38:03.445739206 +0200 ++++ httpd-2.4.43/include/ap_config.h 2020-04-03 13:38:05.477749175 +0200 @@ -64,7 +64,7 @@ * AP_DECLARE(rettype) ap_func(args) * @endcode @@ -43,10 +43,10 @@ #else /** * AP_MODULE_DECLARE_EXPORT is a no-op. Unless contradicted by the -Index: httpd-2.4.25/modules/cache/mod_cache.h +Index: httpd-2.4.43/modules/cache/mod_cache.h =================================================================== ---- httpd-2.4.25.orig/modules/cache/mod_cache.h 2011-12-03 19:02:24.000000000 +0100 -+++ httpd-2.4.25/modules/cache/mod_cache.h 2017-01-02 10:33:40.411244315 +0100 +--- httpd-2.4.43.orig/modules/cache/mod_cache.h 2020-04-03 13:38:03.445739206 +0200 ++++ httpd-2.4.43/modules/cache/mod_cache.h 2020-04-03 13:38:05.545749508 +0200 @@ -37,9 +37,9 @@ * CACHE_DECLARE_DATA with appropriate export and import tags for the platform */ @@ -60,11 +60,11 @@ #elif defined(CACHE_DECLARE_STATIC) #define CACHE_DECLARE(type) type __stdcall #define CACHE_DECLARE_NONSTD(type) type -Index: httpd-2.4.25/modules/proxy/mod_proxy.h +Index: httpd-2.4.43/modules/proxy/mod_proxy.h =================================================================== ---- httpd-2.4.25.orig/modules/proxy/mod_proxy.h 2016-10-24 12:06:41.000000000 +0200 -+++ httpd-2.4.25/modules/proxy/mod_proxy.h 2017-01-02 10:33:40.411244315 +0100 -@@ -535,9 +535,9 @@ struct proxy_balancer_method { +--- httpd-2.4.43.orig/modules/proxy/mod_proxy.h 2020-04-03 13:38:03.445739206 +0200 ++++ httpd-2.4.43/modules/proxy/mod_proxy.h 2020-04-03 13:38:05.545749508 +0200 +@@ -573,9 +573,9 @@ struct proxy_balancer_method { * PROXY_DECLARE_DATA with appropriate export and import tags for the platform */ #if !defined(WIN32) @@ -77,11 +77,11 @@ #elif defined(PROXY_DECLARE_STATIC) #define PROXY_DECLARE(type) type __stdcall #define PROXY_DECLARE_NONSTD(type) type -Index: httpd-2.4.25/modules/lua/mod_lua.h +Index: httpd-2.4.43/modules/lua/mod_lua.h =================================================================== ---- httpd-2.4.25.orig/modules/lua/mod_lua.h 2013-06-10 16:36:56.000000000 +0200 -+++ httpd-2.4.25/modules/lua/mod_lua.h 2017-01-02 10:33:40.411244315 +0100 -@@ -58,9 +58,9 @@ +--- httpd-2.4.43.orig/modules/lua/mod_lua.h 2020-04-03 13:38:03.445739206 +0200 ++++ httpd-2.4.43/modules/lua/mod_lua.h 2020-04-03 13:38:05.545749508 +0200 +@@ -62,9 +62,9 @@ * AP_LUA_DECLARE_DATA with appropriate export and import tags for the platform */ #if !defined(WIN32) @@ -94,10 +94,10 @@ #elif defined(AP_LUA_DECLARE_STATIC) #define AP_LUA_DECLARE(type) type __stdcall #define AP_LUA_DECLARE_NONSTD(type) type -Index: httpd-2.4.25/modules/core/mod_watchdog.h +Index: httpd-2.4.43/modules/core/mod_watchdog.h =================================================================== ---- httpd-2.4.25.orig/modules/core/mod_watchdog.h 2014-09-05 16:19:29.000000000 +0200 -+++ httpd-2.4.25/modules/core/mod_watchdog.h 2017-01-02 10:33:40.411244315 +0100 +--- httpd-2.4.43.orig/modules/core/mod_watchdog.h 2020-04-03 13:38:03.445739206 +0200 ++++ httpd-2.4.43/modules/core/mod_watchdog.h 2020-04-03 13:38:05.545749508 +0200 @@ -83,9 +83,9 @@ typedef struct ap_watchdog_t ap_watchdog */ #if !defined(AP_WD_DECLARE) @@ -111,10 +111,10 @@ #elif defined(AP_WD_DECLARE_STATIC) #define AP_WD_DECLARE(type) type __stdcall #define AP_WD_DECLARE_NONSTD(type) type -Index: httpd-2.4.25/modules/generators/mod_status.h +Index: httpd-2.4.43/modules/generators/mod_status.h =================================================================== ---- httpd-2.4.25.orig/modules/generators/mod_status.h 2006-07-11 22:33:53.000000000 +0200 -+++ httpd-2.4.25/modules/generators/mod_status.h 2017-01-02 10:33:40.411244315 +0100 +--- httpd-2.4.43.orig/modules/generators/mod_status.h 2020-04-03 13:38:03.445739206 +0200 ++++ httpd-2.4.43/modules/generators/mod_status.h 2020-04-03 13:38:05.545749508 +0200 @@ -34,9 +34,9 @@ #define AP_STATUS_EXTENDED (0x4) /* detailed report */ @@ -128,10 +128,10 @@ #elif defined(STATUS_DECLARE_STATIC) #define STATUS_DECLARE(type) type __stdcall #define STATUS_DECLARE_NONSTD(type) type -Index: httpd-2.4.25/modules/dav/main/mod_dav.h +Index: httpd-2.4.43/modules/dav/main/mod_dav.h =================================================================== ---- httpd-2.4.25.orig/modules/dav/main/mod_dav.h 2016-10-26 15:44:36.000000000 +0200 -+++ httpd-2.4.25/modules/dav/main/mod_dav.h 2017-01-02 10:33:40.411244315 +0100 +--- httpd-2.4.43.orig/modules/dav/main/mod_dav.h 2020-04-03 13:38:03.445739206 +0200 ++++ httpd-2.4.43/modules/dav/main/mod_dav.h 2020-04-03 13:38:05.549749528 +0200 @@ -82,9 +82,9 @@ extern "C" { * DAV_DECLARE_DATA with appropriate export and import tags for the platform */ @@ -145,10 +145,10 @@ #elif defined(DAV_DECLARE_STATIC) #define DAV_DECLARE(type) type __stdcall #define DAV_DECLARE_NONSTD(type) type -Index: httpd-2.4.25/modules/session/mod_session.h +Index: httpd-2.4.43/modules/session/mod_session.h =================================================================== ---- httpd-2.4.25.orig/modules/session/mod_session.h 2011-12-02 18:51:27.000000000 +0100 -+++ httpd-2.4.25/modules/session/mod_session.h 2017-01-02 10:33:40.411244315 +0100 +--- httpd-2.4.43.orig/modules/session/mod_session.h 2020-04-03 13:38:03.445739206 +0200 ++++ httpd-2.4.43/modules/session/mod_session.h 2020-04-03 13:38:05.549749528 +0200 @@ -21,9 +21,9 @@ * SESSION_DECLARE_DATA with appropriate export and import tags for the platform */ @@ -162,10 +162,10 @@ #elif defined(SESSION_DECLARE_STATIC) #define SESSION_DECLARE(type) type __stdcall #define SESSION_DECLARE_NONSTD(type) type -Index: httpd-2.4.25/modules/database/mod_dbd.h +Index: httpd-2.4.43/modules/database/mod_dbd.h =================================================================== ---- httpd-2.4.25.orig/modules/database/mod_dbd.h 2011-09-23 15:38:09.000000000 +0200 -+++ httpd-2.4.25/modules/database/mod_dbd.h 2017-01-02 10:33:40.411244315 +0100 +--- httpd-2.4.43.orig/modules/database/mod_dbd.h 2020-04-03 13:38:03.445739206 +0200 ++++ httpd-2.4.43/modules/database/mod_dbd.h 2020-04-03 13:38:05.549749528 +0200 @@ -35,9 +35,9 @@ * DBD_DECLARE_DATA with appropriate export and import tags for the platform */ @@ -179,10 +179,10 @@ #elif defined(DBD_DECLARE_STATIC) #define DBD_DECLARE(type) type __stdcall #define DBD_DECLARE_NONSTD(type) type -Index: httpd-2.4.25/modules/filters/mod_xml2enc.h +Index: httpd-2.4.43/modules/filters/mod_xml2enc.h =================================================================== ---- httpd-2.4.25.orig/modules/filters/mod_xml2enc.h 2012-04-04 22:11:57.000000000 +0200 -+++ httpd-2.4.25/modules/filters/mod_xml2enc.h 2017-01-02 10:33:40.411244315 +0100 +--- httpd-2.4.43.orig/modules/filters/mod_xml2enc.h 2020-04-03 13:38:03.445739206 +0200 ++++ httpd-2.4.43/modules/filters/mod_xml2enc.h 2020-04-03 13:38:05.549749528 +0200 @@ -25,9 +25,9 @@ /* declarations to deal with WIN32 compile-flag-in-source-code crap */ @@ -196,10 +196,10 @@ #elif defined(XML2ENC_DECLARE_STATIC) #define XML2ENC_DECLARE(type) type __stdcall #define XML2ENC_DECLARE_NONSTD(type) type -Index: httpd-2.4.25/modules/filters/mod_ratelimit.h +Index: httpd-2.4.43/modules/filters/mod_ratelimit.h =================================================================== ---- httpd-2.4.25.orig/modules/filters/mod_ratelimit.h 2012-04-04 22:11:57.000000000 +0200 -+++ httpd-2.4.25/modules/filters/mod_ratelimit.h 2017-01-02 10:33:40.415244421 +0100 +--- httpd-2.4.43.orig/modules/filters/mod_ratelimit.h 2020-04-03 13:38:03.445739206 +0200 ++++ httpd-2.4.43/modules/filters/mod_ratelimit.h 2020-04-03 13:38:05.549749528 +0200 @@ -21,9 +21,9 @@ * AP_RL_DECLARE_DATA with appropriate export and import tags for the platform */ @@ -213,10 +213,10 @@ #elif defined(AP_RL_DECLARE_STATIC) #define AP_RL_DECLARE(type) type __stdcall #define AP_RL_DECLARE_NONSTD(type) type -Index: httpd-2.4.25/modules/aaa/mod_authz_dbd.h +Index: httpd-2.4.43/modules/aaa/mod_authz_dbd.h =================================================================== ---- httpd-2.4.25.orig/modules/aaa/mod_authz_dbd.h 2011-09-23 15:38:09.000000000 +0200 -+++ httpd-2.4.25/modules/aaa/mod_authz_dbd.h 2017-01-02 10:33:40.415244421 +0100 +--- httpd-2.4.43.orig/modules/aaa/mod_authz_dbd.h 2020-04-03 13:38:03.445739206 +0200 ++++ httpd-2.4.43/modules/aaa/mod_authz_dbd.h 2020-04-03 13:38:05.549749528 +0200 @@ -22,9 +22,9 @@ * AUTHZ_DBD_DECLARE_DATA with appropriate export and import tags */ @@ -230,10 +230,10 @@ #elif defined(AUTHZ_DBD_DECLARE_STATIC) #define AUTHZ_DBD_DECLARE(type) type __stdcall #define AUTHZ_DBD_DECLARE_NONSTD(type) type -Index: httpd-2.4.25/include/httpd.h +Index: httpd-2.4.43/include/httpd.h =================================================================== ---- httpd-2.4.25.orig/include/httpd.h 2016-12-05 15:34:29.000000000 +0100 -+++ httpd-2.4.25/include/httpd.h 2017-01-02 10:33:40.415244421 +0100 +--- httpd-2.4.43.orig/include/httpd.h 2020-04-03 13:38:03.445739206 +0200 ++++ httpd-2.4.43/include/httpd.h 2020-04-03 13:38:05.549749528 +0200 @@ -345,7 +345,7 @@ extern "C" { * by modules. Its purpose is to allow us to add attributes that * particular platforms or compilers require to every exported function. @@ -269,10 +269,10 @@ #endif /** -Index: httpd-2.4.25/include/util_ldap.h +Index: httpd-2.4.43/include/util_ldap.h =================================================================== ---- httpd-2.4.25.orig/include/util_ldap.h 2016-08-25 14:48:18.000000000 +0200 -+++ httpd-2.4.25/include/util_ldap.h 2017-01-02 10:33:40.415244421 +0100 +--- httpd-2.4.43.orig/include/util_ldap.h 2020-04-03 13:38:03.445739206 +0200 ++++ httpd-2.4.43/include/util_ldap.h 2020-04-03 13:38:05.549749528 +0200 @@ -66,9 +66,9 @@ * and import tags for the platform */ @@ -286,3 +286,16 @@ #elif defined(LDAP_DECLARE_STATIC) #define LDAP_DECLARE(type) type __stdcall #define LDAP_DECLARE_NONSTD(type) type +Index: httpd-2.4.43/include/mpm_common.h +=================================================================== +--- httpd-2.4.43.orig/include/mpm_common.h 2018-08-14 22:56:54.000000000 +0200 ++++ httpd-2.4.43/include/mpm_common.h 2020-04-03 13:40:10.698363488 +0200 +@@ -195,7 +195,7 @@ AP_DECLARE(void) ap_wait_or_timeout(apr_ + * Nagle's algorithm that have severe performance penalties. + * @param s The socket to disable nagle for. + */ +-void ap_sock_disable_nagle(apr_socket_t *s); ++AP_DECLARE(void) ap_sock_disable_nagle(apr_socket_t *s); + #else + #define ap_sock_disable_nagle(s) /* NOOP */ + #endif
