Petr Gajdos
230a8ed7fa
- Update to version 2.4.20 (2.4.19 was never released) * Drop httpd-2.4.18-missing-semicolon.patch now upstream - Big changelog available, see: http://www.apache.org/dist/httpd/CHANGES_2.4.20 for details. OBS-URL: https://build.opensuse.org/request/show/387252 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=473
30 lines
1.5 KiB
Diff
30 lines
1.5 KiB
Diff
http://permalink.gmane.org/gmane.comp.apache.cvs/44631
|
|
Index: httpd-2.4.20/server/mpm/event/event.c
|
|
===================================================================
|
|
--- httpd-2.4.20.orig/server/mpm/event/event.c
|
|
+++ httpd-2.4.20/server/mpm/event/event.c
|
|
@@ -3094,8 +3094,7 @@ static int event_open_logs(apr_pool_t *
|
|
|
|
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");
|
|
Index: httpd-2.4.20/server/mpm/worker/worker.c
|
|
===================================================================
|
|
--- httpd-2.4.20.orig/server/mpm/worker/worker.c
|
|
+++ httpd-2.4.20/server/mpm/worker/worker.c
|
|
@@ -2051,8 +2051,7 @@ static int worker_open_logs(apr_pool_t *
|
|
|
|
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");
|