Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2015-12-09 19:33:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2 (Old) and /work/SRC/openSUSE:Factory/.apache2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2015-11-24 22:30:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2015-12-09 19:33:53.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Dec 7 18:05:37 UTC 2015 - [email protected] + +- systemd: Set TasksMax=infinity for current systemd releases. + The default limit of 512 is too small and prevents the creation of + new server processes. Apache has its own runtime/harcoded limits. + +------------------------------------------------------------------- +Thu Dec 3 10:00:28 UTC 2015 - [email protected] + +- fix crash when for -X + + httpd-2.4.17-debug-crash.patch + +------------------------------------------------------------------- +Mon Nov 23 11:02:19 UTC 2015 - [email protected] + +- add a note: FollowSymLinks or SymLinksIfOwnerMatch is neccessary + for RewriteRule in given dir [bnc#955701] + +------------------------------------------------------------------- New: ---- httpd-2.4.17-debug-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.RF9tUs/_old 2015-12-09 19:33:55.000000000 +0100 +++ /var/tmp/diff_new_pack.RF9tUs/_new 2015-12-09 19:33:55.000000000 +0100 @@ -124,6 +124,7 @@ Patch111: httpd-visibility.patch # PATCH-FIX-UPSTREAM [email protected] -- compability for lua 5.2+ https://bz.apache.org/bugzilla/show_bug.cgi?id=58188 Patch114: httpd-2.4.12-lua-5.2.patch +Patch115: httpd-2.4.17-debug-crash.patch Patch1000: https://raw.githubusercontent.com/icing/mod_h2/master/sandbox/httpd/patches/2.4.17-protocols.patch BuildRequires: automake BuildRequires: apache-rpm-macros-control @@ -312,6 +313,7 @@ %endif %patch111 -p1 %patch114 -p1 +%patch115 -p1 %patch1000 cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE # install READMEs ++++++ apache2-default-server.conf ++++++ --- /var/tmp/diff_new_pack.RF9tUs/_old 2015-12-09 19:33:55.000000000 +0100 +++ /var/tmp/diff_new_pack.RF9tUs/_new 2015-12-09 19:33:55.000000000 +0100 @@ -19,6 +19,8 @@ # The Options directive is both complicated and important. Please see # http://httpd.apache.org/docs/2.4/mod/core.html#options # for more information. + # NOTE: For directories where RewriteRule is used, FollowSymLinks + # or SymLinksIfOwnerMatch needs to be set in Options directive. Options None # AllowOverride controls what directives may be placed in .htaccess files. # It can be "All", "None", or any combination of the keywords: ++++++ apache2.service ++++++ --- /var/tmp/diff_new_pack.RF9tUs/_old 2015-12-09 19:33:55.000000000 +0100 +++ /var/tmp/diff_new_pack.RF9tUs/_new 2015-12-09 19:33:55.000000000 +0100 @@ -11,6 +11,7 @@ ExecReload=/usr/sbin/start_apache2 -DSYSTEMD -DFOREGROUND -k graceful ExecStop=/usr/sbin/start_apache2 -DSYSTEMD -DFOREGROUND -k graceful-stop KillMode=mixed +TasksMax=infinity [Install] WantedBy=multi-user.target ++++++ [email protected] ++++++ --- /var/tmp/diff_new_pack.RF9tUs/_old 2015-12-09 19:33:56.000000000 +0100 +++ /var/tmp/diff_new_pack.RF9tUs/_new 2015-12-09 19:33:56.000000000 +0100 @@ -12,6 +12,7 @@ ExecReload=/usr/sbin/start_apache2 -DSYSTEMD -DFOREGROUND -k graceful ExecStop=/usr/sbin/start_apache2 -DSYSTEMD -DFOREGROUND -k graceful-stop KillMode=mixed +TasksMax=infinity [Install] WantedBy=multi-user.target ++++++ httpd-2.4.17-debug-crash.patch ++++++ http://permalink.gmane.org/gmane.comp.apache.cvs/44631 diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index cd70b7d..94813af 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -3042,8 +3042,7 @@ static int event_open_logs(apr_pool_t * p, apr_pool_t * plog, all_buckets = apr_pcalloc(pconf, num_buckets * sizeof(*all_buckets)); for (i = 0; i < num_buckets; i++) { - if (!one_process && /* no POD in one_process mode */ - (rv = ap_mpm_podx_open(pconf, &all_buckets[i].pod))) { + if (rv = ap_mpm_podx_open(pconf, &all_buckets[i].pod)) { ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv, (startup ? NULL : s), "could not open pipe-of-death"); diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 343e51d..f4c3dbe 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -1326,8 +1326,7 @@ static int prefork_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, all_buckets = apr_pcalloc(pconf, num_buckets * sizeof(prefork_child_bucket)); for (i = 0; i < num_buckets; i++) { - if (!one_process && /* no POD in one_process mode */ - (rv = ap_mpm_pod_open(pconf, &all_buckets[i].pod))) { + if (rv = ap_mpm_pod_open(pconf, &all_buckets[i].pod)) { ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv, (startup ? NULL : s), "could not open pipe-of-death"); diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index 4a729c0..8a59219 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -2051,8 +2051,7 @@ static int worker_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, all_buckets = apr_pcalloc(pconf, num_buckets * sizeof(*all_buckets)); for (i = 0; i < num_buckets; i++) { - if (!one_process && /* no POD in one_process mode */ - (rv = ap_mpm_podx_open(pconf, &all_buckets[i].pod))) { + if (rv = ap_mpm_podx_open(pconf, &all_buckets[i].pod)) { ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv, (startup ? NULL : s), "could not open pipe-of-death");
