pool/apache2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 347287 from home:pgajdos

Browse Source 
- fix crash when for -X
  + httpd-2.4.17-debug-crash.patch

- add a note: FollowSymLinks or SymLinksIfOwnerMatch is neccessary
  for RewriteRule in given dir [bnc#955701]

OBS-URL: https://build.opensuse.org/request/show/347287
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=467
This commit is contained in:
Petr Gajdos 2015-12-03 10:25:59 +00:00 committed by Git OBS Bridge
parent e7ee2b1556
commit 9e06c6a8de
4 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache2-default-server.conf
View File

@ -19,6 +19,8 @@ DocumentRoot "/srv/www/htdocs"
# 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:

12
apache2.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Dec 3 10:00:28 UTC 2015 - pgajdos@suse.com
- fix crash when for -X
+ httpd-2.4.17-debug-crash.patch
-------------------------------------------------------------------
Mon Nov 23 11:02:19 UTC 2015 - pgajdos@suse.com
- add a note: FollowSymLinks or SymLinksIfOwnerMatch is neccessary
for RewriteRule in given dir [bnc#955701]
-------------------------------------------------------------------
Fri Nov 6 10:06:19 UTC 2015 - pgajdos@suse.com

2
apache2.spec
View File

@ -124,6 +124,7 @@ 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
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 @@ to administrators of web servers in general.
%endif
%patch111 -p1
%patch114 -p1
%patch115 -p1
%patch1000
cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE
# install READMEs

43
httpd-2.4.17-debug-crash.patch Normal file
View File

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