merge commit

This commit is contained in:
Jeff Kaufman
2013-07-30 14:30:55 -04:00
14 changed files with 1099 additions and 637 deletions
+9 -2
View File
@@ -27,8 +27,8 @@ if [ "$mod_pagespeed_dir" = "unset" ] ; then
echo " You need to separately download the pagespeed library:"
echo ""
echo " $ cd /path/to/ngx_pagespeed"
echo " $ wget https://dl.google.com/dl/page-speed/psol/1.6.29.3.tar.gz"
echo " $ tar -xzvf 1.6.29.3.tar.gz # expands to psol/"
echo " $ wget https://dl.google.com/dl/page-speed/psol/1.6.29.5.tar.gz"
echo " $ tar -xzvf 1.6.29.5.tar.gz # expands to psol/"
echo ""
echo " Or see the installation instructions:"
echo " https://github.com/pagespeed/ngx_pagespeed#how-to-build"
@@ -176,8 +176,15 @@ if [ $ngx_found = yes ]; then
$mod_pagespeed_dir/out/$buildtype/obj/gen/data2c_out/instaweb/net/instaweb/system/console_out.cc \
$mod_pagespeed_dir/out/$buildtype/obj/gen/data2c_out/instaweb/net/instaweb/system/console_css_out.cc \
$mod_pagespeed_dir/net/instaweb/system/add_headers_fetcher.cc \
$ps_src/in_place_resource_recorder.cc \
$mod_pagespeed_dir/net/instaweb/system/loopback_route_fetcher.cc \
$mod_pagespeed_dir/net/instaweb/system/serf_url_async_fetcher.cc"
# TODO(jefftk): when the next release of PSOL after 1.6.29.3 comes out, change
# $ps_src/in_place_resource_recorder.cc
# above to
# $mod_pagespeed_dir/net/instaweb/apache/in_place_resource_recorder.cc
# Make pagespeed run immediately before gzip.
HTTP_FILTER_MODULES=$(echo $HTTP_FILTER_MODULES |\
sed "s/$HTTP_GZIP_FILTER_MODULE/$HTTP_GZIP_FILTER_MODULE $ngx_addon_name/")