Accepting request 826679 from Apache

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/826679
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=169

apache2-mod_proxy_uwsgi-fix-crash.patch

@@ -1,5 +1,7 @@
---- a/modules/proxy/mod_proxy_uwsgi.c	2020/07/15 07:48:38	1879877
+Index: httpd-2.4.46/modules/proxy/mod_proxy_uwsgi.c
-+++ b/modules/proxy/mod_proxy_uwsgi.c	2020/07/15 08:24:13	1879878
+===================================================================
+--- httpd-2.4.46.orig/modules/proxy/mod_proxy_uwsgi.c	2020-07-24 11:35:25.000000000 +0200
++++ httpd-2.4.46/modules/proxy/mod_proxy_uwsgi.c	2020-08-07 14:03:05.266134827 +0200
 @@ -175,7 +175,7 @@ static int uwsgi_send_headers(request_re
      env = (apr_table_entry_t *) env_table->elts;
  
@@ -8,8 +10,8 @@
 +        headerlen += 2 + strlen(env[j].key) + 2 + (env[j].val ? strlen(env[j].val) : 0);
      }
  
-     ptr = buf = apr_palloc(r->pool, headerlen);
+     pktsize = headerlen - 4;
-@@ -189,10 +189,12 @@ static int uwsgi_send_headers(request_re
+@@ -198,10 +198,12 @@ static int uwsgi_send_headers(request_re
          memcpy(ptr, env[j].key, keylen);
          ptr += keylen;
  
@@ -24,4 +26,3 @@
          ptr += vallen;
      }
  
-

apache2.changes

@@ -1,3 +1,61 @@
+-------------------------------------------------------------------
+Fri Aug  7 12:25:58 UTC 2020 - pgajdos@suse.com
+
+- version update to 2.4.46
+  Changes with Apache 2.4.46
+  *) mod_proxy_fcgi: Fix build warnings for Windows platform
+     [Eric Covener, Christophe Jaillet]
+  Changes with Apache 2.4.45
+  *) mod_http2: remove support for abandoned http-wg draft
+     <https://datatracker.ietf.org/doc/draft-kazuho-h2-cache-digest/>.
+     [Stefan Eissing]
+  Changes with Apache 2.4.44
+  *) mod_proxy_uwsgi: Error out on HTTP header larger than 16K (hard
+     protocol limit).  [Yann Ylavic]
+  *) mod_http2:
+     Fixes <https://github.com/icing/mod_h2/issues/200>:
+     "LimitRequestFields 0" now disables the limit, as documented.
+     Fixes <https://github.com/icing/mod_h2/issues/201>:
+     Do not count repeated headers with same name against the field
+     count limit. The are merged internally, as if sent in a single HTTP/1 line.
+     [Stefan Eissing]
+  *) mod_http2: Avoid segfaults in case of handling certain responses for
+     already aborted connections.  [Stefan Eissing, Ruediger Pluem]
+  *) mod_http2: The module now handles master/secondary connections and has marked
+     methods according to use. [Stefan Eissing]
+  *) core: Drop an invalid Last-Modified header value coming
+     from a FCGI/CGI script instead of replacing it with Unix epoch.
+     [Yann Ylavic, Luca Toscano]
+  *) Add support for strict content-length parsing through addition of
+     ap_parse_strict_length() [Yann Ylavic]
+  *) mod_proxy_fcgi: ProxyFCGISetEnvIf unsets variables when expression
+     evaluates to false.  PR64365. [Michael König <mail ikoenig.net>]
+  *) mod_proxy_http: flush spooled request body in one go to avoid
+     leaking (or long lived) temporary file. PR 64452. [Yann Ylavic]
+  *) mod_ssl: Fix a race condition and possible crash when using a proxy client
+     certificate (SSLProxyMachineCertificateFile).
+     [Armin Abfalterer <a.abfalterer gmail.com>]
+  *) mod_ssl: Fix memory leak in stapling code. PR63687. [Stefan Eissing]
+  *) mod_http2: Fixed regression that no longer set H2_STREAM_ID and H2_STREAM_TAG.
+     PR64330 [Stefan Eissing]
+  *) mod_http2: Fixed regression that caused connections to close when mod_reqtimeout
+     was configured with a handshake timeout. Fixes gitub issue #196.
+     [Stefan Eissing]
+  *) mod_proxy_http2: the "ping" proxy parameter
+     (see <https://httpd.apache.org/docs/2.4/mod/mod_proxy.html>) is now used
+     when checking the liveliness of a new or reused h2 connection to the backend.
+     With short durations, this makes load-balancing more responsive. The module
+     will hold back requests until ping conditions are met, using features of the
+     HTTP/2 protocol alone. [Ruediger Pluem, Stefan Eissing]
+  *) core: httpd is no longer linked against -lsystemd if mod_systemd
+     is enabled (and built as a DSO).  [Rainer Jung]
+  *) mod_proxy_http2: respect ProxyTimeout settings on backend connections
+     while waiting on incoming data. [Ruediger Pluem, Stefan Eissing]
+- modified patches
+  % apache2-mod_proxy_uwsgi-fix-crash.patch (refreshed)
+- modified sources
+  % apache2.keyring
+
 -------------------------------------------------------------------
 Wed Jul 15 09:16:02 UTC 2020 - pgajdos@suse.com
 

apache2.spec

@@ -65,7 +65,7 @@
 %define build_http2 0
 %endif
 Name:           apache2
-Version:        2.4.43
+Version:        2.4.46
 Release:        0
 Summary:        The Apache Web Server
 License:        Apache-2.0

httpd-2.4.43.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a497652ab3fc81318cdc2a203090a999150d86461acff97c1065dc910fe10f43
-size 7155865

httpd-2.4.43.tar.bz2.asc

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEueghOu+4Ya81pB8smV41IhrYTf8FAl58wHMACgkQmV41IhrY
-Tf8I0AgArzcV/UmSu+Kbwb2MGtMQJaAKbuNT8tpL1OYYuINYDinmgNboPm9GHJdb
-zd7fQIIBovlmuiC9s5cG0Fpm0O/pDUYs4jnxhnFTuSSMJcd/bDcRbb9Nh8lEfOkL
-McHpyAIwQHQJJUueUlirGbNKdUj3INgLV/RvtP6ZsylHQQCf2nuUlel5ueJxtxtB
-skI/lzcO/+XI+GH6/tGilHxVKHfFth47fWHsLj2tQzaLqK3aBHrCXK8m4HAmziOI
-ijiZQw4s5Q3m/AC/5Lto0qYDKLtyCARQBpS7DW1BnJTH4OcvvYKWAUCtTDgH7N+f
-qfHoOuKR2wOJjPRB2ats1VDOmP16hg==
-=ZcVG
------END PGP SIGNATURE-----

httpd-2.4.46.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea
+size 7187805

httpd-2.4.46.tar.bz2.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJIBAABCAAyFiEE40gAQ1lWIf5WEF8RKrEqetxVwAMFAl8leDsUHGRydWdnZXJp
+QGFwYWNoZS5vcmcACgkQKrEqetxVwAOXtA//ZECDsKBN5OdjreBMIOpuYzj2tpBz
+oBE0ExOGY8uQg4FGEG5MyHc5pvFz5rl7zLikTpaZKboBNGH7WBh22Rx5yg/hAkMH
+ZV8AgBfiL8c3uTff8/piTU2kVyQYZV4Rr2oVtgz+/ZObkI+ngQZMmvGsCdSU0On4
+zbyUGjh5W1gnl3MEoM/Whzv/2TbEwtnTk0mNdwjnojqlTXoDccyWpB+SlaAwQajW
+8NUND2oXFt3m80NcLKsXqTHz2DbVgFm2PYScO2JO2Xc02aX09AtXR5mKYxKOw8gP
+evF3nA0KbQdjUBQNAVv6LcV43Lk21OrU+Aqfeko44WmOsmVG7qHRmd6K+67HHvTW
+3SaWISPmlWcDvmRCVBJuynxYWXhpGCmeXgnnQgIe7vXSSVjsNWD9YMof6y07CPrQ
+BdMvfGBF0B/8qax22aM/xX6MnwpiKlkJ4wbB1e+UCGRNSdsOupCi2ok4IDN5Z/mv
+1maMsgctVPxoUaT25qPBckUbbVIhPdJ8b8fbnLJjcaTdWyvtQSIzwOnWnUQ18Tdi
+ur9fkQL9qnJF2OoLdidf0m6EMLGIs3YoE22SDZGNxkC2B1o2ozDCR9rV6x9LTSlN
+6l3LQfIBOGfsseqv4Q7w58G0IW3sLMJbqbjnYZSD0OFF4SaBtvFwDhDyfP5NLCSv
+5R+AAvdV+kvEif4=
+=zTsU
+-----END PGP SIGNATURE-----