rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

- remove unneded httpd-2.4.17-debug-crash.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=478
This commit is contained in:
Petr Gajdos
2016-05-18 06:32:08 +00:00
committed by Git OBS Bridge
parent 6f5fbad387
commit aee055412e
3 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apache2.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 18 06:30:34 UTC 2016 - pgajdos@suse.com
- remove unneded httpd-2.4.17-debug-crash.patch
-------------------------------------------------------------------
Mon May 9 13:57:54 UTC 2016 - pgajdos@suse.com

3
apache2.spec
View File

@@ -124,8 +124,6 @@ Patch109: httpd-2.4.3-mod_systemd.patch
Patch111: httpd-visibility.patch
# PATCH-FIX-UPSTREAM marguerite@opensuse.org -- compability for lua 5.2+ https://bz.apache.org/bugzilla/show_bug.cgi?id=58188
Patch114: httpd-2.4.12-lua-5.2.patch
# http://svn.apache.org/viewvc?view=revision&revision=1711479
Patch115: httpd-2.4.17-debug-crash.patch
BuildRequires: apache-rpm-macros-control
BuildRequires: automake
BuildRequires: db-devel
@@ -313,7 +311,6 @@ to administrators of web servers in general.
%endif
%patch111 -p1
%patch114 -p1
%patch115 -p1
cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE
# install READMEs
a=$(basename %{SOURCE22})

29
httpd-2.4.17-debug-crash.patch
View File

@@ -1,29 +0,0 @@
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");