diff options
| author | Joe Orton <jorton@redhat.com> | 2017-01-20 20:16:04 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@redhat.com> | 2017-01-20 20:16:04 +0000 |
| commit | 33e6dce94a1cee18d4588342cd842ae53e877ca9 (patch) | |
| tree | 17c18230dd125ca7f4276b375a4ce5d51689d30c | |
| parent | 4e2c6125acaf6fef423bdd536f07d743f3e182f5 (diff) | |
| download | httpd-33e6dce94a1cee18d4588342cd842ae53e877ca9.tar.gz httpd-33e6dce94a1cee18d4588342cd842ae53e877ca9.tar.xz httpd-33e6dce94a1cee18d4588342cd842ae53e877ca9.zip | |
mod_watchdog: restrict thread lifetime (#1410883)
Resolves: rhbz#1410883
| -rw-r--r-- | httpd-2.4.25-r1778319+.patch | 34 | ||||
| -rw-r--r-- | httpd.spec | 8 |
2 files changed, 41 insertions, 1 deletions
diff --git a/httpd-2.4.25-r1778319+.patch b/httpd-2.4.25-r1778319+.patch new file mode 100644 index 0000000..3f0bee2 --- /dev/null +++ b/httpd-2.4.25-r1778319+.patch @@ -0,0 +1,34 @@ +# ./pullrev.sh 1778319 1778331 + +https://bugzilla.redhat.com/show_bug.cgi?id=1410883 + +http://svn.apache.org/viewvc?view=revision&revision=1778319 +http://svn.apache.org/viewvc?view=revision&revision=1778331 + +--- httpd-2.4.6/modules/core/mod_watchdog.c ++++ httpd-2.4.6/modules/core/mod_watchdog.c +@@ -436,19 +436,19 @@ + { + apr_status_t rv; + const char *pk = "watchdog_init_module_tag"; +- apr_pool_t *pproc = s->process->pool; ++ apr_pool_t *ppconf = pconf; + const apr_array_header_t *wl; + + if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) + /* First time config phase -- skip. */ + return OK; + +- apr_pool_userdata_get((void *)&wd_server_conf, pk, pproc); ++ apr_pool_userdata_get((void *)&wd_server_conf, pk, ppconf); + if (!wd_server_conf) { +- if (!(wd_server_conf = apr_pcalloc(pproc, sizeof(wd_server_conf_t)))) ++ if (!(wd_server_conf = apr_pcalloc(ppconf, sizeof(wd_server_conf_t)))) + return APR_ENOMEM; +- apr_pool_create(&wd_server_conf->pool, pproc); +- apr_pool_userdata_set(wd_server_conf, pk, apr_pool_cleanup_null, pproc); ++ apr_pool_create(&wd_server_conf->pool, ppconf); ++ apr_pool_userdata_set(wd_server_conf, pk, apr_pool_cleanup_null, ppconf); + } + wd_server_conf->s = s; + if ((wl = ap_list_provider_names(pconf, AP_WATCHDOG_PGROUP, @@ -8,7 +8,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.25 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -65,6 +65,7 @@ Patch35: httpd-2.4.17-sslciphdefault.patch # Bug fixes Patch56: httpd-2.4.4-mod_unique_id.patch Patch57: httpd-2.4.10-sigint.patch +Patch58: httpd-2.4.25-r1778319+.patch # Security fixes License: ASL 2.0 @@ -211,6 +212,7 @@ interface for storing and accessing per-user session data. %patch56 -p1 -b .uniqueid %patch57 -p1 -b .sigint +%patch58 -p1 -b .r1778319+ # Patch in the vendor string sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h @@ -544,6 +546,7 @@ for m in $mods; do rv=1 fi done +set -x exit $rv %clean @@ -681,6 +684,9 @@ rm -rf $RPM_BUILD_ROOT %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Thu Jan 12 2017 Joe Orton <jorton@redhat.com> - 2.4.25-3 +- mod_watchdog: restrict thread lifetime (#1410883) + * Thu Dec 22 2016 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-2 - Resolves: #1358875 - require nghttp2 >= 1.5.0 |