Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2020-07-17 20:46:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2 (Old) and /work/SRC/openSUSE:Factory/.apache2.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2" Fri Jul 17 20:46:39 2020 rev:168 rq:821097 version:2.4.43 Changes: -------- --- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2020-04-07 10:25:46.350126082 +0200 +++ /work/SRC/openSUSE:Factory/.apache2.new.3592/apache2.changes 2020-07-17 20:47:21.880700643 +0200 @@ -1,0 +2,9 @@ +Wed Jul 15 09:16:02 UTC 2020 - [email protected] + +- fix crash in mod_proxy_uwsgi for empty values of environment + variables [bsc#1174052] +- added patches + fix https://svn.apache.org/viewvc?view=revision + + apache2-mod_proxy_uwsgi-fix-crash.patch + +------------------------------------------------------------------- New: ---- apache2-mod_proxy_uwsgi-fix-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.CgFXbu/_old 2020-07-17 20:47:25.596704603 +0200 +++ /var/tmp/diff_new_pack.CgFXbu/_new 2020-07-17 20:47:25.608704616 +0200 @@ -144,6 +144,8 @@ # PATCH-FEATURE-UPSTREAM [email protected] -- 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 +Patch117: apache2-mod_proxy_uwsgi-fix-crash.patch BuildRequires: apache-rpm-macros-control BuildRequires: apr-util-devel #Since 2.4.7 the event MPM requires apr 1.5.0 or later. @@ -332,6 +334,7 @@ %if 0%{?suse_version} == 1110 %patch116 -p1 %endif +%patch117 -p1 cat %{_sourcedir}/SUSE-NOTICE >> NOTICE # install READMEs a=$(basename %{SOURCE22}) ++++++ apache2-mod_proxy_uwsgi-fix-crash.patch ++++++ --- a/modules/proxy/mod_proxy_uwsgi.c 2020/07/15 07:48:38 1879877 +++ b/modules/proxy/mod_proxy_uwsgi.c 2020/07/15 08:24:13 1879878 @@ -175,7 +175,7 @@ static int uwsgi_send_headers(request_re env = (apr_table_entry_t *) env_table->elts; for (j = 0; j < env_table->nelts; ++j) { - headerlen += 2 + strlen(env[j].key) + 2 + strlen(env[j].val); + headerlen += 2 + strlen(env[j].key) + 2 + (env[j].val ? strlen(env[j].val) : 0); } ptr = buf = apr_palloc(r->pool, headerlen); @@ -189,10 +189,12 @@ static int uwsgi_send_headers(request_re memcpy(ptr, env[j].key, keylen); ptr += keylen; - vallen = strlen(env[j].val); + vallen = env[j].val ? strlen(env[j].val) : 0; *ptr++ = (apr_byte_t) (vallen & 0xff); *ptr++ = (apr_byte_t) ((vallen >> 8) & 0xff); - memcpy(ptr, env[j].val, vallen); + if (env[j].val) { + memcpy(ptr, env[j].val, vallen); + } ptr += vallen; }
