forked from pool/apache2
Petr Gajdos
02a733cd83
- modified patches
% apache2-mod_proxy_uwsgi-fix-crash.patch (refreshed)
- modified sources
% apache2-loadmodule.conf
% apache2-manual.conf
% apache2-script-helpers
% apache2@.service
% sysconfig.apache2
- deleted patches
- deprecated-scripts-arch.patch (not needed)
- httpd-2.0.54-envvars.dif (not needed)
- httpd-2.1.3alpha-layout.dif
(renamed to apache2-system-dirs-layout.patch)
- httpd-2.2.0-apxs-a2enmod.dif (not needed)
- httpd-2.4.9-bnc690734.patch
(renamed to apache2-LimitRequestFieldSize-limits-headers.patch)
- httpd-2.4.x-fate317766-config-control-two-protocol-options.diff
(renamed to apache2-HttpContentLengthHeadZero-HttpExpectStrict.patch)
- httpd-2.x.x-logresolve.patch
(renamed to apache2-logresolve-tmp-security.patch)
- httpd-apachectl.patch
(renamed to apache2-apachectl.patch)
- httpd-implicit-pointer-decl.patch (not needed)
- httpd-visibility.patch (not needed)
- deleted sources
- SUSE-NOTICE (outdated)
- a2enflag (renamed to apache2-a2enflag)
- a2enmod (renamed to apache2-a2enmod)
- apache-22-24-upgrade (outdated)
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=624
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
Index: httpd-2.4.46/modules/proxy/mod_proxy_uwsgi.c
|
|
===================================================================
|
|
--- 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-11-10 16:38:14.507125446 +0100
|
|
@@ -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);
|
|
}
|
|
|
|
pktsize = headerlen - 4;
|
|
@@ -198,10 +198,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;
|
|
}
|
|
|