You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pagespeed.apache.org by ju...@apache.org on 2017/12/30 04:41:16 UTC

[05/50] [abbrv] incubator-pagespeed-cpanel git commit: add support for Apache 2.4+ - closes #6

add support for Apache 2.4+ - closes #6

Install instructions:
https://developers.google.com/speed/pagespeed/module/install


Project: http://git-wip-us.apache.org/repos/asf/incubator-pagespeed-cpanel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-pagespeed-cpanel/commit/5666d62c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-pagespeed-cpanel/tree/5666d62c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-pagespeed-cpanel/diff/5666d62c

Branch: refs/heads/master
Commit: 5666d62cd7a614ff1dc2b35ad87940823eb8ab4c
Parents: 83c80a7
Author: Ilya Grigorik <il...@igvita.com>
Authored: Mon Aug 19 22:21:17 2013 -0700
Committer: Ilya Grigorik <il...@igvita.com>
Committed: Mon Aug 19 22:21:17 2013 -0700

----------------------------------------------------------------------
 Easy/pagespeed/mod_pagespeed/pagespeed.conf | 9 ++++++++-
 Easy/pagespeed/speed-install                | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-pagespeed-cpanel/blob/5666d62c/Easy/pagespeed/mod_pagespeed/pagespeed.conf
----------------------------------------------------------------------
diff --git a/Easy/pagespeed/mod_pagespeed/pagespeed.conf b/Easy/pagespeed/mod_pagespeed/pagespeed.conf
index 6a96a07..a624825 100644
--- a/Easy/pagespeed/mod_pagespeed/pagespeed.conf
+++ b/Easy/pagespeed/mod_pagespeed/pagespeed.conf
@@ -1,5 +1,12 @@
+<IfModule !mod_version.c>
+  LoadModule version_module /usr/lib/apache2/modules/mod_version.so
+</IfModule>
+
 <IfVersion < 2.4>
-  LoadModule pagespeed_module modules/mod_pagespeed.so
+  LoadModule pagespeed_module /usr/lib/apache2/modules/mod_pagespeed.so
+</IfVersion>
+<IfVersion >= 2.4.2>
+  LoadModule pagespeed_module /usr/lib/apache2/modules/mod_pagespeed_ap24.so
 </IfVersion>
 
 <IfModule pagespeed_module>

http://git-wip-us.apache.org/repos/asf/incubator-pagespeed-cpanel/blob/5666d62c/Easy/pagespeed/speed-install
----------------------------------------------------------------------
diff --git a/Easy/pagespeed/speed-install b/Easy/pagespeed/speed-install
index 59274af..55c9081 100755
--- a/Easy/pagespeed/speed-install
+++ b/Easy/pagespeed/speed-install
@@ -59,7 +59,7 @@ if ( !-e "$package" ) {
   my $cmd = ("$rpm2_bin $package | $cpio_bin -idmv");
   executeForkedTask("$cmd");
 
-  my $cpcmd = ("/bin/cp -r usr/{lib,lib64}/httpd/modules/mod_pagespeed.so $module_dir");
+  my $cpcmd = ("/bin/cp -r usr/{lib,lib64}/httpd/modules/mod_pagespeed{,_ap24}.so $module_dir");
   executeForkedTask("$cpcmd");
 
   if ( !-e "$module_dir" . "/mod_pagespeed.so" ) {
@@ -67,6 +67,7 @@ if ( !-e "$package" ) {
 
   } else {
     chmod( 0755, "$module_dir" . "/mod_pagespeed.so" );
+    chmod( 0755, "$module_dir" . "/mod_pagespeed_ap24.so" );
 
     if ( !-e "$install_dir" . "/mod_pagespeed"  . "/pagespeed.conf" ) {
       die "Unable to find the configuration file for mod_pagespeed";