Release version 1.12.34.3

Address a mistake I made in https://github.com/pagespeed/ngx_pagespeed/pull/1458

While testing the draft for 1.12.34.3 I noticed that older nginx
versions would fail to compile. Switch kNginx13_1_4 to a #define so we
can use it to properly compare.

Note: this will have to be backported to master

.gitignore

@@ -2,4 +2,3 @@ test/tmp
 psol/
 psol-*.tar.gz
 *.*.*.*.tar.gz
-nginx

.gitmodules

@@ -1,18 +0,0 @@
-[submodule "testing-dependencies/mod_pagespeed"]
-	path = testing-dependencies/mod_pagespeed
-	url = https://github.com/pagespeed/mod_pagespeed.git
-[submodule "testing-dependencies/ngx_cache_purge"]
-	path = testing-dependencies/ngx_cache_purge
-	url = https://github.com/FRiCKLE/ngx_cache_purge.git
-[submodule "testing-dependencies/nginx"]
-	path = testing-dependencies/nginx
-	url = https://github.com/nginx/nginx.git
-[submodule "testing-dependencies/set-misc-nginx-module"]
-	path = testing-dependencies/set-misc-nginx-module
-	url = https://github.com/openresty/set-misc-nginx-module
-[submodule "testing-dependencies/ngx_devel_kit"]
-	path = testing-dependencies/ngx_devel_kit
-	url = https://github.com/simpl/ngx_devel_kit
-[submodule "testing-dependencies/headers-more-nginx-module"]
-	path = testing-dependencies/headers-more-nginx-module
-	url = https://github.com/openresty/headers-more-nginx-module

.travis.yml

@@ -1,30 +1,42 @@
 language: c++
-env:
-  global:
-    - MAKEFLAGS=-j3
-# By default travis loads submodules serially, but we can load them in parallel
-# if we install an updated git and use --jobs.  Some timing numbers:
-#   serial: 257s
-#   jobs=4: 182s (29s to install new git, 153s to run the downloads)
-#   jobs=8: 179s (29s to install new git, 150s to run the downloads)
-# We can't use --depth=1, though, because github doesn't have
-# allowReachableSHA1InWant set.
-#
-# TODO(jefftk): once we're running on a server with git 2.8 or later we can have
-#               --jobs without installing a new git.
-git:
-  submodules: false
-before_install:
-  - sudo add-apt-repository --yes ppa:git-core/ppa
-  - sudo apt-get update
-  - sudo apt-get install git
-  - git submodule update --init --recursive --jobs=8
 install:
-  scripts/build_ngx_pagespeed.sh --devel --assume-yes
+  - mv $TRAVIS_BUILD_DIR ~/ngxpagespeed
+  - sudo apt-get install build-essential zlib1g-dev libpcre3 libpcre3-dev unzip g++ python gperf make devscripts fakeroot git curl netcat-traditional gcc-mozilla clang-3.4 2>&1 > /dev/null
+  - export PATH=/usr/lib/gcc-mozilla/bin:$PATH
+  - sudo ln -sf /usr/lib/gcc-mozilla/lib/libstdc++.so.6 /usr/lib/x86_64-linux-gnu/libstdc++.so.6
+#  - sudo sh -c 'echo "image/webp webp" >> /etc/mime.types'
+#  - mkdir -p ~/bin
+#  - cd ~/bin
+#  - git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
+  - mkdir ~/mod_pagespeed
+  - cd ~/mod_pagespeed
+  - git clone --recursive https://github.com/pagespeed/mod_pagespeed.git src
+  - cd src
+  - python build/gyp_chromium --depth=.
+  - cd ~/mod_pagespeed/src/pagespeed/automatic
+  - make BUILDTYPE=Release -C ../../pagespeed/automatic all
+  - cd ~
+  - git clone https://github.com/FRiCKLE/ngx_cache_purge.git
+  - NGX_CACHE_PURGE=$PWD/ngx_cache_purge
+  - wget https://openresty.org/download/ngx_openresty-1.9.7.2.tar.gz
+  - tar xzf ngx_openresty-*.tar.gz
+  - cd ngx_openresty-*/
+  - ./configure --with-luajit
+  - make
+  - NGX_DEVEL_KIT=$(echo $HOME/ngx_openresty-*/build/ngx_devel_kit-*/)
+  - SET_MISC_MODULE=$(echo $HOME/ngx_openresty-*/build/set-misc-nginx-module-*/)
+  - HEADERS_MORE_MODULE=$(echo $HOME/ngx_openresty-*/build/headers-more-nginx-module-*/)
+  - cd ~
+  - wget https://github.com/nginx/nginx/archive/branches/default.zip
+  - unzip default.zip
+  - cd nginx-branches-default
+  - MOD_PAGESPEED_DIR="$HOME/mod_pagespeed/src" ./auto/configure --add-module=$HOME/ngxpagespeed --add-module="$NGX_CACHE_PURGE" --add-module="$NGX_DEVEL_KIT" --add-module="$SET_MISC_MODULE" --add-module="$HEADERS_MORE_MODULE" --with-ipv6
+  - make
+  - sudo make install
 script:
-  test/run_tests.sh $PWD/testing-dependencies/mod_pagespeed/ \
-                    $PWD/nginx/sbin/nginx
-dist: trusty
+  - echo "build successful"
+  - echo "cd ~/ngxpagespeed"
+  - echo "sudo ./test/run_tests.sh $HOME/mod_pagespeed $HOME/nginx-branches-default/objs/nginx"
 sudo: required
 compiler:
   - gcc

PSOL_BINARY_URL

@@ -1,4 +1 @@
-In a release this file would contain the URL to download the pre-compiled PSOL
-binary, but on development branches (like this one) you have to build PSOL from
-source yourself.  See:
-  https://github.com/pagespeed/ngx_pagespeed/wiki/Building-PSOL-From-Source
+https://dl.google.com/dl/page-speed/psol/1.12.34.2-$BIT_SIZE_NAME.tar.gz

README.md

@@ -1,6 +1,6 @@
 ![ngx_pagespeed](https://lh6.googleusercontent.com/-qufedJIJq7Y/UXEvVYxyYvI/AAAAAAAADo8/JHDFQhs91_c/s401/04_ngx_pagespeed.png)
 
-[![Build Status](https://travis-ci.org/pagespeed/ngx_pagespeed.svg?branch=master)](https://travis-ci.org/pagespeed/ngx_pagespeed)
+[![Build Status](https://travis-ci.org/pagespeed/ngx_pagespeed.svg?branch=trunk-tracking)](https://travis-ci.org/pagespeed/ngx_pagespeed)
 
 ngx_pagespeed speeds up your site and reduces page load time by automatically
 applying web performance best practices to pages and associated assets (CSS,

config

@@ -198,7 +198,7 @@ pagespeed_include="\
   $mod_pagespeed_dir/url"
 ngx_feature_path="$pagespeed_include"
 
-pagespeed_libs="$psol_binary $pagespeed_libs -lrt -pthread -lm -luuid"
+pagespeed_libs="$psol_binary $pagespeed_libs -lrt -pthread -lm"
 ngx_feature_libs="$pagespeed_libs"
 ngx_feature_test="
 

scripts/build_ngx_pagespeed.sh

@@ -1,34 +1,11 @@
 #!/bin/bash
-#
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 
 function usage() {
   echo "
 Usage: build_ngx_pagespeed.sh [options]
 
   Installs ngx_pagespeed and its dependencies.  Can optionally build and install
-  nginx as well.  Can be run either as:
-
-     bash <(curl -f -L -sS https://ngxpagespeed.com/install) [options]
-
-  Or:
-
-     git clone git@github.com:pagespeed/ngx_pagespeed.git
-     cd ngx_pagespeed/
-     git checkout <branch>
-     scripts/build_ngx_pagespeed.sh [options]
+  nginx as well.
 
 Options:
   -v, --ngx-pagespeed-version <ngx_pagespeed version>
@@ -37,11 +14,7 @@ Options:
       * latest-stable
       * a version number, such as 1.11.33.4
 
-      If you don't specify a version, defaults to latest-stable unless --devel
-      is specified, in which case it defaults to master.
-
-      This option doesn't make sense if we're running within an existing
-      ngx_pagespeed checkout.
+      If you don't specify a version, defaults to latest-stable.
 
   -n, --nginx-version <nginx version>
       What version of nginx to build.  If not set, this script only prepares the
@@ -63,30 +36,6 @@ Options:
       non-deb non-rpm system, this won't work.  In that case, install the
       dependencies yourself and pass --no-deps-check.
 
-  -s, --psol-from-source
-      Build PSOL from source instead of downloading a pre-built binary module.
-
-  -l, --devel
-      Sets up a development environment in ngx_pagespeed/nginx, building with
-      testing-only dependencies.  Includes --psol-from-source, conflicts with
-      --nginx-version.  Uses a 'git clone' checkout for ngx_pagespeed and nginx
-      instead of downloading a tarball.
-
-  -t, --build-type
-      When building PSOL from source, what to tell it for BUILD_TYPE.  Defaults
-      to 'Release' unless --devel is set in which case it defaults to 'Debug'.
-
-  -y, --assume-yes
-      Assume the answer to all prompts is 'yes, please continue'.  Intended for
-      automated usage, such as buildbots.
-
-  -a, --additional-nginx-configure-arguments
-      When running ./configure for nginx, you may want to specify additional
-      arguments, such as --with-http_ssl_module.  By default this script will
-      pause and prompt you for them, but this option lets you pass them in.  For
-      example, you might do:
-        -a '--with-http_ssl_module --with-cc-opt=\"-I /usr/local/include\"'
-
   -d, --dryrun
       Don't make any changes to the system, just print what changes you
       would have made.
@@ -95,34 +44,10 @@ Options:
       Print this message and exit."
 }
 
-RED=31
-GREEN=32
-YELLOW=33
-function begin_color() {
-  color="$1"
-  echo -e -n "\e[${color}m"
-}
-function end_color() {
-  echo -e -n "\e[0m"
-}
-
-function echo_color() {
-  color="$1"
-  shift
-  begin_color "$color"
-  echo "$@"
-  end_color
-}
-
-function error() {
-  local error_message="$@"
-  echo_color "$RED" -n "Error: " >&2
-  echo "$@" >&2
-}
-
 # Prints an error message and exits with an error code.
 function fail() {
-  error "$@"
+  local error_message="$@"
+  echo "$@" >&2
 
   # Normally I'd use $0 in "usage" here, but since most people will be running
   # this via curl, that wouldn't actually give something useful.
@@ -131,11 +56,6 @@ function fail() {
   exit 1
 }
 
-
-function status() {
-  echo_color "$GREEN" "$@"
-}
-
 # Intended to be called as:
 #   bash <(curl dl.google.com/.../build_ngx_pagespeed.sh) <args>
 
@@ -144,19 +64,12 @@ function status() {
 # The run function handles exit-status checking for system-changing commands.
 # Additionally, this allows us to easily have a dryrun mode where we don't
 # actually make any changes.
-INITIAL_ENV=$(printenv | sort)
 function run() {
   if "$DRYRUN"; then
-    echo_color "$YELLOW" -n "would run"
-    echo " $@"
-    env_differences=$(comm -13 <(echo "$INITIAL_ENV") <(printenv | sort))
-    if [ -n "$env_differences" ]; then
-      echo "  with the following additional environment variables:"
-      echo "$env_differences" | sed 's/^/    /'
-    fi
+    echo "would run $@"
   else
     if ! "$@"; then
-      error "Failure running '$@', exiting."
+      echo "Failure running $@, exiting."
       exit 1
     fi
   fi
@@ -242,9 +155,9 @@ function install_dependencies() {
     fi
   done
   if [ -n "$missing_dependencies" ]; then
-    status "Detected that we're missing the following depencencies:"
+    echo "Detected that we're missing the following depencencies:"
     echo "  $missing_dependencies"
-    status "Installing them:"
+    echo "Installing them:"
     run sudo $install_pkg_cmd $missing_dependencies
   fi
 }
@@ -263,13 +176,8 @@ function gcc_too_old() {
 }
 
 function continue_or_exit() {
-  if "$ASSUME_YES"; then
-    return
-  fi
-
   local prompt="$1"
-  echo_color "$YELLOW" -n "$prompt"
-  read -p " [Y/n] " yn
+  read -p "$prompt [Y/n] " yn
   if [[ "$yn" == N* || "$yn" == n* ]]; then
     echo "Cancelled."
     exit 0
@@ -309,10 +217,9 @@ function build_ngx_pagespeed() {
     fail "Your version of getopt is too old.  Exiting with no changes made."
   fi
 
-  opts=$(getopt -o v:n:mb:pslt:ya:dh \
+  opts=$(getopt -o v:n:mb:pdh \
     --longoptions ngx-pagespeed-version:,nginx-version:,dynamic-module \
-    --longoptions buildir:,no-deps-check,psol-from-source,devel,build-type: \
-    --longoptions assume-yes,additional-nginx-configure-arguments:,dryrun,help \
+    --longoptions buildir:,no-deps-check,dryrun,help \
     -n "$(basename "$0")" -- "$@")
   if [ $? != 0 ]; then
     usage
@@ -320,14 +227,10 @@ function build_ngx_pagespeed() {
   fi
   eval set -- "$opts"
 
-  NPS_VERSION="DEFAULT"
+  NPS_VERSION="latest-stable"
   NGINX_VERSION=""
   BUILDDIR="$HOME"
   DO_DEPS_CHECK=true
-  PSOL_FROM_SOURCE=false
-  DEVEL=false
-  BUILD_TYPE=""
-  ASSUME_YES=false
   DRYRUN=false
   DYNAMIC_MODULE=false
   while true; do
@@ -350,23 +253,6 @@ function build_ngx_pagespeed() {
       -p | --no-deps-check) shift
         DO_DEPS_CHECK=false
         ;;
-      -s | --psol-from-source) shift
-        PSOL_FROM_SOURCE=true
-        ;;
-      -l | --devel) shift
-        DEVEL=true
-        ;;
-      -t | --build-type) shift
-        BUILD_TYPE="$1"
-        shift
-        ;;
-      -y | --assume-yes) shift
-        ASSUME_YES="true"
-        ;;
-      -a | --additional-nginx-configure-arguments) shift
-        ADDITIONAL_NGINX_CONFIGURE_ARGUMENTS="$1"
-        shift
-        ;;
       -d | --dryrun) shift
         DRYRUN="true"
         ;;
@@ -385,58 +271,10 @@ function build_ngx_pagespeed() {
     esac
   done
 
-  USE_GIT_CHECKOUT="$DEVEL"
-  ALREADY_CHECKED_OUT=false
-  if [ -e PSOL_BINARY_URL ]; then
-    status "Detected that we're running in an existing ngx_pagespeed checkout."
-    USE_GIT_CHECKOUT=true
-    ALREADY_CHECKED_OUT=true
-  fi
-
-  if "$ALREADY_CHECKED_OUT"; then
-    if [ "$NPS_VERSION" != "DEFAULT" ]; then
-      fail \
-"The --ngx-pagespeed-version argument doesn't make sense when running within an existing checkout."
-    fi
-  elif [ "$NPS_VERSION" = "DEFAULT" ]; then
-    if "$DEVEL"; then
-      NPS_VERSION="master"
-    else
-      NPS_VERSION="latest-stable"
-    fi
-  fi
-
   if [ ! -d "$BUILDDIR" ]; then
     fail "Told to build in $BUILDDIR, but that directory doesn't exist."
   fi
 
-  BUILD_NGINX=false
-  if [ -n "$NGINX_VERSION" ]; then
-    BUILD_NGINX=true
-  fi
-
-  if "$DEVEL"; then
-    PSOL_FROM_SOURCE=true
-    BUILD_NGINX=true
-    if [ -n "$NGINX_VERSION" ]; then
-      fail \
-"The --devel argument conflicts with --nginx.  In devel mode we use the version of nginx that's included as a submodule."
-    fi
-    if "$DYNAMIC_MODULE"; then
-      fail "Can't currently build a dynamic module in --devel mode."
-    fi
-  fi
-
-  if "$PSOL_FROM_SOURCE" && [ -z "$BUILD_TYPE" ]; then
-    if "$DEVEL"; then
-      BUILD_TYPE="Debug"
-    else
-      BUILD_TYPE="Release"
-    fi
-  elif [ -n "$BUILD_TYPE" ]; then
-    fail "Setting --build-type requires --psol-from-source or --devel."
-  fi
-
   if [ "$NGINX_VERSION" = "latest" ]; then
     # When this function fails it prints the debugging information needed first
     # to stderr.
@@ -445,15 +283,8 @@ function build_ngx_pagespeed() {
 
   if "$DYNAMIC_MODULE"; then
     # Check that ngx_pagespeed and nginx are recent enough to support dynamic
-    # modules.  Unfortunately NPS_VERSION might be a tag, in which case we don't
-    # know.  If it's not a numeric version number, then assume it's recent
-    # enough and if it's not they'll get an ugly compilation error later.
-    # Luckily 1.10.33.5 was a while ago now.
-    #
-    # I'd like to use =~ here, but they changed syntax between v3 and v4 (quotes
-    # moved from mandatory to optional to prohibited).
-    if [[ "${NPS_VERSION#*[^0-9.]}" = "$NPS_VERSION" ]] &&
-         version_older_than "$NPS_VERSION" "1.10.33.5"; then
+    # modules.
+    if version_older_than "$NPS_VERSION" "1.10.33.5"; then
       fail "
 You're trying to build ngx_pagespeed $NPS_VERSION as a dynamic module, but
 ngx_pagespeed didn't add support for dynamic modules until 1.10.33.5."
@@ -483,16 +314,16 @@ add support for dynamic modules in a way compatible with ngx_pagespeed until
   # Now make sure our dependencies are installed.
   if "$DO_DEPS_CHECK"; then
     if [ -f /etc/debian_version ]; then
-      status "Detected debian-based distro."
+      echo "Detected debian-based distro."
 
       install_dependencies "apt-get install" debian_is_installed \
         "build-essential zlib1g-dev libpcre3 libpcre3-dev unzip"
 
       if gcc_too_old; then
         if [ ! -e /usr/lib/gcc-mozilla/bin/gcc ]; then
-          status "Detected that gcc is older than 4.8.  Installing gcc-mozilla"
-          status "which installs gcc-4.8 into /usr/lib/gcc-mozilla/ and doesn't"
-          status "affect your global gcc installation."
+          echo "Detected that gcc is older than 4.8.  Installing gcc-mozilla"
+          echo "which installs gcc-4.8 into /usr/lib/gcc-mozilla/ and doesn't"
+          echo "affect your global gcc installation."
           run sudo apt-get install gcc-mozilla
         fi
 
@@ -501,7 +332,7 @@ add support for dynamic modules in a way compatible with ngx_pagespeed until
       fi
 
     elif [ -f /etc/redhat-release ]; then
-      status "Detected redhat-based distro."
+      echo "Detected redhat-based distro."
 
       install_dependencies "yum install" redhat_is_installed \
         "gcc-c++ pcre-devel zlib-devel make unzip wget"
@@ -519,9 +350,9 @@ Unexpected major version $redhat_major_version in /etc/redhat-release:
 $(cat /etc/redhat-release) Expected 5 or 6."
           fi
 
-          status "Detected that gcc is older than 4.8.  Scientific Linux"
-          status "provides a gcc package that installs gcc-4.8 into /opt/ and"
-          status "doesn't affect your global gcc installation."
+          echo "Detected that gcc is older than 4.8.  Scientific Linux provides"
+          echo "a gcc package that installs gcc-4.8 into /opt/ and doesn't"
+          echo "affect your global gcc installation."
           slc_key="https://linux.web.cern.ch/linux/scientific6/docs/repository/"
           slc_key+="cern/slc6X/i386/RPM-GPG-KEY-cern"
           slc_key_out="$TEMPDIR/RPM-GPG-KEY-cern"
@@ -547,9 +378,9 @@ This doesn't appear to be a deb-based distro or an rpm-based one.  Not going to
 be able to install dependencies.  Please install dependencies manually and rerun
 with --no-deps-check."
     fi
-    status "Operating system dependencies are all set."
+    echo "Dependencies are all set."
   else
-    status "Not checking whether operating system dependencies are installed."
+    echo "Not checking whether dependencies are installed."
   fi
 
   function delete_if_already_exists() {
@@ -560,6 +391,7 @@ with --no-deps-check."
       if [ ${#directory} -lt 8 ]; then
         fail "
 Not deleting $directory; name is suspiciously short.  Something is wrong."
+        exit 1
       fi
 
       continue_or_exit "OK to delete $directory?"
@@ -567,106 +399,53 @@ Not deleting $directory; name is suspiciously short.  Something is wrong."
     fi
   }
 
+  nps_baseurl="https://github.com/pagespeed/ngx_pagespeed/archive"
   # In general, the zip github builds for tag foo unzips to ngx_pagespeed-foo,
-  # but it looks like they special case vVERSION tags to ngx_pagespeed-VERSION
+  # but it looks like they special case vVERSION tags to ngx_pagespeed-VERSION.
   if [[ "$NPS_VERSION" =~ ^[0-9]*[.][0-9]*[.][0-9]*[.][0-9]*$ ]]; then
-    # We've been given a numeric version number.  This has an associated tag
-    # in the form vVERSION-beta.
-    tag_name="v${NPS_VERSION}-beta"
+    # We've been given a numeric version number.  This has an associated tag in
+    # the form vVERSION-beta.
+    nps_url_fname="v${NPS_VERSION}-beta"
     nps_downloaded_fname="ngx_pagespeed-${NPS_VERSION}-beta"
   else
     # We've been given a tag name, like latest-beta.  Download that directly.
-    tag_name="$NPS_VERSION"
+    nps_url_fname="$NPS_VERSION"
     nps_downloaded_fname="ngx_pagespeed-${NPS_VERSION}"
   fi
 
-  install_dir="this-only-makes-sense-in-devel-mode"
-  if "$USE_GIT_CHECKOUT"; then
-    # We're either doing a --devel build, or someone is running us from an
-    # existing git checkout.
-    nps_module_dir="$PWD"
-    install_dir="$nps_module_dir"
-    if "$ALREADY_CHECKED_OUT"; then
-      run cd "$nps_module_dir"
-    else
-      status "Checking out ngx_pagespeed..."
-      run git clone "git@github.com:pagespeed/ngx_pagespeed.git" \
-                    "$nps_module_dir"
-      run cd "$nps_module_dir"
-      run git checkout "$tag_name"
-    fi
-    submodules_dir="$nps_module_dir/testing-dependencies"
-    if "$DEVEL"; then
-      status "Downloading dependencies..."
-      run git submodule update --init --recursive
-      if [[ "$CONTINUOUS_INTEGRATION" != true ]]; then
-        status "Switching submodules over to git protocol."
-        # This lets us push to github by public key.
-        for config in $(find .git/ -name config) ; do
-          run sed -i s~https://github.com/~git@github.com:~ $config ;
-        done
-      fi
+  nps_downloaded="$TEMPDIR/$nps_downloaded_fname.zip"
+  run wget "$nps_baseurl/$nps_url_fname.zip" -O "$nps_downloaded"
+  nps_module_dir="$BUILDDIR/$nps_downloaded_fname"
+  delete_if_already_exists "$nps_module_dir"
+  echo "Extracting ngx_pagespeed..."
+  run unzip -q "$nps_downloaded" -d "$BUILDDIR"
+  run cd "$nps_module_dir"
+
+  # Now we need to figure out what precompiled version of PSOL to build
+  # ngx_pagespeed against.
+  if "$DRYRUN"; then
+    psol_url="https://psol.example.com/cant-get-psol-version-in-dry-run.tar.gz"
+  elif [ -e PSOL_BINARY_URL ]; then
+    # Releases after 1.11.33.4 there is a PSOL_BINARY_URL file that tells us
+    # where to look.
+    psol_url="$(scripts/format_binary_url.sh PSOL_BINARY_URL)"
+    if [[ "$psol_url" != https://* ]]; then
+      fail "Got bad psol binary location information: $psol_url"
     fi
   else
-    nps_baseurl="https://github.com/pagespeed/ngx_pagespeed/archive"
-    nps_downloaded="$TEMPDIR/$nps_downloaded_fname.zip"
-    status "Downloading ngx_pagespeed..."
-    run wget "$nps_baseurl/$tag_name.zip" -O "$nps_downloaded"
-    nps_module_dir="$BUILDDIR/$nps_downloaded_fname"
-    delete_if_already_exists "$nps_module_dir"
-    status "Extracting ngx_pagespeed..."
-    run unzip -q "$nps_downloaded" -d "$BUILDDIR"
-    run cd "$nps_module_dir"
+    # For past releases we have to grep it from the config file.  The url has
+    # always looked like this, and the config file has contained it since before
+    # we started tagging our ngx_pagespeed releases.
+    psol_url="$(
+      grep -o "https://dl.google.com/dl/page-speed/psol/[0-9.]*.tar.gz" config)"
+    if [ -z "$psol_url" ]; then
+      fail "Couldn't find PSOL url in $PWD/config"
+    fi
   fi
 
-  MOD_PAGESPEED_DIR=""
-  PSOL_BINARY=""
-  if "$PSOL_FROM_SOURCE"; then
-    MOD_PAGESPEED_DIR="$PWD/testing-dependencies/mod_pagespeed"
-    git submodule update --init --recursive -- "$MOD_PAGESPEED_DIR"
-    run pushd "$MOD_PAGESPEED_DIR"
-
-    if "$DEVEL"; then
-      if [ ! -d "$HOME/apache2" ]; then
-        run install/build_development_apache.sh 2.2 prefork
-      fi
-      cd devel
-      run make apache_debug_psol
-      PSOL_BINARY="$MOD_PAGESPEED_DIR/out/$BUILD_TYPE/pagespeed_automatic.a"
-    else
-      run install/build_psol.sh --skip_tests --skip_packaging
-      PSOL_BINARY="$MOD_PAGESPEED_DIR/pagespeed/automatic/pagespeed_automatic.a"
-    fi
-    run popd
-  else
-    # Now we need to figure out what precompiled version of PSOL to build
-    # ngx_pagespeed against.
-    if "$DRYRUN"; then
-      psol_url="https://psol.example.com/cant-get-psol-version-in-dry-run.tar.gz"
-    elif [ -e PSOL_BINARY_URL ]; then
-      # Releases after 1.11.33.4 there is a PSOL_BINARY_URL file that tells us
-      # where to look.
-      psol_url="$(scripts/format_binary_url.sh PSOL_BINARY_URL)"
-      if [[ "$psol_url" != https://* ]]; then
-        fail "Got bad psol binary location information: $psol_url"
-      fi
-    else
-      # For past releases we have to grep it from the config file.  The url has
-      # always looked like this, and the config file has contained it since
-      # before we started tagging our ngx_pagespeed releases.
-      psol_url="$(grep -o \
-          "https://dl.google.com/dl/page-speed/psol/[0-9.]*.tar.gz" config)"
-      if [ -z "$psol_url" ]; then
-        fail "Couldn't find PSOL url in $PWD/config"
-      fi
-    fi
-
-    status "Downloading PSOL binary..."
-    run wget "$psol_url"
-
-    status "Extracting PSOL..."
-    run tar -xzf $(basename "$psol_url")  # extracts to psol/
-  fi
+  run wget "$psol_url"
+  echo "Extracting PSOL..."
+  run tar -xzf $(basename "$psol_url")  # extracts to psol/
 
   if "$DYNAMIC_MODULE"; then
     add_module="--add-dynamic-module=$nps_module_dir"
@@ -675,37 +454,17 @@ Not deleting $directory; name is suspiciously short.  Something is wrong."
   fi
   configure_args=("$add_module" "${extra_flags[@]}")
 
-  if "$DEVEL"; then
-    configure_args=("${configure_args[@]}"
-                    "--prefix=$install_dir/nginx"
-                    "--add-module=$submodules_dir/ngx_cache_purge"
-                    "--add-module=$submodules_dir/ngx_devel_kit"
-                    "--add-module=$submodules_dir/set-misc-nginx-module"
-                    "--add-module=$submodules_dir/headers-more-nginx-module"
-                    "--with-ipv6"
-                    "--with-http_v2_module")
-    if [ "$BUILD_TYPE" = "Debug" ]; then
-      configure_args=("${configure_args[@]}" "--with-debug")
-    fi
-  fi
-
   echo
-  if ! "$BUILD_NGINX"; then
-    # Just prepare the module for them to install.
-    status "ngx_pagespeed is ready to be built against nginx."
-    echo "When running ./configure:"
-    if "$PSOL_FROM_SOURCE"; then
-      echo "  Set the following environment variables:"
-      echo "    MOD_PAGESPEED_DIR=$MOD_PAGESPEED_DIR"
-      echo "    PSOL_BINARY=$PSOL_BINARY"
-    fi
-    echo "  Give ./configure the following arguments:"
-    echo "    $(quote_arguments "${configure_args[@]}")"
-    echo
+  if [ -z "$NGINX_VERSION" ]; then
+    # They didn't specify an nginx version, so we're just preparing the
+    # module for them to install.
+    echo "ngx_pagespeed is ready to be built against nginx."
+    echo "When running ./configure pass in:"
+    echo "  $(quote_arguments "${configure_args[@]}")"
     if [ ${#extra_flags[@]} -eq 0 ]; then
       echo "If this is for integration with an already-built nginx, make sure"
-      echo "to include any other arguments you originally passed to"
-      echo "./configure.  You can see these with 'nginx -V'."
+      echo "to include any other arguments you originally passed to ./configure"
+      echo "You can see these with 'nginx -V'."
     else
       echo "Note: because we need to set $(quote_arguments "${extra_flags[@]}")"
       echo "on this platform, if you want to integrate ngx_pagespeed with an"
@@ -713,93 +472,60 @@ Not deleting $directory; name is suspiciously short.  Something is wrong."
       echo "those flags set."
     fi
   else
-    if "$DEVEL"; then
-      # Use the nginx we loaded as a submodule
-      nginx_dir="$submodules_dir/nginx"
-      configure_location="auto"
-    else
-      # Download and build the specified nginx version.
-      nginx_leaf="nginx-${NGINX_VERSION}.tar.gz"
-      nginx_fname="$TEMPDIR/$nginx_leaf"
-      status "Downloading nginx..."
-      run wget "http://nginx.org/download/$nginx_leaf" -O "$nginx_fname"
-      nginx_dir="$BUILDDIR/nginx-${NGINX_VERSION}/"
-      delete_if_already_exists "$nginx_dir"
-      status "Extracting nginx..."
-      run tar -xzf "$nginx_fname" --directory "$BUILDDIR"
-      configure_location="."
-    fi
-    run cd "$nginx_dir"
-
-    configure=("$configure_location/configure" "${configure_args[@]}")
-    additional_configure_args=""
-    if [ -z "${ADDITIONAL_NGINX_CONFIGURE_ARGUMENTS+x}" ]; then
-      if ! "$ASSUME_YES"; then
-        echo "About to build nginx.  Do you have any additional ./configure"
-        echo "arguments you would like to set?  For example, if you would like"
-        echo "to build nginx with https support give --with-http_ssl_module"
-        echo "If you don't have any, just press enter."
-        read -p "> " additional_configure_args
-      fi
-    else
-      additional_configure_args="$ADDITIONAL_NGINX_CONFIGURE_ARGUMENTS"
-    fi
+    # Download and build nginx.
+    nginx_leaf="nginx-${NGINX_VERSION}.tar.gz"
+    nginx_fname="$TEMPDIR/$nginx_leaf"
+    run wget "http://nginx.org/download/$nginx_leaf" -O "$nginx_fname"
+    nginx_dir="$BUILDDIR/nginx-${NGINX_VERSION}/"
+    delete_if_already_exists "$nginx_dir"
+    echo "Extracting nginx..."
+    run tar -xzf "$nginx_fname" --directory "$BUILDDIR"
+    "$DRYRUN" || cd "$nginx_dir"
 
+    configure=("./configure" "${configure_args[@]}")
+    echo "About to build nginx.  Do you have any additional ./configure"
+    echo "arguments you would like to set?  For example, if you would like"
+    echo "to build nginx with https support give --with-http_ssl_module"
+    echo "If you don't have any, just press enter."
+    read -p "> " additional_configure_args
     if [ -n "$additional_configure_args" ]; then
       # Split additional_configure_args respecting any internal quotation.
       # Otherwise things like --with-cc-opt='-foo -bar' won't work.
       eval additional_configure_args=("$additional_configure_args")
       configure=("${configure[@]}" "${additional_configure_args[@]}")
     fi
-
     echo "About to configure nginx with:"
     echo "   $(quote_arguments "${configure[@]}")"
     continue_or_exit "Does this look right?"
-    MOD_PAGESPEED_DIR="$MOD_PAGESPEED_DIR" \
-      PSOL_BINARY="$PSOL_BINARY" \
-      run "${configure[@]}"
+    run "${configure[@]}"
 
-    if ! "$DEVEL"; then
-      continue_or_exit "Build nginx?"
-    fi
+    continue_or_exit "Build nginx?"
     run make
 
-    if "$DEVEL"; then
-      run make install
+    continue_or_exit "Install nginx?"
+    run sudo make install
 
-      status "Nginx installed with ngx_pagespeed, and set up for development."
-      echo "To run tests:"
-      echo "  cd $nps_module_dir"
-      echo "  test/run_tests.sh"
+    echo
+    if "$DYNAMIC_MODULE"; then
+      echo "Nginx installed with ngx_pagespeed support available as a"
+      echo "loadable module."
       echo
-      echo "To rebuild after changes:"
-      echo "  scripts/rebuild.sh"
+      echo "To load the ngx_pagespeed module, you'll need to add:"
+      echo "  load_module \"modules/ngx_pagespeed.so\";"
+      echo "at the top of your main nginx configuration file."
     else
-      continue_or_exit "Install nginx?"
-      run sudo make install
-
-      echo
-      if "$DYNAMIC_MODULE"; then
-        echo "Nginx installed with ngx_pagespeed support available as a"
-        echo "loadable module."
-        echo
-        echo "To load the ngx_pagespeed module, you'll need to add:"
-        echo "  load_module \"modules/ngx_pagespeed.so\";"
-        echo "at the top of your main nginx configuration file."
-      else
-        echo "Nginx installed with ngx_pagespeed support compiled-in."
-      fi
-      echo
-      echo "If this is a new installation you probably need an init script to"
-      echo "manage starting and stopping the nginx service.  See:"
-      echo "  http://wiki.nginx.org/InitScripts"
-      echo
-      echo "You'll also need to configure ngx_pagespeed if you haven't yet:"
-      echo "  https://developers.google.com/speed/pagespeed/module/configuration"
+      echo "Nginx installed with ngx_pagespeed support compiled-in."
     fi
+    echo
+    echo "If this is a new installation you probably need an init script to"
+    echo "manage starting and stopping the nginx service.  See:"
+    echo "  http://wiki.nginx.org/InitScripts"
+    echo
+    echo "You'll also need to configure ngx_pagespeed if you haven't yet:"
+    echo "  https://developers.google.com/speed/pagespeed/module/configuration"
   fi
   if "$DRYRUN"; then
-    echo_color "$YELLOW" "[this was a dry run; your system is unchanged]"
+    echo "[this was a dry run; your system is unchanged]"
   fi
 }
 

scripts/format_binary_url.sh

@@ -1,18 +1,4 @@
 #!/bin/bash
-#
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 
 set -e
 set -u

scripts/pagespeed_libraries_generator.sh

@@ -1,19 +1,5 @@
 #!/bin/bash
 #
-# Copyright 2013 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 # Converts pagespeed_libraries.conf from Apache-format to Nginx-format,
 # supporting the canonicalize_javascript_libraries filter.
 # Inspired by https://github.com/pagespeed/ngx_pagespeed/issues/532

scripts/rebuild.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Usage: scripts/rebuild.sh
-#
-# After building with "scripts/build_ngx_pagespeed.sh --devel", if you make
-# changes to ngx_pagespeed you'll need to rebuild it.  The underlying commands
-# aren't complicated, but it's faster to work if it's automated.
-
-set -e  # exit script if any command returns an error
-set -u  # exit the script if any variable is uninitialized
-
-this_dir="$(dirname $0)"
-cd "$this_dir/.."
-nps_dir="$PWD"
-
-cd "$nps_dir/testing-dependencies/mod_pagespeed/devel"
-make apache_debug_psol
-
-cd "$nps_dir/testing-dependencies/nginx/"
-make
-make install

src/ngx_pagespeed.cc

@@ -84,6 +84,7 @@ extern ngx_module_t ngx_pagespeed;
 
 // Needed for SystemRewriteDriverFactory to use shared memory.
 #define PAGESPEED_SUPPORT_POSIX_SHARED_MEM
+#define NGINX_1_13_4 1013004
 
 net_instaweb::NgxRewriteDriverFactory* active_driver_factory = NULL;
 
@@ -239,9 +240,6 @@ ngx_http_output_body_filter_pt ngx_http_next_body_filter;
 ngx_int_t ps_base_fetch_filter(ngx_http_request_t* r, ngx_chain_t* in) {
   ps_request_ctx_t* ctx = ps_get_request_context(r);
 
-  if (r->header_only) {
-    return NGX_OK;
-  }
   if (ctx == NULL || ctx->base_fetch == NULL) {
     return ngx_http_next_body_filter(r, in);
   }
@@ -752,11 +750,6 @@ ngx_command_t ps_commands[] = {
   ngx_null_command
 };
 
-bool ps_disabled(ps_srv_conf_t* cfg_s) {
-  return cfg_s->server_context == NULL ||
-         cfg_s->server_context->config()->unplugged();
-}
-
 void ps_ignore_sigpipe() {
   struct sigaction act;
   ngx_memzero(&act, sizeof(act));
@@ -889,7 +882,8 @@ char* ps_configure(ngx_conf_t* cf,
   ps_main_conf_t* cfg_m = static_cast<ps_main_conf_t*>(
       ngx_http_cycle_get_module_main_conf(cf->cycle, ngx_pagespeed));
   if (*options == NULL) {
-    *options = new NgxRewriteOptions(cfg_m->driver_factory->thread_system());
+    *options = new NgxRewriteOptions(
+        cfg_m->driver_factory->thread_system());
   }
 
   ProcessScriptVariablesMode script_mode =
@@ -1155,17 +1149,13 @@ char* ps_merge_srv_conf(ngx_conf_t* cf, void* parent, void* child) {
   delete cfg_s->options;
   cfg_s->options = NULL;
 
-  if (!cfg_s->server_context->global_options()->unplugged()) {
+  if (cfg_s->server_context->global_options()->enabled()) {
     // Validate FileCachePath
     GoogleMessageHandler handler;
     const char* file_cache_path =
         cfg_s->server_context->config()->file_cache_path().c_str();
     if (file_cache_path[0] == '\0') {
-      if (!cfg_s->server_context->global_options()->standby()) {
-        return const_cast<char*>("FileCachePath must be set, even for standby");
-      } else {
-        return const_cast<char*>("FileCachePath must be set");
-      }
+      return const_cast<char*>("FileCachePath must be set");
     } else if (!cfg_m->driver_factory->file_system()->IsDir(
         file_cache_path, &handler).is_true()) {
       return const_cast<char*>(
@@ -1202,7 +1192,7 @@ char* ps_merge_loc_conf(ngx_conf_t* cf, void* parent, void* child) {
   ps_srv_conf_t* cfg_s = static_cast<ps_srv_conf_t*>(
       ngx_http_conf_get_module_srv_conf(cf, ngx_pagespeed));
 
-  if (ps_disabled(cfg_s)) {
+  if (cfg_s->server_context == NULL) {
     // Pagespeed options cannot be defined only in location blocks.  There must
     // be at least a single "pagespeed off" in the main block or a server
     // block.
@@ -1709,7 +1699,7 @@ void ps_release_request_context(void* data) {
 RequestRouting::Response ps_route_request(ngx_http_request_t* r) {
   ps_srv_conf_t* cfg_s = ps_get_srv_config(r);
 
-  if (ps_disabled(cfg_s)) {
+  if (!cfg_s->server_context->global_options()->enabled()) {
     // Not enabled for this server block.
     return RequestRouting::kPagespeedDisabled;
   }
@@ -1851,6 +1841,11 @@ ngx_int_t ps_resource_handler(ngx_http_request_t* r,
     options = cfg_s->server_context->global_options();
   }
 
+  if (!options->enabled()) {
+    // Disabled via query params or request headers.
+    return NGX_DECLINED;
+  }
+
   request_context->set_options(options->ComputeHttpOptions());
 
   // ps_determine_options modified url, removing any ModPagespeedFoo=Bar query
@@ -1877,14 +1872,6 @@ ngx_int_t ps_resource_handler(ngx_http_request_t* r,
       response_category == RequestRouting::kGlobalAdmin ||
       response_category == RequestRouting::kCachePurge;
 
-  // Normally if we're disabled we won't handle any requests, but if we're in
-  // standby mode we do want to handle requests for .pagespeed. resources.
-  if (options->unplugged() ||
-      (!options->enabled() && !pagespeed_resource)) {
-    // Disabled via query params or request headers.
-    return NGX_DECLINED;
-  }
-
   if (!html_rewrite) {
     // create request ctx
     CHECK(ctx == NULL);
@@ -2064,8 +2051,8 @@ ngx_int_t ps_resource_handler(ngx_http_request_t* r,
   if (options->in_place_rewriting_enabled() &&
       options->enabled() &&
       options->IsAllowed(url.Spec())) {
-    ps_create_base_fetch(url.Spec(), ctx, request_context,
-                         request_headers.release(), kIproLookup, options);
+    ps_create_base_fetch(url.Spec(), ctx, request_context, request_headers.release(),
+                         kIproLookup, options);
 
     // Do not store driver in request_context, it's not safe.
     RewriteDriver* driver;
@@ -2291,7 +2278,8 @@ ngx_http_output_body_filter_pt ngx_http_next_body_filter;
 // nginx so it can send them out to the browser.
 ngx_int_t ps_html_rewrite_header_filter(ngx_http_request_t* r) {
   ps_srv_conf_t* cfg_s = ps_get_srv_config(r);
-  if (ps_disabled(cfg_s)) {
+  if (cfg_s->server_context == NULL) {
+    // Pagespeed is on for some server block but not this one.
     return ngx_http_next_header_filter(r);
   }
 
@@ -2375,7 +2363,8 @@ ngx_int_t ps_html_rewrite_header_filter(ngx_http_request_t* r) {
 
 ngx_int_t ps_html_rewrite_body_filter(ngx_http_request_t* r, ngx_chain_t* in) {
   ps_srv_conf_t* cfg_s = ps_get_srv_config(r);
-  if (ps_disabled(cfg_s)) {
+  if (cfg_s->server_context == NULL) {
+    // Pagespeed is on for some server block but not this one.
     return ngx_http_next_body_filter(r, in);
   }
 
@@ -2899,8 +2888,8 @@ ngx_int_t ps_beacon_handler(ngx_http_request_t* r) {
 // supply it to the user.
 ngx_int_t ps_content_handler(ngx_http_request_t* r) {
   ps_srv_conf_t* cfg_s = ps_get_srv_config(r);
-  if (ps_disabled(cfg_s)) {
-    // Pagespeed is not on for this server block.
+  if (cfg_s->server_context == NULL) {
+    // Pagespeed is on for some server block but not this one.
     return NGX_DECLINED;
   }
 
@@ -3019,13 +3008,17 @@ ngx_int_t ps_preaccess_handler(ngx_http_request_t* r) {
   ph = cmcf->phase_engine.handlers;
 
   i = r->phase_handler;
+
   // move handlers before try_files && content phase
+  // As of nginx 1.13.4 we will be right before the try_files module
+  #if (nginx_version < NGINX_1_13_4)
   while (ph[i + 1].checker != ngx_http_core_try_files_phase &&
          ph[i + 1].checker != ngx_http_core_content_phase) {
     ph[i] = ph[i + 1];
     ph[i].next--;
     i++;
   }
+  #endif
 
   // insert ps phase handler
   ph[i].checker = ps_phase_handler;
@@ -3081,8 +3074,17 @@ ngx_int_t ps_init(ngx_conf_t* cf) {
     ngx_http_core_main_conf_t* cmcf = static_cast<ngx_http_core_main_conf_t*>(
         ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module));
 
+    int phase = NGX_HTTP_PREACCESS_PHASE;
+
+    // As of nginx 1.13.4, try_files has changed.
+    // https://github.com/nginx/nginx/commit/129b06dc5dfab7b4513a4f274b3778cd9b8a6a22
+#if (nginx_version >= NGINX_1_13_4)
+    phase = NGX_HTTP_PRECONTENT_PHASE;
+#endif
+
     ngx_http_handler_pt* h = static_cast<ngx_http_handler_pt*>(
-        ngx_array_push(&cmcf->phases[NGX_HTTP_PREACCESS_PHASE].handlers));
+        ngx_array_push(&cmcf->phases[phase].handlers));
+
     if (h == NULL) {
       return NGX_ERROR;
     }

src/ngx_rewrite_driver_factory.cc

@@ -87,6 +87,10 @@ NgxRewriteDriverFactory::NgxRewriteDriverFactory(
       shut_down_(false) {
   InitializeDefaultOptions();
   default_options()->set_beacon_url("/ngx_pagespeed_beacon");
+  // Put in the version of the ngx-pagespeed release. We don't release mod_pagespeed
+  // so we cannot rely on PSOL to hand us to right version. Note that if we perform
+  // another release, this must be either updated or removed.
+  default_options()->set_x_header_value("1.12.34.3-0");
   SystemRewriteOptions* system_options = dynamic_cast<SystemRewriteOptions*>(
       default_options());
   system_options->set_file_cache_clean_inode_limit(500000);

src/ngx_rewrite_options.cc

@@ -192,18 +192,15 @@ RewriteOptions::OptionScope NgxRewriteOptions::GetOptionScope(
 
 RewriteOptions::OptionSettingResult NgxRewriteOptions::ParseAndSetOptions0(
     StringPiece directive, GoogleString* msg, MessageHandler* handler) {
-  EnabledEnum enabled;
-  if (!ParseFromString(directive, &enabled)) {
+  if (IsDirective(directive, "on")) {
+    set_enabled(RewriteOptions::kEnabledOn);
+  } else if (IsDirective(directive, "off")) {
+    set_enabled(RewriteOptions::kEnabledOff);
+  } else if (IsDirective(directive, "unplugged")) {
+    set_enabled(RewriteOptions::kEnabledUnplugged);
+  } else {
     return RewriteOptions::kOptionNameUnknown;
   }
-  if (enabled == RewriteOptions::kEnabledOff) {
-    // In ngx_pagespeed, for historical reasons, we treat "off" as "unplugged".
-    // Also, "off" is deprecated and people should be using "standby" or
-    // "unplugged" now depending on which sense they want.  See comment on
-    // RewriteOptions::EnabledEnum.
-    enabled = RewriteOptions::kEnabledUnplugged;
-  }
-  set_enabled(enabled);
   return RewriteOptions::kOptionOk;
 }
 

test/nginx_system_test.sh

@@ -49,11 +49,7 @@ rm -rf "$TEST_TMP"
 mkdir -p "$TEST_TMP"
 echo TEST_TMP=$TEST_TMP
 
-if [ -d "$MOD_PAGESPEED_DIR/src" ]; then
-  MOD_PAGESPEED_DIR+="/src"
-fi
-
-APACHE_DOC_SRC="$MOD_PAGESPEED_DIR/install/"
+APACHE_DOC_SRC="$MOD_PAGESPEED_DIR/src/install/"
 SERVER_ROOT="$TEST_TMP/root"
 echo SERVER_ROOT=$SERVER_ROOT
 rm -rf "$SERVER_ROOT"
@@ -315,7 +311,7 @@ SERVER_NAME=nginx
 RUN_CONTROLLER_TEST=${RUN_CONTROLLER_TEST:-off}
 
 # run generic system tests
-PAGESPEED_DIR="$MOD_PAGESPEED_DIR/pagespeed"
+PAGESPEED_DIR="$MOD_PAGESPEED_DIR/src/pagespeed"
 SYSTEM_TEST_FILE="$PAGESPEED_DIR/system/system_test.sh"
 REMOTE_CONFIG_TEST_FILE="$PAGESPEED_DIR/system/remote_config_test.sh"
 
@@ -369,13 +365,6 @@ fi
 # wants different ones than we want, so we need to reset our positional args.
 set -- "$PRIMARY_HOSTNAME"
 source $SYSTEM_TEST_FILE
-
-# If we were only asked to run a single test, it ran in SYSTEM_TEST_FILE, so
-# we're done now and should exit.
-if [ -n ${TEST_TO_RUN+x} ]; then
-  check_failures_and_exit
-fi
-
 source $REMOTE_CONFIG_TEST_FILE
 
 # nginx-specific system tests
@@ -1431,7 +1420,7 @@ OUT=$(cat "$ERROR_LOG" \
     | grep -v "\\[error\\].*forbidden.example.com*" \
     | grep -v "\\[error\\].*custom-paths.example.com*" \
     | grep -v "\\[error\\].*bogus_format*" \
-    | grep -v "\\[error\\].*/install/foo*" \
+    | grep -v "\\[error\\].*src/install/foo*" \
     | grep -v "\\[error\\].*recv() failed*" \
     | grep -v "\\[error\\].*send() failed*" \
     | grep -v "\\[error\\].*Invalid url requested: js_defer.js.*" \

test/pagespeed_test.conf.template

@@ -85,8 +85,6 @@ http {
   pagespeed StatisticsLogging on;
   pagespeed LogDir "@@TEST_TMP@@/logdir";
 
-  pagespeed MaxFetchRedirects 3;
-
   # Expanded to CentralControllerPort directive when RUN_CONTROLLER_TEST=on
   @@CONTROLLER@@
 
@@ -134,42 +132,6 @@ http {
       "@@SERVER_ROOT@@/mod_pagespeed_example/styles/";
   }
 
-  server {
-    listen @@SECONDARY_PORT@@;
-    listen [::]:@@SECONDARY_PORT@@;
-    server_name pagespeed-off.example.com;
-    pagespeed FileCachePath "@@FILE_CACHE@@";
-    pagespeed off;
-    pagespeed EnableFilters collapse_whitespace;
-  }
-
-  server {
-    listen @@SECONDARY_PORT@@;
-    listen [::]:@@SECONDARY_PORT@@;
-    server_name pagespeed-on.example.com;
-    pagespeed FileCachePath "@@FILE_CACHE@@";
-    pagespeed on;
-    pagespeed EnableFilters collapse_whitespace;
-  }
-
-  server {
-    listen @@SECONDARY_PORT@@;
-    listen [::]:@@SECONDARY_PORT@@;
-    server_name pagespeed-standby.example.com;
-    pagespeed FileCachePath "@@FILE_CACHE@@";
-    pagespeed standby;
-    pagespeed EnableFilters collapse_whitespace;
-  }
-
-  server {
-    listen @@SECONDARY_PORT@@;
-    listen [::]:@@SECONDARY_PORT@@;
-    server_name pagespeed-unplugged.example.com;
-    pagespeed FileCachePath "@@FILE_CACHE@@";
-    pagespeed unplugged;
-    pagespeed EnableFilters collapse_whitespace;
-  }
-
   pagespeed UseNativeFetcher "@@NATIVE_FETCHER@@";
   @@RESOLVER@@
 
@@ -1674,50 +1636,6 @@ http {
     pagespeed MessagesDomains Disallow *;
     pagespeed FileCachePath "@@FILE_CACHE@@";
   }
-
-  server {
-    listen @@SECONDARY_PORT@@;
-    listen [::]:@@SECONDARY_PORT@@;
-    server_name redirecting-fetch.example.com;
-    pagespeed FileCachePath "@@FILE_CACHE@@";
-    pagespeed Domain redirecting-fetch.example.com:@@SECONDARY_PORT@@;
-    pagespeed MapOriginDomain 127.0.0.1:@@SECONDARY_PORT@@
-    	      redirecting-fetch.example.com:@@SECONDARY_PORT@@;
-    pagespeed Disallow *styles/disallowed.css;
-    pagespeed InPlaceResourceOptimization off;
-
-    location /redir_to_test/styles/blue.css {
-      return 301 /mod_pagespeed_example/styles/yellow.css;
-    }
-    location /redir_to_test/styles/1.css {
-      return 301 /redir_to_test/styles/2.css;
-    }
-    location /redir_to_test/styles/2.css {
-      return 301 /mod_pagespeed_example/styles/yellow.css;
-    }
-    location /redir_to_test/styles/redirtodisallowed.css {
-      return 301 /redir_to_test/styles/disallowed.css;
-    }
-  }
-
-  server {
-    listen @@SECONDARY_PORT@@;
-    listen [::]:@@SECONDARY_PORT@@;
-    server_name redirecting-fetch-single-only.example.com;
-    pagespeed FileCachePath "@@FILE_CACHE@@";
-    pagespeed MaxFetchRedirects 1;
-    pagespeed Domain redirecting-fetch.example.com:@@SECONDARY_PORT@@;
-    pagespeed MapOriginDomain 127.0.0.1:@@SECONDARY_PORT@@ 
-       redirecting-fetch-single-only.example.com:@@SECONDARY_PORT@@;
-
-    location /redir_to_test/styles/1.css {
-      return 301 /redir_to_test/styles/2.css;
-    }
-    location /redir_to_test/styles/2.css {
-      return 301 /mod_pagespeed_example/styles/yellow.css;
-    }
-  }
-
   server {
     server_name nothing-explicitly-allowed.example.com;
     pagespeed FileCachePath "@@FILE_CACHE@@";

test/run_tests.sh

@@ -23,15 +23,8 @@
 # Exits with status 2 if command line args are wrong.
 #
 # Usage:
-#   ./run_tests.sh
-# Or:
 #   ./run_tests.sh /path/to/mod_pagespeed /path/to/nginx/binary
 #
-# If you built ngx_pagespeed with "scripts/build_ngx_pagespeed.sh --devel" then
-# you don't need to pass any arguments to run_tests.sh.  Otherwise, you'll need
-# to tell it where to find a mod_pagespeed checkout (for example html files etc)
-# and the nginx binary to test.
-#
 # By default the test script uses several ports.  If you have a port conflict
 # and need to override one you can do that by setting the relevant environment
 # variable.  For example:
@@ -52,28 +45,23 @@ RUN_TESTS=${RUN_TESTS:-true}
 # true.
 USE_VALGRIND=${USE_VALGRIND:-false}
 
-if [ "$#" -eq 0 ]; then
-  MOD_PAGESPEED_DIR="testing-dependencies/mod_pagespeed/"
-  NGINX_EXECUTABLE="nginx/sbin/nginx"
-elif [ "$#" -eq 2 ]; then
-  MOD_PAGESPEED_DIR="$1"
-  NGINX_EXECUTABLE="$2"
-else
-  echo "Usage: $0 [mod_pagespeed_dir nginx_executable]"
+if [ "$#" -ne 2 ] ; then
+  echo "Usage: $0 mod_pagespeed_dir nginx_executable"
   exit 2
 fi
 
+MOD_PAGESPEED_DIR="$1"
+NGINX_EXECUTABLE="$2"
+
 : ${PRIMARY_PORT:=8050}
 : ${SECONDARY_PORT:=8051}
 : ${CONTROLLER_PORT:=8053}
 : ${RCPORT:=9991}
 : ${PAGESPEED_TEST_HOST:=selfsigned.modpagespeed.com}
-: ${PHP_PORT:=9000}
 
 this_dir="$( cd $(dirname "$0") && pwd)"
 
 function run_test_checking_failure() {
-  "$MOD_PAGESPEED_DIR/install/start_php.sh" "$PHP_PORT"
   USE_VALGRIND="$USE_VALGRIND" \
     PRIMARY_PORT="$PRIMARY_PORT" \
     SECONDARY_PORT="$SECONDARY_PORT" \