[packages/apache-mod_pagespeed/dev-1.8: 11/11] patch apache config to be apache 2.4 compatible
glen
glen at pld-linux.org
Tue Jan 27 17:31:32 CET 2015
commit a16986b10ae569ebade10e6ef3967d3663786ec1
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Dec 16 23:31:52 2014 +0200
patch apache config to be apache 2.4 compatible
apache-mod_pagespeed.spec | 4 +-
apache24-config.patch | 191 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 194 insertions(+), 1 deletion(-)
---
diff --git a/apache-mod_pagespeed.spec b/apache-mod_pagespeed.spec
index ed8eea2..d428f81 100644
--- a/apache-mod_pagespeed.spec
+++ b/apache-mod_pagespeed.spec
@@ -51,7 +51,7 @@ Name: apache-mod_%{mod_name}
# beta: 1.9.32.2-beta
# stable: 1.8.31.5
Version: 1.8.31.5
-Release: 0.26
+Release: 0.28
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: modpagespeed-%{version}.tar.xz
@@ -61,6 +61,7 @@ Source2: gclient.conf
Patch0: system-libs.patch
Patch2: bug-632.patch
Patch4: no-dev-stdout.patch
+Patch5: apache24-config.patch
URL: https://developers.google.com/speed/pagespeed/module
BuildRequires: %{apxs}
BuildRequires: apache-devel >= 2.2
@@ -108,6 +109,7 @@ site is maintained.
%patch0 -p2
%patch2 -p1
%patch4 -p1
+%patch5 -p1
rm -r third_party/icu/source
rm -r third_party/icu/genfiles
diff --git a/apache24-config.patch b/apache24-config.patch
new file mode 100644
index 0000000..7dbb985
--- /dev/null
+++ b/apache24-config.patch
@@ -0,0 +1,191 @@
+--- modpagespeed-1.8.31.5/install/common/pagespeed.conf.template~ 2014-12-16 23:05:23.000000000 +0200
++++ modpagespeed-1.8.31.5/install/common/pagespeed.conf.template 2014-12-16 23:24:39.840183325 +0200
+@@ -326,15 +326,33 @@
+ # and change server state, such as statistics, caches, and
+ # messages. This might be appropriate in an experimental setup.
+ <Location /pagespeed_admin>
+- Order allow,deny
+- Allow from localhost
+- Allow from 127.0.0.1
++ # Apache 2.x
++ <IfModule !mod_authz_core.c>
++ Order allow,deny
++ Allow from localhost
++ Allow from 127.0.0.1
++ </IfModule>
++ # Apache 2.4
++ <IfModule mod_authz_core.c>
++ Require all denied
++ Require local
++ </IfModule>
++
+ SetHandler pagespeed_admin
+ </Location>
+ <Location /pagespeed_global_admin>
+- Order allow,deny
+- Allow from localhost
+- Allow from 127.0.0.1
++ # Apache 2.x
++ <IfModule !mod_authz_core.c>
++ Order allow,deny
++ Allow from localhost
++ Allow from 127.0.0.1
++ </IfModule>
++ # Apache 2.4
++ <IfModule mod_authz_core.c>
++ Require all denied
++ Require local
++ </IfModule>
++
+ SetHandler pagespeed_global_admin
+ </Location>
+
+--- modpagespeed-1.8.31.5/install/debug.conf.template~ 2014-12-16 23:05:23.000000000 +0200
++++ modpagespeed-1.8.31.5/install/debug.conf.template 2014-12-16 23:29:28.621809636 +0200
+@@ -730,9 +730,18 @@
+ # Enable per-vhost statistics so that tests can be somewhat independent.
+ ModPagespeedUsePerVHostStatistics on
+ <Location /mod_pagespeed_global_statistics>
+- Order allow,deny
+- Allow from localhost
+- Allow from 127.0.0.1
++ # Apache 2.x
++ <IfModule !mod_authz_core.c>
++ Order allow,deny
++ Allow from localhost
++ Allow from 127.0.0.1
++ </IfModule>
++ # Apache 2.4
++ <IfModule mod_authz_core.c>
++ Require all denied
++ Require local
++ </IfModule>
++
+ SetHandler mod_pagespeed_global_statistics
+ </Location>
+
+@@ -741,7 +750,6 @@
+ # these are declared so we can test that the handlers still work so
+ # that people upgrading to a new release don't lose funcitonality.
+ <Location /mod_pagespeed_statistics>
+- Order allow,deny
+ # You may insert other "Allow from" lines to add hosts you want to
+ # allow to look at generated statistics. Another possibility is
+ # to comment out the "Order" and "Allow" options from the config
+@@ -749,29 +757,67 @@
+ # statistics. This might be appropriate in an experimental setup or
+ # if the Apache server is protected by a reverse proxy that will
+ # filter URLs in some fashion.
+- Allow from localhost
+- Allow from 127.0.0.1
++ # Apache 2.x
++ <IfModule !mod_authz_core.c>
++ Order allow,deny
++ Allow from localhost
++ Allow from 127.0.0.1
++ </IfModule>
++ # Apache 2.4
++ <IfModule mod_authz_core.c>
++ Require all denied
++ Require local
++ </IfModule>
++
+ SetHandler mod_pagespeed_statistics
+ </Location>
+ <Location /pagespeed_console>
+- Order allow,deny
+- Allow from localhost
+- Allow from 127.0.0.1
++ # Apache 2.x
++ <IfModule !mod_authz_core.c>
++ Order allow,deny
++ Allow from localhost
++ Allow from 127.0.0.1
++ </IfModule>
++ # Apache 2.4
++ <IfModule mod_authz_core.c>
++ Require all denied
++ Require local
++ </IfModule>
++
+ SetHandler pagespeed_console
+ </Location>
+ <Location /mod_pagespeed_message>
+- Order allow,deny
+- Allow from localhost
+- Allow from 127.0.0.1
++ # Apache 2.x
++ <IfModule !mod_authz_core.c>
++ Order allow,deny
++ Allow from localhost
++ Allow from 127.0.0.1
++ </IfModule>
++ # Apache 2.4
++ <IfModule mod_authz_core.c>
++ Require all denied
++ Require local
++ </IfModule>
++
+ SetHandler mod_pagespeed_message
+ </Location>
+
+ # The handler for "pagespeed_admin" is fixed in name, but you can put
+ # it on any URL path, and everything should work.
+ <Location /alt/admin/path>
+- Order allow,deny
+- Allow from localhost
+- Allow from 127.0.0.1
++ # Apache 2.x
++ <IfModule !mod_authz_core.c>
++ Order allow,deny
++ Allow from localhost
++ Allow from 127.0.0.1
++ </IfModule>
++ # Apache 2.4
++ <IfModule mod_authz_core.c>
++ Require all denied
++ Require local
++ </IfModule>
++
++
+ SetHandler pagespeed_admin
+ </Location>
+
+@@ -1078,13 +1124,33 @@
+ #COVERAGE ModPagespeedCriticalImagesBeaconEnabled false
+ #COVERAGE
+ #COVERAGE <Location /mod_pagespeed_statistics>
+-#COVERAGE Order allow,deny
+-#COVERAGE Allow from localhost
++#COVERAGE # Apache 2.x
++#COVERAGE <IfModule !mod_authz_core.c>
++#COVERAGE Order allow,deny
++#COVERAGE Allow from localhost
++#COVERAGE Allow from 127.0.0.1
++#COVERAGE </IfModule>
++#COVERAGE # Apache 2.4
++#COVERAGE <IfModule mod_authz_core.c>
++#COVERAGE Require all denied
++#COVERAGE Require local
++#COVERAGE </IfModule>
++#COVERAGE
+ #COVERAGE SetHandler mod_pagespeed_statistics
+ #COVERAGE </Location>
+ #COVERAGE <Location /mod_pagespeed_message>
+-#COVERAGE Allow from localhost
+-#COVERAGE Allow from 127.0.0.1
++#COVERAGE # Apache 2.x
++#COVERAGE <IfModule !mod_authz_core.c>
++#COVERAGE Order allow,deny
++#COVERAGE Allow from localhost
++#COVERAGE Allow from 127.0.0.1
++#COVERAGE </IfModule>
++#COVERAGE # Apache 2.4
++#COVERAGE <IfModule mod_authz_core.c>
++#COVERAGE Require all denied
++#COVERAGE Require local
++#COVERAGE </IfModule>
++#COVERAGE
+ #COVERAGE SetHandler mod_pagespeed_message
+ #COVERAGE </Location>
+ #COVERAGE </VirtualHost>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_pagespeed.git/commitdiff/a16986b10ae569ebade10e6ef3967d3663786ec1
More information about the pld-cvs-commit
mailing list