Readd pthread_mutex.h include on ngx_fetch.cc.

Messed up the merge of 0290f52a88 originally, add the include back.

.gitignore

@@ -1,5 +1,4 @@
 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/apache/incubator-pagespeed-mod.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,33 +0,0 @@
-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
-script:
-  test/run_tests.sh $PWD/testing-dependencies/mod_pagespeed/ \
-                    $PWD/nginx/sbin/nginx
-dist: trusty
-sudo: required
-compiler:
-  - gcc
-notifications:
-  email:
-    - pagespeed-ci@googlegroups.com

NOTICE

@@ -1,17 +0,0 @@
-Apache ngx_pagespeed
-
-Copyright 2018 The Apache Software Foundation
-
-This product includes software developed at
-  - The Apache Software Foundation (http://www.apache.org/).
-  - Google Inc.
-
-Codebase originally donated by Google Inc:
-
-Copyright (C) 2010-2017 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

PSOL_BINARY_URL

@@ -1,4 +0,0 @@
-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/apache/incubator-pagespeed-ngx/wiki/Building-PSOL-From-Source

README.md

@@ -1,6 +1,4 @@
-![ngx_pagespeed](https://user-images.githubusercontent.com/6751650/73116078-338a9180-3f0f-11ea-8fdf-8c99cb4bec7f.png)
-
-[![Build Status](https://travis-ci.org/apache/incubator-pagespeed-ngx.svg?branch=master)](https://travis-ci.org/apache/incubator-pagespeed-ngx)
+![ngx_pagespeed](https://lh6.googleusercontent.com/-qufedJIJq7Y/UXEvVYxyYvI/AAAAAAAADo8/JHDFQhs91_c/s401/04_ngx_pagespeed.png)
 
 ngx_pagespeed speeds up your site and reduces page load time by automatically
 applying web performance best practices to pages and associated assets (CSS,

RETIRED.txt

@@ -1 +0,0 @@
-This podling has been retired, please see: http://incubator.apache.org/projects/index.html#pagespeed

config

@@ -15,40 +15,26 @@
 # Environment Variables (Optional):
 #   MOD_PAGESPEED_DIR: absolute path to the mod_pagespeed/src directory
 #   PSOL_BINARY: absolute path to pagespeed_automatic.a
-#   PSOL_BUILDTYPE: Release or Debug
 
 mod_pagespeed_dir="${MOD_PAGESPEED_DIR:-unset}"
-position_aux="${POSITION_AUX:-unset}"
-psol_buildtype="${PSOL_BUILDTYPE:-unset}"
-
 if [ "$mod_pagespeed_dir" = "unset" ] ; then
   mod_pagespeed_dir="$ngx_addon_dir/psol/include"
   build_from_source=false
 
   if [ ! -e "$mod_pagespeed_dir" ] ; then
     echo "ngx_pagespeed: pagespeed optimization library not found:"
-
-    psol_binary_url="$($ngx_addon_dir/scripts/format_binary_url.sh \
-                           $ngx_addon_dir/PSOL_BINARY_URL)"
-    if [[ "$psol_binary_url" != https://* ]]; then
-      echo "
-  This is a development branch of ngx_pagespeed, which means there is no
-  precompiled PSOL library available to link against.  Either build from a
-  release tag, like latest-beta, or build PSOL from source:
-    https://github.com/apache/incubator-pagespeed-ngx/wiki/Building-PSOL-From-Source"
-      exit 1
-    fi
-
-    echo "
-  You need to separately download the pagespeed library:
-     $ cd $ngx_addon_dir
-     $ wget $psol_binary_url
-     $ tar -xzvf $(basename $psol_binary_url) # expands to psol/
-
-  Or see the installation instructions:
-     https://developers.google.com/speed/pagespeed/module/build_ngx_pagespeed_from_source"
+    echo ""
+    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.9.32.2.tar.gz"
+    echo "     $ tar -xzvf 1.9.32.2.tar.gz # expands to psol/"
+    echo ""
+    echo "   Or see the installation instructions:"
+    echo "     https://github.com/pagespeed/ngx_pagespeed#how-to-build"
     exit 1
   fi
+
 else
   build_from_source=true
 fi
@@ -77,30 +63,12 @@ else
   exit 1
 fi
 
-if [ "$psol_buildtype" = "unset" ] ; then
-  if [ "$NGX_DEBUG" = "YES" ]; then
-    buildtype=Debug
-    # If we're using a psol tarball that doesn't contain Debug/ (which is the case
-    # from 1.12 onward) then this will be overriden to buildtype=Release below.
-  else
-    buildtype=Release
-  fi
+if [ "$NGX_DEBUG" = "YES" ]; then
+  buildtype=Debug
 else
-  buildtype=$psol_buildtype
+  buildtype=Release
 fi
 
-# If the compiler is gcc, we want to use g++ to link, if at all possible,
-# so that -static-libstdc++ works.
-# Annoyingly, the feature test doesn't even use $LINK for linking, so that
-# needs an explicit -lstdc++
-pagespeed_libs=
-ps_maybe_gpp_base=`basename $CC| sed s/gcc/g++/`
-ps_maybe_gpp="`dirname $CC`/$ps_maybe_gpp_base"
-if [ -n "$NGX_GCC_VER" -a \( -x "$ps_maybe_gpp" \) ]; then
-  LINK=$ps_maybe_gpp
-fi
-pagespeed_libs="-lstdc++"
-
 # The compiler needs to know that __sync_add_and_fetch_4 is ok,
 # and this requires an instruction that didn't exist on i586 or i386.
 if [ "$uname_arch" = "i686" ]; then
@@ -109,14 +77,6 @@ fi
 
 CFLAGS="$CFLAGS $FLAG_MARCH"
 
-# For now, standardize on gcc-4.x ABI --- if we don't set this, people building
-# with new gcc defaulting to gcc-5 C++11 ABI will have build trouble linking
-# to our libpsol.a
-# See https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
-CFLAGS="$CFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
-CC_OLD_TEST_FLAGS="$CC_TEST_FLAGS"
-CC_TEST_FLAGS="$CC_TEST_FLAGS -D_GLIBCXX_USE_CXX11_ABI=0 --std=c++11"
-
 case "$NGX_GCC_VER" in
   4.8*)
     # On GCC 4.8 and above, -Wall enables -Wunused-local-typedefs.  This breaks
@@ -135,13 +95,6 @@ case "$NGX_GCC_VER" in
   ;;
 esac
 
-# workaround for a bug in nginx-1.9.11, see:
-# http://hg.nginx.org/nginx/rev/ff1e625ae55b
-NGX_VERSION=`grep nginx_version src/core/nginx.h | sed -e 's/^.* \(.*\)$/\1/'`
-if [ "$NGX_VERSION" = "1009011" ]; then
-    CFLAGS="$CFLAGS -Wno-write-strings"
-fi
-
 if [ "$WNO_ERROR" = "YES" ]; then
     CFLAGS="$CFLAGS -Wno-error"
 fi
@@ -150,24 +103,8 @@ psol_binary="${PSOL_BINARY:-unset}"
 if [ "$psol_binary" = "unset" ] ; then
   if $build_from_source ; then
     psol_binary="\
-        $mod_pagespeed_dir/pagespeed/automatic/pagespeed_automatic.a"
+        $mod_pagespeed_dir/net/instaweb/automatic/pagespeed_automatic.a"
   else
-    if ! [ -d "$ngx_addon_dir/psol/lib/$buildtype" ]; then
-      echo "
-You have set --with-debug for building nginx, but precompiled Debug binaries for
-PSOL, which ngx_pagespeed depends on, aren't available.  If you're trying to
-debug PSOL you need to build it from source.  If you just want to run nginx with
-debug-level logging you can use the Release binaries."
-      echo -n "
-Use the available Release binaries?"
-      read -p " [Y/n] " yn
-      if [[ "$yn" == N* || "$yn" == n* ]]; then
-        echo "Cancelled."
-        exit 1
-      fi
-
-      buildtype=Release
-    fi
     psol_library_dir="$ngx_addon_dir/psol/lib/$buildtype/$os_name/$arch_name"
     psol_binary="$psol_library_dir/pagespeed_automatic.a"
   fi
@@ -190,24 +127,21 @@ ngx_feature_incs="
 pagespeed_include="\
   $mod_pagespeed_dir \
   $mod_pagespeed_dir/third_party/chromium/src \
-  $mod_pagespeed_dir/third_party/google-sparsehash/src/src \
+  $mod_pagespeed_dir/third_party/google-sparsehash/src \
   $mod_pagespeed_dir/third_party/google-sparsehash/gen/arch/$os_name/$arch_name/include \
-  $mod_pagespeed_dir/third_party/grpc/src/include \
-  $mod_pagespeed_dir/third_party/protobuf/src/src \
+  $mod_pagespeed_dir/third_party/protobuf/src \
   $mod_pagespeed_dir/third_party/re2/src \
   $mod_pagespeed_dir/out/$buildtype/obj/gen \
   $mod_pagespeed_dir/out/$buildtype/obj/gen/protoc_out/instaweb \
   $mod_pagespeed_dir/third_party/apr/src/include \
   $mod_pagespeed_dir/third_party/aprutil/src/include \
   $mod_pagespeed_dir/third_party/apr/gen/arch/$os_name/$arch_name/include \
-  $mod_pagespeed_dir/third_party/aprutil/gen/arch/$os_name/$arch_name/include \
-  $mod_pagespeed_dir/url"
+  $mod_pagespeed_dir/third_party/aprutil/gen/arch/$os_name/$arch_name/include"
 ngx_feature_path="$pagespeed_include"
 
-pagespeed_libs="$psol_binary $pagespeed_libs -lrt -pthread -lm -luuid"
+pagespeed_libs="-lstdc++ $psol_binary -lrt -pthread -lm"
 ngx_feature_libs="$pagespeed_libs"
 ngx_feature_test="
-
   GoogleString output_buffer;
   net_instaweb::StringWriter write_to_string(&output_buffer);
 
@@ -228,163 +162,52 @@ ngx_feature_test="
 # Test whether we have pagespeed and can compile and link against it.
 . "$ngx_addon_dir/cpp_feature"
 
-if [ $ngx_found = no ]; then
-  cat << END
-$0: error: module ngx_pagespeed requires the pagespeed optimization library.
-Look in $PWD/$NGX_AUTOCONF_ERR for more details.
-END
-  exit 1
-fi
+if [ $ngx_found = yes ]; then
+  ps_src="$ngx_addon_dir/src"
+  ngx_addon_name=ngx_pagespeed
+  NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
+    $ps_src/log_message_handler.h \
+    $ps_src/ngx_base_fetch.h \
+    $ps_src/ngx_caching_headers.h \
+    $ps_src/ngx_fetch.h \
+    $ps_src/ngx_gzip_setter.h \
+    $ps_src/ngx_list_iterator.h \
+    $ps_src/ngx_message_handler.h \
+    $ps_src/ngx_pagespeed.h \
+    $ps_src/ngx_rewrite_driver_factory.h \
+    $ps_src/ngx_rewrite_options.h \
+    $ps_src/ngx_server_context.h \
+    $ps_src/ngx_url_async_fetcher.h \
+    $psol_binary"
+  NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
+    $ps_src/log_message_handler.cc \
+    $ps_src/ngx_base_fetch.cc \
+    $ps_src/ngx_caching_headers.cc \
+    $ps_src/ngx_fetch.cc \
+    $ps_src/ngx_gzip_setter.cc \
+    $ps_src/ngx_list_iterator.cc \
+    $ps_src/ngx_message_handler.cc \
+    $ps_src/ngx_pagespeed.cc \
+    $ps_src/ngx_rewrite_driver_factory.cc \
+    $ps_src/ngx_rewrite_options.cc \
+    $ps_src/ngx_server_context.cc \
+    $ps_src/ngx_url_async_fetcher.cc"
 
-ps_src="$ngx_addon_dir/src"
-ngx_addon_name=ngx_pagespeed
-NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
-$ps_src/log_message_handler.h \
-$ps_src/ngx_base_fetch.h \
-$ps_src/ngx_caching_headers.h \
-$ps_src/ngx_event_connection.h \
-$ps_src/ngx_fetch.h \
-$ps_src/ngx_gzip_setter.h \
-$ps_src/ngx_list_iterator.h \
-$ps_src/ngx_message_handler.h \
-$ps_src/ngx_pagespeed.h \
-$ps_src/ngx_rewrite_driver_factory.h \
-$ps_src/ngx_rewrite_options.h \
-$ps_src/ngx_server_context.h \
-$ps_src/ngx_url_async_fetcher.h \
-$psol_binary"
-NPS_SRCS=" \
-$ps_src/log_message_handler.cc \
-$ps_src/ngx_base_fetch.cc \
-$ps_src/ngx_caching_headers.cc \
-$ps_src/ngx_event_connection.cc \
-$ps_src/ngx_fetch.cc \
-$ps_src/ngx_gzip_setter.cc \
-$ps_src/ngx_list_iterator.cc \
-$ps_src/ngx_message_handler.cc \
-$ps_src/ngx_pagespeed.cc \
-$ps_src/ngx_rewrite_driver_factory.cc \
-$ps_src/ngx_rewrite_options.cc \
-$ps_src/ngx_server_context.cc \
-$ps_src/ngx_url_async_fetcher.cc"
-# Save our sources in a separate var since we may need it in config.make
-PS_NGX_SRCS="$NGX_ADDON_SRCS \
-$NPS_SRCS"
-
-# Make pagespeed run immediately before gzip and Brotli.
-if echo $HTTP_FILTER_MODULES | grep ngx_http_brotli_filter_module >/dev/null; then
-  next=ngx_http_brotli_filter_module
-elif [ $HTTP_GZIP = YES ]; then
-  next=ngx_http_gzip_filter_module
-else
-  next=ngx_http_range_header_filter_module
-fi
-
-if [ -n "$ngx_module_link" ]; then
-  # nginx-1.9.11+
-  ngx_module_type=HTTP_FILTER
-  ngx_module_name="ngx_pagespeed ngx_pagespeed_etag_filter"
-  ngx_module_incs="$ngx_feature_path"
-  ngx_module_deps=
-  ngx_module_srcs="$NPS_SRCS"
-  ngx_module_libs="$ngx_feature_libs"
-  ngx_module_order="ngx_http_range_header_filter_module\
-                    ngx_pagespeed_etag_filter\
-                    ngx_http_gzip_filter_module \
-                    ngx_http_brotli_filter_module \
-                    ngx_pagespeed \
-                    ngx_http_postpone_filter_module \
-                    ngx_http_ssi_filter_module \
-                    ngx_http_charset_filter_module \
-                    ngx_http_xslt_filter_module \
-                    ngx_http_image_filter_module \
-                    ngx_http_sub_filter_module \
-                    ngx_http_addition_filter_module \
-                    ngx_http_gunzip_filter_module \
-                    ngx_http_userid_filter_module \
-                    ngx_http_headers_filter_module"
-
-    . auto/module
-
-    if [ $ngx_module_link != DYNAMIC ]; then
-      # ngx_module_order doesn't work with static modules,
-      # so we must re-order filters here.
-      if [ "$position_aux" = "true" ] ; then
-        HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES $ngx_addon_name"
-      else
-        HTTP_FILTER_MODULES=$(echo $HTTP_FILTER_MODULES \
-                             | sed "s/ngx_pagespeed//" \
-                             | sed "s/$next/$next ngx_pagespeed/")
-      fi
-      # Make the etag header filter run immediately before range header filter.
-      HTTP_FILTER_MODULES=$(echo $HTTP_FILTER_MODULES \
-                           | sed "s/ngx_pagespeed_etag_filter//" \
-                           | sed "s/ngx_http_range_header_filter_module/ngx_http_range_header_filter_module ngx_pagespeed_etag_filter/")
-    else
-      if [ "$position_aux" = "true" ] ; then
-        ngx_module_type=HTTP_AUX_FILTER
-        ngx_module_order=""
-      fi
-    fi
-else
+  # 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/")
+  # Make the etag header filter run immediately after gzip.
+  HTTP_FILTER_MODULES=$(echo $HTTP_FILTER_MODULES |\
+    sed "s/$HTTP_GZIP_FILTER_MODULE/ngx_pagespeed_etag_filter $HTTP_GZIP_FILTER_MODULE/")
   CORE_LIBS="$CORE_LIBS $pagespeed_libs"
   CORE_INCS="$CORE_INCS $pagespeed_include"
-  NGX_ADDON_SRCS="$PS_NGX_SRCS"
-  if [ "$position_aux" = "true" ] ; then
-    HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES $ngx_addon_name"
-  else
-    HTTP_FILTER_MODULES=$(echo $HTTP_FILTER_MODULES | sed "s/$next/$next $ngx_addon_name/")
-  fi
-
-  # Make the etag header filter run immediately before range header filter.
-  HTTP_FILTER_MODULES=$(echo $HTTP_FILTER_MODULES |\
-    sed "s/ngx_http_range_header_filter_module/ngx_http_range_header_filter_module ngx_pagespeed_etag_filter/")
-fi
-
-echo "List of modules (in reverse order of applicability): "$HTTP_FILTER_MODULES
-
-# Test whether the compiler is compatible
-ngx_feature="psol-compiler-compat"
-ngx_feature_name=""
-ngx_feature_run=no
-ngx_feature_incs=""
-ngx_feature_path=""
-ngx_feature_libs="-lstdc++"
-ngx_feature_test="
-
-#if defined(__clang__) && defined(__GLIBCXX__)
-   // See https://gcc.gnu.org/onlinedocs/libstdc++/manual/abi.html#abi.versioning
-   // for a list of various values of __GLIBCXX__. Note that they're not monotonic
-   // with respect to version numbers.
-   #if __GLIBCXX__ == 20120322  || __GLIBCXX__ == 20120614
-      #error \"clang is using libstdc++ 4.7.0 or 4.7.1, which can cause binary incompatibility.\"
-   #endif
-#endif
-
-#if !defined(__clang__) && defined(__GNUC__)
-   #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8)
-      #error \"GCC < 4.8 no longer supported. Please use gcc >= 4.8 or clang >= 3.3\"
-   #endif
-#endif
-
-#if defined(__clang__)
-   #if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 3)
-      #error \"Please use gcc >= 4.8 or clang >= 3.3\"
-   #endif
-#endif
-"
-
-. "$ngx_addon_dir/cpp_feature"
-
-if [ $ngx_found = no ]; then
+  echo "List of modules (in reverse order of applicability): "$HTTP_FILTER_MODULES
+else
   cat << END
-$0: error: module ngx_pagespeed requires gcc >= 4.8 or clang >= 3.3.
-See https://developers.google.com/speed/pagespeed/module/build_ngx_pagespeed_from_source for some recommendations.
-Look in $PWD/$NGX_AUTOCONF_ERR for more details.
+$0: error: module ngx_pagespeed requires the pagespeed optimization library.
+Look in objs/autoconf.err for more details.
 END
   exit 1
 fi
 
 have=NGX_PAGESPEED . auto/have
-
-CC_TEST_FLAGS="$CC_OLD_TEST_FLAGS"

config.make

@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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.
-
-# Since nginx build system doesn't normally do C++, there is no CXXFLAGS for us
-# to touch, and compilers are understandably unhappy with --std=c++11 on C
-# files. Hence, we hack the makefile to add it for just our sources.
-
-for ps_src_file in $PS_NGX_SRCS; do
-  ps_obj_file="$NGX_OBJS/addon/src/`basename $ps_src_file .cc`.o"
-  echo "$ps_obj_file : CFLAGS += --std=c++11" >> $NGX_MAKEFILE
-done

docker/README.md

@@ -1,187 +0,0 @@
-# Supported tags and respective `Dockerfile` links
-
-- [`1.13.35.2`, `stable`, `1.13.35`, `1.13`, `1.13.35.2-alpine3.8`, `1.13.35-alpine3.8`, `1.13-alpine3.8`, `stable-alpine3.8`, `1.13.35.2-alpine3.8-ngx1.14`, `1.13.35-alpine3.8-ngx1.14`, `1.13-alpine3.8-ngx1.14`, `stable-alpine3.8-ngx1.14`, `latest` (*alpine-3.8/nginx-stable/Dockerfile*)](https://github.com/apache/incubator-pagespeed-ngx/blob/master/docker/alpine-3.8/nginx-stable/Dockerfile)
-- [`1.13.35.2-edge`, `stable-edge`, `edge`, `1.13.35-edge`, `1.13-edge`, `1.13.35.2-edge-ngx1.14`, `1.13.35-edge-ngx1.14`, `1.13-edge-ngx1.14`, `stable-edge-ngx1.14` (*alpine-edge/nginx-stable/Dockerfile*)](https://github.com/apache/incubator-pagespeed-ngx/blob/master/docker/alpine-edge/nginx-stable/Dockerfile)
-- [`1.13.35.2-alpine3.8-ngx1.15`, `ngx1.15`, `1.13.35-alpine3.8-ngx1.15`, `1.13-alpine3.8-ngx1.15`, `stable-alpine3.8-ngx1.15` (*alpine-3.8/nginx-mainline/Dockerfile*)](https://github.com/apache/incubator-pagespeed-ngx/blob//master/docker/alpine-3.8/nginx-mainline/Dockerfile)
-- [`1.13.35.2-edge-ngx1.15`, `1.13.35-edge-ngx1.15`, `1.13-edge-ngx1.15`, `stable-edge-ngx1.15` (*alpine-edge/nginx-mainline/Dockerfile*)](https://github.com/apache/incubator-pagespeed-ngx/blob/master/docker/alpine-edge/nginx-mainline/Dockerfile)
-
-# Quick reference
-
--	**Where to get help**:
-  [Read the wiki](https://github.com/apache/incubator-pagespeed-mod/wiki), [Ask a question on the mailing list](https://groups.google.com/group/ngx-pagespeed-discuss)  
-
-- **Docker image repository**:
-  [Dockerhub](https://hub.docker.com/r/pagespeed/nginx-pagespeed)
-
-- **Git Dockerfile repository**:
-  [Github](https://github.com/apache/incubator-pagespeed-ngx/tree/master/docker)
-
--	**Where to file issues**:
-	[https://github.com/We-Amp/ngx-pagespeed-alpine/issues](https://github.com/apache/incubator-pagespeed-ngx/issues)
-
--	**Docker images maintained by**:
-	[Nico Berlee](mailto:nico.berlee@on2it.net)
-
--	**Supported Docker versions**:
-	[the latest release](https://github.com/docker/docker-ce/releases/latest) (down to 1.12 on a best-effort basis)
-
-# What is pagespeed?
-
-The PageSpeed Modules, [mod_pagespeed](https://github.com/apache/incubator-pagespeed-mod) and [ngx_pagespeed](https://github.com/apache/incubator-pagespeed-ngx), are open-source webserver modules that [optimize your site automatically](https://www.modpagespeed.com/doc/filters).
-
-ngx_pagespeed speeds up your site and reduces page load time by automatically
-applying web performance best practices to pages and associated assets (CSS,
-JavaScript, images) without requiring you to modify your existing content or
-workflow. Features include:
-
-- Image optimization: stripping meta-data, dynamic resizing, recompression
-- CSS & JavaScript minification, concatenation, inlining, and outlining
-- Small resource inlining
-- Deferring image and JavaScript loading
-- HTML rewriting
-- Cache lifetime extension
-- and [more](https://developers.google.com/speed/docs/mod_pagespeed/config_filters)
-
-To see ngx_pagespeed in action, with example pages for each of the
-optimizations, see our [demonstration site](http://ngxpagespeed.com).
-
-![logo](https://camo.githubusercontent.com/4138679c6cf85adb18c4cf820189c898f7dbf5cb/68747470733a2f2f6c68362e676f6f676c6575736572636f6e74656e742e636f6d2f2d71756665644a494a7137592f55584576565978795976492f4141414141414141446f382f4a48444651687339315f632f733430312f30345f6e67785f7061676573706565642e706e67)
-
-# What is nginx?
-
-Nginx (pronounced "engine-x") is an open source reverse proxy server for HTTP, HTTPS, SMTP, POP3, and IMAP protocols, as well as a load balancer, HTTP cache, and a web server (origin server). The nginx project started with a strong focus on high concurrency, high performance and low memory usage.
-> [wikipedia.org/wiki/Nginx](https://en.wikipedia.org/wiki/Nginx)
-
-# What is nginx-pagespeed?
-
-The nginx-pagespeed brings all the goods of nginx and pagespeed together in one single small alpine docker image. Nginx-pagespeed aims to be 100% compatible with the plain [nginx](https://hub.docker.com/_/nginx/) images. Meaning, nginx-pagespeed can be a safe drop-in replacement for any container running `nginx:alpine`.
-
-Nginx-pagespeed makes it easy to start optimizing your website by reducing page load time, without requiring you to modify existing content.
-
-# How to use this image
-
-## Hosting some simple static content
-
-```console
-$ docker run --name pagespeed-nginx -v /some/content:/usr/share/nginx/html:ro -d pagespeed/nginx-pagespeed
-```
-
-Alternatively, a simple `Dockerfile` can be used to generate a new image that includes the necessary content (which is a much cleaner solution than the bind mount above):
-
-```dockerfile
-FROM pagespeed/nginx-pagespeed
-COPY static-html-directory /usr/share/nginx/html
-```
-
-Place this file in the same directory as your directory of content ("static-html-directory"), run `docker build -t some-content-ngxpagespeed .`, then start your container:
-
-```console
-$ docker run --name my-nginx-pagespeed -d some-content-ngxpagespeed
-```
-
-## Exposing external port
-
-```console
-$ docker run --name my-nginx-pagespeed -d -p 8080:80 some-content-ngxpagespeed
-```
-
-Then you can hit `http://localhost:8080` or `http://host-ip:8080` in your browser.
-
-## Complex configuration
-
-```console
-$ docker run --name my-custom-nginx-pagespeed -v /host/path/nginx.conf:/etc/nginx/nginx.conf:ro -d pagespeed/nginx-pagespeed
-```
-
-For information on the syntax of the nginx configuration files, see [the official documentation](http://nginx.org/en/docs/) (specifically the [Beginner's Guide](http://nginx.org/en/docs/beginners_guide.html#conf_structure)). For pagespeed specific nginx config syntax, see [Beginner's guide](https://www.modpagespeed.com/doc/configuration) or a complete overview of [all pagespeed filters](https://www.ngxpagespeed.com/).
-For a quick start on pagespeed specific configuration see []
-
-If you wish to adapt the default configuration, use something like the following to copy it from a running nginx-pagespeed container:
-
-```console
-$ docker run --name tmp-ngxpagespeed-container -d pagespeed/nginx-pagespeed
-$ docker cp tmp-ngxpagespeed-container:/etc/nginx/nginx.conf /host/path/nginx.conf
-$ docker rm -f tmp-ngxpagespeed-container
-```
-
-This can also be accomplished more cleanly using a simple `Dockerfile` (in `/host/path/`):
-
-```dockerfile
-FROM pagespeed/nginx-pagespeed
-COPY nginx.conf /etc/nginx/nginx.conf
-```
-
-If you add a custom `CMD` in the Dockerfile, be sure to include `-g daemon off;` in the `CMD` in order for nginx to stay in the foreground, so that Docker can track the process properly (otherwise your container will stop immediately after starting)!
-
-Then build the image with `docker build -t custom-ngxpagespeed .` and run it as follows:
-
-```console
-$ docker run --name my-custom-ngxpagespeed-container -d custom-ngxpagespeed
-```
-
-### Using environment variables in nginx configuration
-
-Out-of-the-box, nginx doesn't support environment variables inside most configuration blocks. But `envsubst` may be used as a workaround if you need to generate your nginx configuration dynamically before nginx starts.
-
-Here is an example using docker-compose.yml:
-
-```yaml
-web:
-  image: pagespeed/nginx-pagespeed
-  volumes:
-   - ./mysite.template:/etc/nginx/conf.d/mysite.template
-  ports:
-   - "8080:80"
-  environment:
-   - NGINX_HOST=foobar.com
-   - NGINX_PORT=80
-  command: /bin/bash -c "envsubst < /etc/nginx/conf.d/mysite.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"
-```
-
-The `mysite.template` file may then contain variable references like this:
-
-`listen       ${NGINX_PORT};
-`
-
-# Image Variants
-
-The `pagespeed/nginx-pagespeed` images come in many flavors, each designed for a specific use case.
-
-## `pagespeed/nginx-pagespeed:<version>`
-
-This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of.
-
-## `nginx:edge`
-
-This image has the most up-to-date system packages available in the [Alpine Linux project](http://alpinelinux.org). This means the latest LibreSSL and musl-libc, with the downside of having less tested system packages.
-
-
-## Using the Dockerfile
-### Use docker build command to build an image from dockerfile:
-  docker build -t <image_tag>  <dockerfile_path> .
-    $ docker build -t ngxpagespeed-alpine38-ngxstable stable/3.8/nginx-stable
-  Refer [this](https://docs.docker.com/engine/reference/commandline/build/) for additional options.
-
-### Run this container as an independent service:
-    $ docker run -d -p 80:80 <image_tag>
-  Refer [this](https://docs.docker.com/engine/reference/run/) for additional options.
-
-## Requirements for building:
-- > 3 GB of free diskspace
-- 2GB of memory
-- an x86_64 compatible processor
-- Docker CE > 17.3.2
-
-
-# Disclaimer
-Apache PageSpeed is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
-# License
-View [PageSpeed license information](https://github.com/apache/incubator-pagespeed-ngx/blob/master/LICENSE)
-View [Nginx license information](http://nginx.org/LICENSE)
-
-As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
-
-Some additional license information which was able to be auto-detected might be found in [the `repo-info` repository's `nginx/` directory](https://github.com/docker-library/repo-info/tree/master/repos/nginx).
-
-As for any pre-built image usage, it is the image user's responsibility to ensure that any use of this image complies with any relevant licenses for all software contained within.

docker/alpine-3.8/nginx-mainline/Dockerfile

@@ -1,230 +0,0 @@
-ARG ALPINE_VERSION=3.8
-
-########################
-# Build pagespeed psol #
-########################
-FROM alpine:$ALPINE_VERSION as pagespeed
-
-# Check https://github.com/apache/incubator-pagespeed-mod/tags
-ARG MOD_PAGESPEED_TAG=v1.13.35.2
-
-RUN apk add --no-cache \
-        apache2-dev \
-        apr-dev \
-        apr-util-dev \
-        build-base \
-        curl \
-        gettext-dev \
-        git \
-        gperf \
-        icu-dev \
-        libjpeg-turbo-dev \
-        libpng-dev \
-        libressl-dev \
-        pcre-dev \
-        py-setuptools \
-        zlib-dev \
-    ;
-
-WORKDIR /usr/src
-RUN git clone -b ${MOD_PAGESPEED_TAG} \
-              --recurse-submodules \
-              --depth=1 \
-              -c advice.detachedHead=false \
-              -j`nproc` \
-              https://github.com/apache/incubator-pagespeed-mod.git \
-              modpagespeed \
-    ;
-
-WORKDIR /usr/src/modpagespeed
-
-COPY patches/modpagespeed/*.patch ./
-
-RUN for i in *.patch; do printf "\r\nApplying patch ${i%%.*}\r\n"; patch -p1 < $i || exit 1; done
-
-WORKDIR /usr/src/modpagespeed/tools/gyp
-RUN ./setup.py install
-
-WORKDIR /usr/src/modpagespeed
-
-RUN build/gyp_chromium --depth=. \
-                       -D use_system_libs=1 \
-    && \
-    cd /usr/src/modpagespeed/pagespeed/automatic && \
-    make psol BUILDTYPE=Release \
-              CFLAGS+="-I/usr/include/apr-1" \
-              CXXFLAGS+="-I/usr/include/apr-1 -DUCHAR_TYPE=uint16_t" \
-              -j`nproc` \
-    ;
-
-RUN mkdir -p /usr/src/ngxpagespeed/psol/lib/Release/linux/x64 && \
-    mkdir -p /usr/src/ngxpagespeed/psol/include/out/Release && \
-    cp -R out/Release/obj /usr/src/ngxpagespeed/psol/include/out/Release/ && \
-    cp -R pagespeed/automatic/pagespeed_automatic.a /usr/src/ngxpagespeed/psol/lib/Release/linux/x64/ && \
-    cp -R net \
-          pagespeed \
-          testing \
-          third_party \
-          url \
-          /usr/src/ngxpagespeed/psol/include/ \
-    ;
-
-
-##########################################
-# Build Nginx with support for PageSpeed #
-##########################################
-FROM alpine:$ALPINE_VERSION AS nginx
-
-# Check https://github.com/apache/incubator-pagespeed-ngx/tags
-ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable
-
-# Check http://nginx.org/en/download.html for the latest version.
-ARG NGINX_VERSION=1.15.6
-ARG NGINX_PGPKEY=520A9993A1C052F8
-ARG NGINX_BUILD_CONFIG="\
-        --prefix=/etc/nginx \
-        --sbin-path=/usr/sbin/nginx \
-        --modules-path=/usr/lib/nginx/modules \
-        --conf-path=/etc/nginx/nginx.conf \
-        --error-log-path=/var/log/nginx/error.log \
-        --http-log-path=/var/log/nginx/access.log \
-        --pid-path=/var/run/nginx.pid \
-        --lock-path=/var/run/nginx.lock \
-        --http-client-body-temp-path=/var/cache/nginx/client_temp \
-        --http-proxy-temp-path=/var/cache/nginx/proxy_temp \
-        --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \
-        --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp \
-        --http-scgi-temp-path=/var/cache/nginx/scgi_temp \
-        --user=nginx \
-        --group=nginx \
-        --with-http_ssl_module \
-        --with-http_realip_module \
-        --with-http_addition_module \
-        --with-http_sub_module \
-        --with-http_dav_module \
-        --with-http_flv_module \
-        --with-http_mp4_module \
-        --with-http_gunzip_module \
-        --with-http_gzip_static_module \
-        --with-http_random_index_module \
-        --with-http_secure_link_module \
-        --with-http_stub_status_module \
-        --with-http_auth_request_module \
-        --with-http_xslt_module=dynamic \
-        --with-http_image_filter_module=dynamic \
-        --with-http_geoip_module=dynamic \
-        --with-threads \
-        --with-stream \
-        --with-stream_ssl_module \
-        --with-stream_ssl_preread_module \
-        --with-stream_realip_module \
-        --with-stream_geoip_module=dynamic \
-        --with-http_slice_module \
-        --with-mail \
-        --with-mail_ssl_module \
-        --with-compat \
-        --with-file-aio \
-        --with-http_v2_module \
-    "
-
-RUN apk add --no-cache \
-        apr-dev \
-        apr-util-dev \
-        build-base \
-        ca-certificates \
-        gd-dev \
-        geoip-dev \
-        git \
-        gnupg \
-        icu-dev \
-        libjpeg-turbo-dev \
-        libpng-dev \
-        libxslt-dev \
-        linux-headers \
-        libressl-dev \
-        pcre-dev \
-        tar \
-        zlib-dev \
-    ;
-
-WORKDIR /usr/src
-RUN git clone -b ${NGX_PAGESPEED_TAG} \
-              --recurse-submodules \
-              --shallow-submodules \
-              --depth=1 \
-              -c advice.detachedHead=false \
-              -j`nproc` \
-              https://github.com/apache/incubator-pagespeed-ngx.git \
-              ngxpagespeed \
-    ;
-
-RUN wget https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \
-         https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz.asc && \
-    (gpg --keyserver ha.pool.sks-keyservers.net --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \
-     gpg --keyserver hkp://keyserver.ubuntu.com:80 --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \
-     gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --keyserver-options timeout=10 --recv-keys $NGINX_PGPKEY} ) && \
-    gpg --trusted-key ${NGINX_PGPKEY} --verify nginx-${NGINX_VERSION}.tar.gz.asc
-
-COPY --from=pagespeed /usr/src/ngxpagespeed /usr/src/ngxpagespeed/
-
-WORKDIR /usr/src/nginx
-
-RUN tar zxf ../nginx-${NGINX_VERSION}.tar.gz --strip-components=1 -C . && \
-    ./configure \
-        ${NGINX_BUILD_CONFIG} \
-        --add-module=/usr/src/ngxpagespeed \
-        --with-ld-opt="-Wl,-z,relro,--start-group -lapr-1 -laprutil-1 -licudata -licuuc -lpng -lturbojpeg -ljpeg" \
-    && \
-    make install -j`nproc`
-
-RUN rm -rf /etc/nginx/html/ && \
-    mkdir /etc/nginx/conf.d/ && \
-    mkdir -p /usr/share/nginx/html/ && \
-    sed -i 's|^</body>|<p><a href="https://www.ngxpagespeed.com/"><img src="pagespeed.png" title="Nginx module for rewriting web pages to reduce latency and bandwidth" /></a></p>\n</body>|' html/index.html && \
-    install -m644 html/index.html /usr/share/nginx/html/ && \
-    install -m644 html/50x.html /usr/share/nginx/html/ && \
-    ln -s ../../usr/lib/nginx/modules /etc/nginx/modules && \
-    strip /usr/sbin/nginx* \
-          /usr/lib/nginx/modules/*.so \
-    ;
-
-COPY conf/nginx.conf /etc/nginx/nginx.conf
-COPY conf/nginx.vh.default.conf /etc/nginx/conf.d/default.conf
-COPY pagespeed.png /usr/share/nginx/html/
-
-
-##########################################
-# Combine everything with minimal layers #
-##########################################
-FROM alpine:$ALPINE_VERSION
-LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \
-      version.mod-pagespeed="1.13.35.2" \
-      version.nginx="1.15.6" \
-      version.ngx-pagespeed="1.13.35.2"
-
-COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin
-COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx
-COPY --from=nginx /usr/lib/nginx/modules/ /usr/lib/nginx/modules/
-COPY --from=nginx /etc/nginx /etc/nginx
-COPY --from=nginx /usr/share/nginx/html/ /usr/share/nginx/html/
-
-RUN apk --no-cache upgrade && \
-    scanelf --needed --nobanner --format '%n#p' /usr/sbin/nginx /usr/lib/nginx/modules/*.so /usr/local/bin/envsubst \
-            | tr ',' '\n' \
-            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-            | xargs apk add --no-cache \
-    && \
-    apk add --no-cache tzdata
-
-RUN addgroup -S nginx && \
-    adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx && \
-    install -g nginx -o nginx -d /var/cache/ngx_pagespeed && \
-    mkdir -p /var/log/nginx && \
-    ln -sf /dev/stdout /var/log/nginx/access.log && \
-    ln -sf /dev/stderr /var/log/nginx/error.log
-
-EXPOSE 80
-
-STOPSIGNAL SIGTERM
-
-CMD ["/usr/sbin/nginx", "-g", "daemon off;"]

docker/alpine-3.8/nginx-mainline/conf/nginx.conf

@@ -1,32 +0,0 @@
-
-user  nginx;
-worker_processes  1;
-
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-
-
-events {
-    worker_connections  1024;
-}
-
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    keepalive_timeout  65;
-
-    #gzip  on;
-
-    include /etc/nginx/conf.d/*.conf;
-}

docker/alpine-3.8/nginx-mainline/conf/nginx.vh.default.conf

@@ -1,57 +0,0 @@
-server {
-    listen       80;
-    server_name  localhost;
-
-    #charset koi8-r;
-    #access_log  /var/log/nginx/host.access.log  main;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-    }
-
-    #error_page  404              /404.html;
-
-    # redirect server error pages to the static page /50x.html
-    #
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   /usr/share/nginx/html;
-    }
-
-    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-    #
-    #location ~ \.php$ {
-    #    proxy_pass   http://127.0.0.1;
-    #}
-
-    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-    #
-    #location ~ \.php$ {
-    #    root           html;
-    #    fastcgi_pass   127.0.0.1:9000;
-    #    fastcgi_index  index.php;
-    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
-    #    include        fastcgi_params;
-    #}
-    pagespeed on;
-
-    # Needs to exist and be writable by nginx.  Use tmpfs for best performance.
-    pagespeed FileCachePath /var/cache/ngx_pagespeed;
-
-    # Ensure requests for pagespeed optimized resources go to the pagespeed handler
-    # and no extraneous headers get set.
-    location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" {
-      add_header "" "";
-    }
-    location ~ "^/pagespeed_static/" { }
-    location ~ "^/ngx_pagespeed_beacon$" { }
-
-    # deny access to .htaccess files, if Apache's document root
-    # concurs with nginx's one
-    #
-    #location ~ /\.ht {
-    #    deny  all;
-    #}
-}
-

docker/alpine-3.8/nginx-mainline/patches/modpagespeed/automatic_makefile.patch

@@ -1,31 +0,0 @@
---- a/pagespeed/automatic/Makefile
-+++ b/pagespeed/automatic/Makefile
-@@ -146,8 +146,6 @@
-   pagespeed/libpagespeed_thread.a \
-   pagespeed/libpthread_system.a \
-   pagespeed/libutil.a \
--  third_party/apr/libapr.a \
--  third_party/aprutil/libaprutil.a \
-   third_party/base64/libbase64.a \
-   third_party/chromium/src/base/third_party/dynamic_annotations/libdynamic_annotations.a \
-   third_party/css_parser/libcss_parser.a \
-@@ -163,18 +161,11 @@
-   third_party/grpc/libgrpc_core.a \
-   third_party/grpc/libgrpc_cpp.a \
-   third_party/hiredis/libhiredis.a \
--  third_party/icu/libicudata.a \
--  third_party/icu/libicuuc.a \
-   third_party/jsoncpp/libjsoncpp.a \
--  third_party/libjpeg_turbo/libjpeg.a \
--  third_party/libjpeg_turbo/src/libjpeg_turbo.a \
--  third_party/libpng/libpng.a \
-   third_party/optipng/libopngreduc.a \
-   third_party/protobuf/libprotobuf_full_do_not_use.a \
-   third_party/re2/libre2.a \
--  third_party/serf/libopenssl.a \
-   third_party/serf/libserf.a \
--  third_party/zlib/libzlib.a \
-   url/liburl_lib.a
- 
- # The 'gclient' build flow uses 'xcodebuild' on Mac and 'make' on Linux.
-

docker/alpine-3.8/nginx-mainline/patches/modpagespeed/libpng16.patch

@@ -1,141 +0,0 @@
-From 7ea8d5fc141c7067c54ffa2b9fbc552c15089ca6 Mon Sep 17 00:00:00 2001
-From: ashishk-1 <ashish.k@gdbtech.in>
-Date: Thu, 18 Jan 2018 22:14:05 +0530
-Subject: [PATCH] Upgrading libpng library to version 1.6 (#1724)
-
----
- net/instaweb/rewriter/image.cc               |  8 ++++++++
- pagespeed/kernel/image/gif_reader.cc         |  4 ++--
- pagespeed/kernel/image/image_converter.cc    |  6 ++++++
- pagespeed/kernel/image/png_optimizer_test.cc |  6 ++++++
- third_party/libpng/libpng.gyp                | 26 +++++++++++++++++++++++---
- third_party/libpng/src                       |  2 +-
- 6 files changed, 46 insertions(+), 6 deletions(-)
-
-diff --git a/net/instaweb/rewriter/image.cc b/net/instaweb/rewriter/image.cc
-index 4f631182a..bb67bba35 100644
---- a/net/instaweb/rewriter/image.cc
-+++ b/net/instaweb/rewriter/image.cc
-@@ -21,6 +21,14 @@
- #include <algorithm>
- #include <cstddef>
-
-+extern "C" {
-+#ifdef USE_SYSTEM_ZLIB
-+#include "zlib.h"
-+#else
-+#include "third_party/zlib/zlib.h"
-+#endif
-+}  // extern "C"
-+
- #include "base/logging.h"
- #include "net/instaweb/rewriter/cached_result.pb.h"
- #include "net/instaweb/rewriter/public/image_data_lookup.h"
-diff --git a/pagespeed/kernel/image/gif_reader.cc b/pagespeed/kernel/image/gif_reader.cc
-index 7de69b3d7..bb0bc9cfc 100644
---- a/pagespeed/kernel/image/gif_reader.cc
-+++ b/pagespeed/kernel/image/gif_reader.cc
-@@ -411,8 +411,8 @@ bool ReadGifToPng(GifFileType* gif_file,
-   png_uint_32 height = png_get_image_height(paletted_png_ptr,
-                                             paletted_info_ptr);
-   for (png_uint_32 row = 1; row < height; ++row) {
--    memcpy(paletted_info_ptr->row_pointers[row],
--           paletted_info_ptr->row_pointers[0],
-+    memcpy(row_pointers[row],
-+           row_pointers[0],
-            row_size);
-   }
-
-diff --git a/pagespeed/kernel/image/image_converter.cc b/pagespeed/kernel/image/image_converter.cc
-index d796b5065..84b7aff74 100644
---- a/pagespeed/kernel/image/image_converter.cc
-+++ b/pagespeed/kernel/image/image_converter.cc
-@@ -30,6 +30,12 @@ extern "C" {
- #else
- #include "third_party/libpng/src/png.h"
- #endif
-+
-+#ifdef USE_SYSTEM_ZLIB
-+#include "zlib.h"
-+#else
-+#include "third_party/zlib/zlib.h"
-+#endif
- }  // extern "C"
-
- #include "base/logging.h"
-diff --git a/pagespeed/kernel/image/png_optimizer_test.cc b/pagespeed/kernel/image/png_optimizer_test.cc
-index 9ad915aff..3faa526a8 100644
---- a/pagespeed/kernel/image/png_optimizer_test.cc
-+++ b/pagespeed/kernel/image/png_optimizer_test.cc
-@@ -36,6 +36,12 @@ extern "C" {
- #else
- #include "third_party/libpng/src/png.h"
- #endif
-+
-+#ifdef USE_SYSTEM_ZLIB
-+#include "zlib.h"
-+#else
-+#include "third_party/zlib/zlib.h"
-+#endif
- }
-
- namespace {
-diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp
-index cfaafee00..d96a8f74c 100644
---- a/third_party/libpng/libpng.gyp
-+++ b/third_party/libpng/libpng.gyp
-@@ -22,14 +22,29 @@
-           'dependencies': [
-             '../zlib/zlib.gyp:zlib',
-           ],
-+          'actions': [
-+            {
-+              'action_name': 'copy_libpngconf_prebuilt',
-+              'inputs' : [],
-+              'outputs': [''],
-+              'action': [
-+                'cp',
-+                '-f',
-+                '<(DEPTH)/third_party/libpng/src/scripts/pnglibconf.h.prebuilt',
-+                '<(DEPTH)/third_party/libpng/src/pnglibconf.h',
-+              ],
-+            },
-+          ],
-           'msvs_guid': 'C564F145-9172-42C3-BFCB-6014CA97DBCD',
-           'sources': [
-+            'src/pngpriv.h',
-             'src/png.c',
-             'src/png.h',
-             'src/pngconf.h',
-+            'src/pngdebug.h',
-             'src/pngerror.c',
--            'src/pnggccrd.c',
-             'src/pngget.c',
-+            'src/pnginfo.h',
-             'src/pngmem.c',
-             'src/pngpread.c',
-             'src/pngread.c',
-@@ -37,9 +52,8 @@
-             'src/pngrtran.c',
-             'src/pngrutil.c',
-             'src/pngset.c',
-+            'src/pngstruct.h',
-             'src/pngtrans.c',
--            'src/pngusr.h',
--            'src/pngvcrd.c',
-             'src/pngwio.c',
-             'src/pngwrite.c',
-             'src/pngwtran.c',
-@@ -54,6 +68,12 @@
-               # doesn't like that. This define tells libpng to not
-               # complain about our inclusion of setjmp.h.
-               'PNG_SKIP_SETJMP_CHECK',
-+
-+              # The PNG_FREE_ME_SUPPORTED define was dropped in libpng
-+              # 1.4.0beta78, with its behavior becoming the default
-+              # behavior.
-+              # Hence, we define it ourselves for version >= 1.4.0
-+              'PNG_FREE_ME_SUPPORTED',
-             ],
-           },
-           'export_dependent_settings': [

docker/alpine-3.8/nginx-mainline/patches/modpagespeed/pthread_nonrecursive_np.patch

@@ -1,11 +0,0 @@
---- a/pagespeed/kernel/thread/pthread_rw_lock.cc
-+++ b/pagespeed/kernel/thread/pthread_rw_lock.cc
-@@ -31,7 +31,7 @@
-   //
-   // Other OS's (FreeBSD, Darwin, OpenSolaris) documentation suggests
-   // that they prefer writers by default.
--#ifdef linux
-+#if defined(linux) && defined(__GLIBC__)
-   pthread_rwlockattr_setkind_np(&attr_,
-                                 PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
- #endif

docker/alpine-3.8/nginx-mainline/patches/modpagespeed/rename_c_symbols.patch

@@ -1,13 +0,0 @@
---- a/pagespeed/automatic/rename_c_symbols.sh
-+++ b/pagespeed/automatic/rename_c_symbols.sh
-@@ -24,8 +24,8 @@
- set -e  # exit script if any command returns an error
- set -u  # exit the script if any variable is uninitialized
-
--IN=$(readlink -f $1)
--OUT=$(readlink -f $2)
-+IN=$1
-+OUT=$2
-
- # Get a list of defined non-C++ symbols that are global and not weak.
- # _Z is used at start of C++-mangled symbol names.

docker/alpine-3.8/nginx-mainline/patches/modpagespeed/stack_trace_posix.patch

@@ -1,64 +0,0 @@
---- a/third_party/chromium/src/base/debug/stack_trace_posix.cc
-+++ b/third_party/chromium/src/base/debug/stack_trace_posix.cc
-@@ -5,7 +5,9 @@
- #include "base/debug/stack_trace.h"
-
- #include <errno.h>
-+#if defined(HAVE_BACKTRACE)
- #include <execinfo.h>
-+#endif
- #include <fcntl.h>
- #include <signal.h>
- #include <stdio.h>
-@@ -64,7 +66,7 @@
-   // Note: code in this function is NOT async-signal safe (std::string uses
-   // malloc internally).
-
--#if defined(__GLIBCXX__)
-+#if defined(__GLIBCXX__) && defined(HAVE_BACKTRACE)
-
-   std::string::size_type search_from = 0;
-   while (search_from < text->size()) {
-@@ -145,7 +147,7 @@
-
-     handler->HandleOutput("\n");
-   }
--#else
-+#elif defined(HAVE_BACKTRACE)
-   bool printed = false;
-
-   // Below part is async-signal unsafe (uses malloc), so execute it only
-@@ -469,23 +471,31 @@
- StackTrace::StackTrace() {
-   // NOTE: This code MUST be async-signal safe (it's used by in-process
-   // stack dumping signal handler). NO malloc or stdio is allowed here.
--
-+#if defined(HAVE_BACKTRACE)
-   // Though the backtrace API man page does not list any possible negative
-   // return values, we take no chance.
-   count_ = std::max(backtrace(trace_, arraysize(trace_)), 0);
-+#else
-+  count_ = 0;
-+#endif
- }
-
- void StackTrace::Print() const {
-   // NOTE: This code MUST be async-signal safe (it's used by in-process
-   // stack dumping signal handler). NO malloc or stdio is allowed here.
--
-+#if defined(HAVE_BACKTRACE)
-   PrintBacktraceOutputHandler handler;
-   ProcessBacktrace(trace_, count_, &handler);
-+#endif
- }
-
- void StackTrace::OutputToStream(std::ostream* os) const {
-+#if !defined(HAVE_BACKTRACE)
-+(*os) << "(stack trace not supported)\n";
-+#else
-   StreamBacktraceOutputHandler handler(os);
-   ProcessBacktrace(trace_, count_, &handler);
-+#endif
- }
-
- namespace internal {

docker/alpine-3.8/nginx-stable/Dockerfile

@@ -1,231 +0,0 @@
-ARG ALPINE_VERSION=3.8
-
-########################
-# Build pagespeed psol #
-########################
-FROM alpine:$ALPINE_VERSION as pagespeed
-
-# Check https://github.com/apache/incubator-pagespeed-mod/tags
-ARG MOD_PAGESPEED_TAG=v1.13.35.2
-
-RUN apk add --no-cache \
-        apache2-dev \
-        apr-dev \
-        apr-util-dev \
-        build-base \
-        curl \
-        gettext-dev \
-        git \
-        gperf \
-        icu-dev \
-        libjpeg-turbo-dev \
-        libpng-dev \
-        libressl-dev \
-        pcre-dev \
-        py-setuptools \
-        zlib-dev \
-    ;
-
-WORKDIR /usr/src
-RUN git clone -b ${MOD_PAGESPEED_TAG} \
-              --recurse-submodules \
-              --depth=1 \
-              -c advice.detachedHead=false \
-              -j`nproc` \
-              https://github.com/apache/incubator-pagespeed-mod.git \
-              modpagespeed \
-    ;
-
-WORKDIR /usr/src/modpagespeed
-
-COPY patches/modpagespeed/*.patch ./
-
-RUN for i in *.patch; do printf "\r\nApplying patch ${i%%.*}\r\n"; patch -p1 < $i || exit 1; done
-
-WORKDIR /usr/src/modpagespeed/tools/gyp
-RUN ./setup.py install
-
-WORKDIR /usr/src/modpagespeed
-
-RUN build/gyp_chromium --depth=. \
-                       -D use_system_libs=1 \
-    && \
-    cd /usr/src/modpagespeed/pagespeed/automatic && \
-    make psol BUILDTYPE=Release \
-              CFLAGS+="-I/usr/include/apr-1" \
-              CXXFLAGS+="-I/usr/include/apr-1 -DUCHAR_TYPE=uint16_t" \
-              -j`nproc` \
-    ;
-
-RUN mkdir -p /usr/src/ngxpagespeed/psol/lib/Release/linux/x64 && \
-    mkdir -p /usr/src/ngxpagespeed/psol/include/out/Release && \
-    cp -R out/Release/obj /usr/src/ngxpagespeed/psol/include/out/Release/ && \
-    cp -R pagespeed/automatic/pagespeed_automatic.a /usr/src/ngxpagespeed/psol/lib/Release/linux/x64/ && \
-    cp -R net \
-          pagespeed \
-          testing \
-          third_party \
-          url \
-          /usr/src/ngxpagespeed/psol/include/ \
-    ;
-
-
-##########################################
-# Build Nginx with support for PageSpeed #
-##########################################
-FROM alpine:$ALPINE_VERSION AS nginx
-
-# Check https://github.com/apache/incubator-pagespeed-ngx/tags
-ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable
-
-# Check http://nginx.org/en/download.html for the latest version.
-ARG NGINX_VERSION=1.14.1
-ARG NGINX_PGPKEY=520A9993A1C052F8
-ARG NGINX_BUILD_CONFIG="\
-        --prefix=/etc/nginx \
-        --sbin-path=/usr/sbin/nginx \
-        --modules-path=/usr/lib/nginx/modules \
-        --conf-path=/etc/nginx/nginx.conf \
-        --error-log-path=/var/log/nginx/error.log \
-        --http-log-path=/var/log/nginx/access.log \
-        --pid-path=/var/run/nginx.pid \
-        --lock-path=/var/run/nginx.lock \
-        --http-client-body-temp-path=/var/cache/nginx/client_temp \
-        --http-proxy-temp-path=/var/cache/nginx/proxy_temp \
-        --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \
-        --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp \
-        --http-scgi-temp-path=/var/cache/nginx/scgi_temp \
-        --user=nginx \
-        --group=nginx \
-        --with-http_ssl_module \
-        --with-http_realip_module \
-        --with-http_addition_module \
-        --with-http_sub_module \
-        --with-http_dav_module \
-        --with-http_flv_module \
-        --with-http_mp4_module \
-        --with-http_gunzip_module \
-        --with-http_gzip_static_module \
-        --with-http_random_index_module \
-        --with-http_secure_link_module \
-        --with-http_stub_status_module \
-        --with-http_auth_request_module \
-        --with-http_xslt_module=dynamic \
-        --with-http_image_filter_module=dynamic \
-        --with-http_geoip_module=dynamic \
-        --with-threads \
-        --with-stream \
-        --with-stream_ssl_module \
-        --with-stream_ssl_preread_module \
-        --with-stream_realip_module \
-        --with-stream_geoip_module=dynamic \
-        --with-http_slice_module \
-        --with-mail \
-        --with-mail_ssl_module \
-        --with-compat \
-        --with-file-aio \
-        --with-http_v2_module \
-    "
-
-RUN apk add --no-cache \
-        apr-dev \
-        apr-util-dev \
-        build-base \
-        ca-certificates \
-        gd-dev \
-        geoip-dev \
-        git \
-        gnupg \
-        icu-dev \
-        libjpeg-turbo-dev \
-        libpng-dev \
-        libxslt-dev \
-        linux-headers \
-        libressl-dev \
-        pcre-dev \
-        tar \
-        zlib-dev \
-    ;
-
-WORKDIR /usr/src
-RUN git clone -b ${NGX_PAGESPEED_TAG} \
-              --recurse-submodules \
-              --shallow-submodules \
-              --depth=1 \
-              -c advice.detachedHead=false \
-              -j`nproc` \
-              https://github.com/apache/incubator-pagespeed-ngx.git \
-              ngxpagespeed \
-    ;
-
-RUN wget https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \
-         https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz.asc && \
-    (gpg --keyserver ha.pool.sks-keyservers.net --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \
-     gpg --keyserver hkp://keyserver.ubuntu.com:80 --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \
-     gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --keyserver-options timeout=10 --recv-keys $NGINX_PGPKEY} ) && \
-    gpg --trusted-key ${NGINX_PGPKEY} --verify nginx-${NGINX_VERSION}.tar.gz.asc
-
-COPY --from=pagespeed /usr/src/ngxpagespeed /usr/src/ngxpagespeed/
-
-WORKDIR /usr/src/nginx
-
-RUN tar zxf ../nginx-${NGINX_VERSION}.tar.gz --strip-components=1 -C . && \
-    ./configure \
-        ${NGINX_BUILD_CONFIG} \
-        --add-module=/usr/src/ngxpagespeed \
-        --with-ld-opt="-Wl,-z,relro,--start-group -lapr-1 -laprutil-1 -licudata -licuuc -lpng -lturbojpeg -ljpeg" \
-    && \
-    make install -j`nproc`
-
-RUN rm -rf /etc/nginx/html/ && \
-    mkdir /etc/nginx/conf.d/ && \
-    mkdir -p /usr/share/nginx/html/ && \
-    sed -i 's|^</body>|<p><a href="https://www.ngxpagespeed.com/"><img src="pagespeed.png" title="Nginx module for rewriting web pages to reduce latency and bandwidth" /></a></p>\n</body>|' html/index.html && \
-    install -m644 html/index.html /usr/share/nginx/html/ && \
-    install -m644 html/50x.html /usr/share/nginx/html/ && \
-    ln -s ../../usr/lib/nginx/modules /etc/nginx/modules && \
-    strip /usr/sbin/nginx* \
-          /usr/lib/nginx/modules/*.so \
-    ;
-
-COPY conf/nginx.conf /etc/nginx/nginx.conf
-COPY conf/nginx.vh.default.conf /etc/nginx/conf.d/default.conf
-COPY pagespeed.png /usr/share/nginx/html/
-
-
-##########################################
-# Combine everything with minimal layers #
-##########################################
-FROM alpine:$ALPINE_VERSION
-LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \
-      version.mod-pagespeed="1.13.35.2" \
-      version.nginx="1.14.1" \
-      version.ngx-pagespeed="1.13.35.2"
-
-COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin
-COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx
-COPY --from=nginx /usr/lib/nginx/modules/ /usr/lib/nginx/modules/
-COPY --from=nginx /etc/nginx /etc/nginx
-COPY --from=nginx /usr/share/nginx/html/ /usr/share/nginx/html/
-
-RUN apk --no-cache upgrade && \
-    scanelf --needed --nobanner --format '%n#p' /usr/sbin/nginx /usr/lib/nginx/modules/*.so /usr/local/bin/envsubst \
-            | tr ',' '\n' \
-            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-            | xargs apk add --no-cache \
-    && \
-    apk add --no-cache tzdata
-
-RUN addgroup -S nginx && \
-    adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx && \
-    install -g nginx -o nginx -d /var/cache/ngx_pagespeed && \
-    mkdir -p /var/log/nginx && \
-    ln -sf /dev/stdout /var/log/nginx/access.log && \
-    ln -sf /dev/stderr /var/log/nginx/error.log
-
-EXPOSE 80
-
-STOPSIGNAL SIGTERM
-
-CMD ["/usr/sbin/nginx", "-g", "daemon off;"]
-

docker/alpine-3.8/nginx-stable/conf/nginx.conf

@@ -1,32 +0,0 @@
-
-user  nginx;
-worker_processes  1;
-
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-
-
-events {
-    worker_connections  1024;
-}
-
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    keepalive_timeout  65;
-
-    #gzip  on;
-
-    include /etc/nginx/conf.d/*.conf;
-}

docker/alpine-3.8/nginx-stable/conf/nginx.vh.default.conf

@@ -1,57 +0,0 @@
-server {
-    listen       80;
-    server_name  localhost;
-
-    #charset koi8-r;
-    #access_log  /var/log/nginx/host.access.log  main;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-    }
-
-    #error_page  404              /404.html;
-
-    # redirect server error pages to the static page /50x.html
-    #
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   /usr/share/nginx/html;
-    }
-
-    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-    #
-    #location ~ \.php$ {
-    #    proxy_pass   http://127.0.0.1;
-    #}
-
-    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-    #
-    #location ~ \.php$ {
-    #    root           html;
-    #    fastcgi_pass   127.0.0.1:9000;
-    #    fastcgi_index  index.php;
-    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
-    #    include        fastcgi_params;
-    #}
-    pagespeed on;
-
-    # Needs to exist and be writable by nginx.  Use tmpfs for best performance.
-    pagespeed FileCachePath /var/cache/ngx_pagespeed;
-
-    # Ensure requests for pagespeed optimized resources go to the pagespeed handler
-    # and no extraneous headers get set.
-    location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" {
-      add_header "" "";
-    }
-    location ~ "^/pagespeed_static/" { }
-    location ~ "^/ngx_pagespeed_beacon$" { }
-
-    # deny access to .htaccess files, if Apache's document root
-    # concurs with nginx's one
-    #
-    #location ~ /\.ht {
-    #    deny  all;
-    #}
-}
-

docker/alpine-3.8/nginx-stable/patches/modpagespeed/automatic_makefile.patch

@@ -1,31 +0,0 @@
---- a/pagespeed/automatic/Makefile
-+++ b/pagespeed/automatic/Makefile
-@@ -146,8 +146,6 @@
-   pagespeed/libpagespeed_thread.a \
-   pagespeed/libpthread_system.a \
-   pagespeed/libutil.a \
--  third_party/apr/libapr.a \
--  third_party/aprutil/libaprutil.a \
-   third_party/base64/libbase64.a \
-   third_party/chromium/src/base/third_party/dynamic_annotations/libdynamic_annotations.a \
-   third_party/css_parser/libcss_parser.a \
-@@ -163,18 +161,11 @@
-   third_party/grpc/libgrpc_core.a \
-   third_party/grpc/libgrpc_cpp.a \
-   third_party/hiredis/libhiredis.a \
--  third_party/icu/libicudata.a \
--  third_party/icu/libicuuc.a \
-   third_party/jsoncpp/libjsoncpp.a \
--  third_party/libjpeg_turbo/libjpeg.a \
--  third_party/libjpeg_turbo/src/libjpeg_turbo.a \
--  third_party/libpng/libpng.a \
-   third_party/optipng/libopngreduc.a \
-   third_party/protobuf/libprotobuf_full_do_not_use.a \
-   third_party/re2/libre2.a \
--  third_party/serf/libopenssl.a \
-   third_party/serf/libserf.a \
--  third_party/zlib/libzlib.a \
-   url/liburl_lib.a
- 
- # The 'gclient' build flow uses 'xcodebuild' on Mac and 'make' on Linux.
-

docker/alpine-3.8/nginx-stable/patches/modpagespeed/libpng16.patch

@@ -1,141 +0,0 @@
-From 7ea8d5fc141c7067c54ffa2b9fbc552c15089ca6 Mon Sep 17 00:00:00 2001
-From: ashishk-1 <ashish.k@gdbtech.in>
-Date: Thu, 18 Jan 2018 22:14:05 +0530
-Subject: [PATCH] Upgrading libpng library to version 1.6 (#1724)
-
----
- net/instaweb/rewriter/image.cc               |  8 ++++++++
- pagespeed/kernel/image/gif_reader.cc         |  4 ++--
- pagespeed/kernel/image/image_converter.cc    |  6 ++++++
- pagespeed/kernel/image/png_optimizer_test.cc |  6 ++++++
- third_party/libpng/libpng.gyp                | 26 +++++++++++++++++++++++---
- third_party/libpng/src                       |  2 +-
- 6 files changed, 46 insertions(+), 6 deletions(-)
-
-diff --git a/net/instaweb/rewriter/image.cc b/net/instaweb/rewriter/image.cc
-index 4f631182a..bb67bba35 100644
---- a/net/instaweb/rewriter/image.cc
-+++ b/net/instaweb/rewriter/image.cc
-@@ -21,6 +21,14 @@
- #include <algorithm>
- #include <cstddef>
-
-+extern "C" {
-+#ifdef USE_SYSTEM_ZLIB
-+#include "zlib.h"
-+#else
-+#include "third_party/zlib/zlib.h"
-+#endif
-+}  // extern "C"
-+
- #include "base/logging.h"
- #include "net/instaweb/rewriter/cached_result.pb.h"
- #include "net/instaweb/rewriter/public/image_data_lookup.h"
-diff --git a/pagespeed/kernel/image/gif_reader.cc b/pagespeed/kernel/image/gif_reader.cc
-index 7de69b3d7..bb0bc9cfc 100644
---- a/pagespeed/kernel/image/gif_reader.cc
-+++ b/pagespeed/kernel/image/gif_reader.cc
-@@ -411,8 +411,8 @@ bool ReadGifToPng(GifFileType* gif_file,
-   png_uint_32 height = png_get_image_height(paletted_png_ptr,
-                                             paletted_info_ptr);
-   for (png_uint_32 row = 1; row < height; ++row) {
--    memcpy(paletted_info_ptr->row_pointers[row],
--           paletted_info_ptr->row_pointers[0],
-+    memcpy(row_pointers[row],
-+           row_pointers[0],
-            row_size);
-   }
-
-diff --git a/pagespeed/kernel/image/image_converter.cc b/pagespeed/kernel/image/image_converter.cc
-index d796b5065..84b7aff74 100644
---- a/pagespeed/kernel/image/image_converter.cc
-+++ b/pagespeed/kernel/image/image_converter.cc
-@@ -30,6 +30,12 @@ extern "C" {
- #else
- #include "third_party/libpng/src/png.h"
- #endif
-+
-+#ifdef USE_SYSTEM_ZLIB
-+#include "zlib.h"
-+#else
-+#include "third_party/zlib/zlib.h"
-+#endif
- }  // extern "C"
-
- #include "base/logging.h"
-diff --git a/pagespeed/kernel/image/png_optimizer_test.cc b/pagespeed/kernel/image/png_optimizer_test.cc
-index 9ad915aff..3faa526a8 100644
---- a/pagespeed/kernel/image/png_optimizer_test.cc
-+++ b/pagespeed/kernel/image/png_optimizer_test.cc
-@@ -36,6 +36,12 @@ extern "C" {
- #else
- #include "third_party/libpng/src/png.h"
- #endif
-+
-+#ifdef USE_SYSTEM_ZLIB
-+#include "zlib.h"
-+#else
-+#include "third_party/zlib/zlib.h"
-+#endif
- }
-
- namespace {
-diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp
-index cfaafee00..d96a8f74c 100644
---- a/third_party/libpng/libpng.gyp
-+++ b/third_party/libpng/libpng.gyp
-@@ -22,14 +22,29 @@
-           'dependencies': [
-             '../zlib/zlib.gyp:zlib',
-           ],
-+          'actions': [
-+            {
-+              'action_name': 'copy_libpngconf_prebuilt',
-+              'inputs' : [],
-+              'outputs': [''],
-+              'action': [
-+                'cp',
-+                '-f',
-+                '<(DEPTH)/third_party/libpng/src/scripts/pnglibconf.h.prebuilt',
-+                '<(DEPTH)/third_party/libpng/src/pnglibconf.h',
-+              ],
-+            },
-+          ],
-           'msvs_guid': 'C564F145-9172-42C3-BFCB-6014CA97DBCD',
-           'sources': [
-+            'src/pngpriv.h',
-             'src/png.c',
-             'src/png.h',
-             'src/pngconf.h',
-+            'src/pngdebug.h',
-             'src/pngerror.c',
--            'src/pnggccrd.c',
-             'src/pngget.c',
-+            'src/pnginfo.h',
-             'src/pngmem.c',
-             'src/pngpread.c',
-             'src/pngread.c',
-@@ -37,9 +52,8 @@
-             'src/pngrtran.c',
-             'src/pngrutil.c',
-             'src/pngset.c',
-+            'src/pngstruct.h',
-             'src/pngtrans.c',
--            'src/pngusr.h',
--            'src/pngvcrd.c',
-             'src/pngwio.c',
-             'src/pngwrite.c',
-             'src/pngwtran.c',
-@@ -54,6 +68,12 @@
-               # doesn't like that. This define tells libpng to not
-               # complain about our inclusion of setjmp.h.
-               'PNG_SKIP_SETJMP_CHECK',
-+
-+              # The PNG_FREE_ME_SUPPORTED define was dropped in libpng
-+              # 1.4.0beta78, with its behavior becoming the default
-+              # behavior.
-+              # Hence, we define it ourselves for version >= 1.4.0
-+              'PNG_FREE_ME_SUPPORTED',
-             ],
-           },
-           'export_dependent_settings': [

docker/alpine-3.8/nginx-stable/patches/modpagespeed/pthread_nonrecursive_np.patch

@@ -1,11 +0,0 @@
---- a/pagespeed/kernel/thread/pthread_rw_lock.cc
-+++ b/pagespeed/kernel/thread/pthread_rw_lock.cc
-@@ -31,7 +31,7 @@
-   //
-   // Other OS's (FreeBSD, Darwin, OpenSolaris) documentation suggests
-   // that they prefer writers by default.
--#ifdef linux
-+#if defined(linux) && defined(__GLIBC__)
-   pthread_rwlockattr_setkind_np(&attr_,
-                                 PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
- #endif

docker/alpine-3.8/nginx-stable/patches/modpagespeed/rename_c_symbols.patch

@@ -1,13 +0,0 @@
---- a/pagespeed/automatic/rename_c_symbols.sh
-+++ b/pagespeed/automatic/rename_c_symbols.sh
-@@ -24,8 +24,8 @@
- set -e  # exit script if any command returns an error
- set -u  # exit the script if any variable is uninitialized
-
--IN=$(readlink -f $1)
--OUT=$(readlink -f $2)
-+IN=$1
-+OUT=$2
-
- # Get a list of defined non-C++ symbols that are global and not weak.
- # _Z is used at start of C++-mangled symbol names.

docker/alpine-3.8/nginx-stable/patches/modpagespeed/stack_trace_posix.patch

@@ -1,64 +0,0 @@
---- a/third_party/chromium/src/base/debug/stack_trace_posix.cc
-+++ b/third_party/chromium/src/base/debug/stack_trace_posix.cc
-@@ -5,7 +5,9 @@
- #include "base/debug/stack_trace.h"
-
- #include <errno.h>
-+#if defined(HAVE_BACKTRACE)
- #include <execinfo.h>
-+#endif
- #include <fcntl.h>
- #include <signal.h>
- #include <stdio.h>
-@@ -64,7 +66,7 @@
-   // Note: code in this function is NOT async-signal safe (std::string uses
-   // malloc internally).
-
--#if defined(__GLIBCXX__)
-+#if defined(__GLIBCXX__) && defined(HAVE_BACKTRACE)
-
-   std::string::size_type search_from = 0;
-   while (search_from < text->size()) {
-@@ -145,7 +147,7 @@
-
-     handler->HandleOutput("\n");
-   }
--#else
-+#elif defined(HAVE_BACKTRACE)
-   bool printed = false;
-
-   // Below part is async-signal unsafe (uses malloc), so execute it only
-@@ -469,23 +471,31 @@
- StackTrace::StackTrace() {
-   // NOTE: This code MUST be async-signal safe (it's used by in-process
-   // stack dumping signal handler). NO malloc or stdio is allowed here.
--
-+#if defined(HAVE_BACKTRACE)
-   // Though the backtrace API man page does not list any possible negative
-   // return values, we take no chance.
-   count_ = std::max(backtrace(trace_, arraysize(trace_)), 0);
-+#else
-+  count_ = 0;
-+#endif
- }
-
- void StackTrace::Print() const {
-   // NOTE: This code MUST be async-signal safe (it's used by in-process
-   // stack dumping signal handler). NO malloc or stdio is allowed here.
--
-+#if defined(HAVE_BACKTRACE)
-   PrintBacktraceOutputHandler handler;
-   ProcessBacktrace(trace_, count_, &handler);
-+#endif
- }
-
- void StackTrace::OutputToStream(std::ostream* os) const {
-+#if !defined(HAVE_BACKTRACE)
-+(*os) << "(stack trace not supported)\n";
-+#else
-   StreamBacktraceOutputHandler handler(os);
-   ProcessBacktrace(trace_, count_, &handler);
-+#endif
- }
-
- namespace internal {

docker/alpine-edge/nginx-mainline/Dockerfile

@@ -1,230 +0,0 @@
-ARG ALPINE_VERSION=edge
-
-########################
-# Build pagespeed psol #
-########################
-FROM alpine:$ALPINE_VERSION as pagespeed
-
-# Check https://github.com/apache/incubator-pagespeed-mod/tags
-ARG MOD_PAGESPEED_TAG=v1.13.35.2
-
-RUN apk add --no-cache \
-        apache2-dev \
-        apr-dev \
-        apr-util-dev \
-        build-base \
-        curl \
-        gettext-dev \
-        git \
-        gperf \
-        icu-dev \
-        libjpeg-turbo-dev \
-        libpng-dev \
-        libressl-dev \
-        pcre-dev \
-        py-setuptools \
-        zlib-dev \
-    ;
-
-WORKDIR /usr/src
-RUN git clone -b ${MOD_PAGESPEED_TAG} \
-              --recurse-submodules \
-              --depth=1 \
-              -c advice.detachedHead=false \
-              -j`nproc` \
-              https://github.com/apache/incubator-pagespeed-mod.git \
-              modpagespeed \
-    ;
-
-WORKDIR /usr/src/modpagespeed
-
-COPY patches/modpagespeed/*.patch ./
-
-RUN for i in *.patch; do printf "\r\nApplying patch ${i%%.*}\r\n"; patch -p1 < $i || exit 1; done
-
-WORKDIR /usr/src/modpagespeed/tools/gyp
-RUN ./setup.py install
-
-WORKDIR /usr/src/modpagespeed
-
-RUN build/gyp_chromium --depth=. \
-                       -D use_system_libs=1 \
-    && \
-    cd /usr/src/modpagespeed/pagespeed/automatic && \
-    make psol BUILDTYPE=Release \
-              CFLAGS+="-I/usr/include/apr-1" \
-              CXXFLAGS+="-I/usr/include/apr-1 -DUCHAR_TYPE=uint16_t" \
-              -j`nproc` \
-    ;
-
-RUN mkdir -p /usr/src/ngxpagespeed/psol/lib/Release/linux/x64 && \
-    mkdir -p /usr/src/ngxpagespeed/psol/include/out/Release && \
-    cp -R out/Release/obj /usr/src/ngxpagespeed/psol/include/out/Release/ && \
-    cp -R pagespeed/automatic/pagespeed_automatic.a /usr/src/ngxpagespeed/psol/lib/Release/linux/x64/ && \
-    cp -R net \
-          pagespeed \
-          testing \
-          third_party \
-          url \
-          /usr/src/ngxpagespeed/psol/include/ \
-    ;
-
-
-##########################################
-# Build Nginx with support for PageSpeed #
-##########################################
-FROM alpine:$ALPINE_VERSION AS nginx
-
-# Check https://github.com/apache/incubator-pagespeed-ngx/tags
-ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable
-
-# Check http://nginx.org/en/download.html for the latest version.
-ARG NGINX_VERSION=1.15.6
-ARG NGINX_PGPKEY=520A9993A1C052F8
-ARG NGINX_BUILD_CONFIG="\
-        --prefix=/etc/nginx \
-        --sbin-path=/usr/sbin/nginx \
-        --modules-path=/usr/lib/nginx/modules \
-        --conf-path=/etc/nginx/nginx.conf \
-        --error-log-path=/var/log/nginx/error.log \
-        --http-log-path=/var/log/nginx/access.log \
-        --pid-path=/var/run/nginx.pid \
-        --lock-path=/var/run/nginx.lock \
-        --http-client-body-temp-path=/var/cache/nginx/client_temp \
-        --http-proxy-temp-path=/var/cache/nginx/proxy_temp \
-        --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \
-        --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp \
-        --http-scgi-temp-path=/var/cache/nginx/scgi_temp \
-        --user=nginx \
-        --group=nginx \
-        --with-http_ssl_module \
-        --with-http_realip_module \
-        --with-http_addition_module \
-        --with-http_sub_module \
-        --with-http_dav_module \
-        --with-http_flv_module \
-        --with-http_mp4_module \
-        --with-http_gunzip_module \
-        --with-http_gzip_static_module \
-        --with-http_random_index_module \
-        --with-http_secure_link_module \
-        --with-http_stub_status_module \
-        --with-http_auth_request_module \
-        --with-http_xslt_module=dynamic \
-        --with-http_image_filter_module=dynamic \
-        --with-http_geoip_module=dynamic \
-        --with-threads \
-        --with-stream \
-        --with-stream_ssl_module \
-        --with-stream_ssl_preread_module \
-        --with-stream_realip_module \
-        --with-stream_geoip_module=dynamic \
-        --with-http_slice_module \
-        --with-mail \
-        --with-mail_ssl_module \
-        --with-compat \
-        --with-file-aio \
-        --with-http_v2_module \
-    "
-
-RUN apk add --no-cache \
-        apr-dev \
-        apr-util-dev \
-        build-base \
-        ca-certificates \
-        gd-dev \
-        geoip-dev \
-        git \
-        gnupg \
-        icu-dev \
-        libjpeg-turbo-dev \
-        libpng-dev \
-        libxslt-dev \
-        linux-headers \
-        libressl-dev \
-        pcre-dev \
-        tar \
-        zlib-dev \
-    ;
-
-WORKDIR /usr/src
-RUN git clone -b ${NGX_PAGESPEED_TAG} \
-              --recurse-submodules \
-              --shallow-submodules \
-              --depth=1 \
-              -c advice.detachedHead=false \
-              -j`nproc` \
-              https://github.com/apache/incubator-pagespeed-ngx.git \
-              ngxpagespeed \
-    ;
-
-RUN wget https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \
-         https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz.asc && \
-    (gpg --keyserver ha.pool.sks-keyservers.net --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \
-     gpg --keyserver hkp://keyserver.ubuntu.com:80 --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \
-     gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --keyserver-options timeout=10 --recv-keys $NGINX_PGPKEY} ) && \
-    gpg --trusted-key ${NGINX_PGPKEY} --verify nginx-${NGINX_VERSION}.tar.gz.asc
-
-COPY --from=pagespeed /usr/src/ngxpagespeed /usr/src/ngxpagespeed/
-
-WORKDIR /usr/src/nginx
-
-RUN tar zxf ../nginx-${NGINX_VERSION}.tar.gz --strip-components=1 -C . && \
-    ./configure \
-        ${NGINX_BUILD_CONFIG} \
-        --add-module=/usr/src/ngxpagespeed \
-        --with-ld-opt="-Wl,-z,relro,--start-group -lapr-1 -laprutil-1 -licudata -licuuc -lpng -lturbojpeg -ljpeg" \
-    && \
-    make install -j`nproc`
-
-RUN rm -rf /etc/nginx/html/ && \
-    mkdir /etc/nginx/conf.d/ && \
-    mkdir -p /usr/share/nginx/html/ && \
-    sed -i 's|^</body>|<p><a href="https://www.ngxpagespeed.com/"><img src="pagespeed.png" title="Nginx module for rewriting web pages to reduce latency and bandwidth" /></a></p>\n</body>|' html/index.html && \
-    install -m644 html/index.html /usr/share/nginx/html/ && \
-    install -m644 html/50x.html /usr/share/nginx/html/ && \
-    ln -s ../../usr/lib/nginx/modules /etc/nginx/modules && \
-    strip /usr/sbin/nginx* \
-          /usr/lib/nginx/modules/*.so \
-    ;
-
-COPY conf/nginx.conf /etc/nginx/nginx.conf
-COPY conf/nginx.vh.default.conf /etc/nginx/conf.d/default.conf
-COPY pagespeed.png /usr/share/nginx/html/
-
-
-##########################################
-# Combine everything with minimal layers #
-##########################################
-FROM alpine:$ALPINE_VERSION
-LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \
-      version.mod-pagespeed="1.13.35.2" \
-      version.nginx="1.15.6" \
-      version.ngx-pagespeed="1.13.35.2"
-
-COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin
-COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx
-COPY --from=nginx /usr/lib/nginx/modules/ /usr/lib/nginx/modules/
-COPY --from=nginx /etc/nginx /etc/nginx
-COPY --from=nginx /usr/share/nginx/html/ /usr/share/nginx/html/
-
-RUN apk --no-cache upgrade && \
-    scanelf --needed --nobanner --format '%n#p' /usr/sbin/nginx /usr/lib/nginx/modules/*.so /usr/local/bin/envsubst \
-            | tr ',' '\n' \
-            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-            | xargs apk add --no-cache \
-    && \
-    apk add --no-cache tzdata
-
-RUN addgroup -S nginx && \
-    adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx && \
-    install -g nginx -o nginx -d /var/cache/ngx_pagespeed && \
-    mkdir -p /var/log/nginx && \
-    ln -sf /dev/stdout /var/log/nginx/access.log && \
-    ln -sf /dev/stderr /var/log/nginx/error.log
-
-EXPOSE 80
-
-STOPSIGNAL SIGTERM
-
-CMD ["/usr/sbin/nginx", "-g", "daemon off;"]

docker/alpine-edge/nginx-mainline/conf/nginx.conf

@@ -1,32 +0,0 @@
-
-user  nginx;
-worker_processes  1;
-
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-
-
-events {
-    worker_connections  1024;
-}
-
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    keepalive_timeout  65;
-
-    #gzip  on;
-
-    include /etc/nginx/conf.d/*.conf;
-}

docker/alpine-edge/nginx-mainline/conf/nginx.vh.default.conf

@@ -1,57 +0,0 @@
-server {
-    listen       80;
-    server_name  localhost;
-
-    #charset koi8-r;
-    #access_log  /var/log/nginx/host.access.log  main;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-    }
-
-    #error_page  404              /404.html;
-
-    # redirect server error pages to the static page /50x.html
-    #
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   /usr/share/nginx/html;
-    }
-
-    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-    #
-    #location ~ \.php$ {
-    #    proxy_pass   http://127.0.0.1;
-    #}
-
-    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-    #
-    #location ~ \.php$ {
-    #    root           html;
-    #    fastcgi_pass   127.0.0.1:9000;
-    #    fastcgi_index  index.php;
-    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
-    #    include        fastcgi_params;
-    #}
-    pagespeed on;
-
-    # Needs to exist and be writable by nginx.  Use tmpfs for best performance.
-    pagespeed FileCachePath /var/cache/ngx_pagespeed;
-
-    # Ensure requests for pagespeed optimized resources go to the pagespeed handler
-    # and no extraneous headers get set.
-    location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" {
-      add_header "" "";
-    }
-    location ~ "^/pagespeed_static/" { }
-    location ~ "^/ngx_pagespeed_beacon$" { }
-
-    # deny access to .htaccess files, if Apache's document root
-    # concurs with nginx's one
-    #
-    #location ~ /\.ht {
-    #    deny  all;
-    #}
-}
-

docker/alpine-edge/nginx-mainline/patches/modpagespeed/automatic_makefile.patch

@@ -1,31 +0,0 @@
---- a/pagespeed/automatic/Makefile
-+++ b/pagespeed/automatic/Makefile
-@@ -146,8 +146,6 @@
-   pagespeed/libpagespeed_thread.a \
-   pagespeed/libpthread_system.a \
-   pagespeed/libutil.a \
--  third_party/apr/libapr.a \
--  third_party/aprutil/libaprutil.a \
-   third_party/base64/libbase64.a \
-   third_party/chromium/src/base/third_party/dynamic_annotations/libdynamic_annotations.a \
-   third_party/css_parser/libcss_parser.a \
-@@ -163,18 +161,11 @@
-   third_party/grpc/libgrpc_core.a \
-   third_party/grpc/libgrpc_cpp.a \
-   third_party/hiredis/libhiredis.a \
--  third_party/icu/libicudata.a \
--  third_party/icu/libicuuc.a \
-   third_party/jsoncpp/libjsoncpp.a \
--  third_party/libjpeg_turbo/libjpeg.a \
--  third_party/libjpeg_turbo/src/libjpeg_turbo.a \
--  third_party/libpng/libpng.a \
-   third_party/optipng/libopngreduc.a \
-   third_party/protobuf/libprotobuf_full_do_not_use.a \
-   third_party/re2/libre2.a \
--  third_party/serf/libopenssl.a \
-   third_party/serf/libserf.a \
--  third_party/zlib/libzlib.a \
-   url/liburl_lib.a
- 
- # The 'gclient' build flow uses 'xcodebuild' on Mac and 'make' on Linux.
-

docker/alpine-edge/nginx-mainline/patches/modpagespeed/libpng16.patch

@@ -1,141 +0,0 @@
-From 7ea8d5fc141c7067c54ffa2b9fbc552c15089ca6 Mon Sep 17 00:00:00 2001
-From: ashishk-1 <ashish.k@gdbtech.in>
-Date: Thu, 18 Jan 2018 22:14:05 +0530
-Subject: [PATCH] Upgrading libpng library to version 1.6 (#1724)
-
----
- net/instaweb/rewriter/image.cc               |  8 ++++++++
- pagespeed/kernel/image/gif_reader.cc         |  4 ++--
- pagespeed/kernel/image/image_converter.cc    |  6 ++++++
- pagespeed/kernel/image/png_optimizer_test.cc |  6 ++++++
- third_party/libpng/libpng.gyp                | 26 +++++++++++++++++++++++---
- third_party/libpng/src                       |  2 +-
- 6 files changed, 46 insertions(+), 6 deletions(-)
-
-diff --git a/net/instaweb/rewriter/image.cc b/net/instaweb/rewriter/image.cc
-index 4f631182a..bb67bba35 100644
---- a/net/instaweb/rewriter/image.cc
-+++ b/net/instaweb/rewriter/image.cc
-@@ -21,6 +21,14 @@
- #include <algorithm>
- #include <cstddef>
-
-+extern "C" {
-+#ifdef USE_SYSTEM_ZLIB
-+#include "zlib.h"
-+#else
-+#include "third_party/zlib/zlib.h"
-+#endif
-+}  // extern "C"
-+
- #include "base/logging.h"
- #include "net/instaweb/rewriter/cached_result.pb.h"
- #include "net/instaweb/rewriter/public/image_data_lookup.h"
-diff --git a/pagespeed/kernel/image/gif_reader.cc b/pagespeed/kernel/image/gif_reader.cc
-index 7de69b3d7..bb0bc9cfc 100644
---- a/pagespeed/kernel/image/gif_reader.cc
-+++ b/pagespeed/kernel/image/gif_reader.cc
-@@ -411,8 +411,8 @@ bool ReadGifToPng(GifFileType* gif_file,
-   png_uint_32 height = png_get_image_height(paletted_png_ptr,
-                                             paletted_info_ptr);
-   for (png_uint_32 row = 1; row < height; ++row) {
--    memcpy(paletted_info_ptr->row_pointers[row],
--           paletted_info_ptr->row_pointers[0],
-+    memcpy(row_pointers[row],
-+           row_pointers[0],
-            row_size);
-   }
-
-diff --git a/pagespeed/kernel/image/image_converter.cc b/pagespeed/kernel/image/image_converter.cc
-index d796b5065..84b7aff74 100644
---- a/pagespeed/kernel/image/image_converter.cc
-+++ b/pagespeed/kernel/image/image_converter.cc
-@@ -30,6 +30,12 @@ extern "C" {
- #else
- #include "third_party/libpng/src/png.h"
- #endif
-+
-+#ifdef USE_SYSTEM_ZLIB
-+#include "zlib.h"
-+#else
-+#include "third_party/zlib/zlib.h"
-+#endif
- }  // extern "C"
-
- #include "base/logging.h"
-diff --git a/pagespeed/kernel/image/png_optimizer_test.cc b/pagespeed/kernel/image/png_optimizer_test.cc
-index 9ad915aff..3faa526a8 100644
---- a/pagespeed/kernel/image/png_optimizer_test.cc
-+++ b/pagespeed/kernel/image/png_optimizer_test.cc
-@@ -36,6 +36,12 @@ extern "C" {
- #else
- #include "third_party/libpng/src/png.h"
- #endif
-+
-+#ifdef USE_SYSTEM_ZLIB
-+#include "zlib.h"
-+#else
-+#include "third_party/zlib/zlib.h"
-+#endif
- }
-
- namespace {
-diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp
-index cfaafee00..d96a8f74c 100644
---- a/third_party/libpng/libpng.gyp
-+++ b/third_party/libpng/libpng.gyp
-@@ -22,14 +22,29 @@
-           'dependencies': [
-             '../zlib/zlib.gyp:zlib',
-           ],
-+          'actions': [
-+            {
-+              'action_name': 'copy_libpngconf_prebuilt',
-+              'inputs' : [],
-+              'outputs': [''],
-+              'action': [
-+                'cp',
-+                '-f',
-+                '<(DEPTH)/third_party/libpng/src/scripts/pnglibconf.h.prebuilt',
-+                '<(DEPTH)/third_party/libpng/src/pnglibconf.h',
-+              ],
-+            },
-+          ],
-           'msvs_guid': 'C564F145-9172-42C3-BFCB-6014CA97DBCD',
-           'sources': [
-+            'src/pngpriv.h',
-             'src/png.c',
-             'src/png.h',
-             'src/pngconf.h',
-+            'src/pngdebug.h',
-             'src/pngerror.c',
--            'src/pnggccrd.c',
-             'src/pngget.c',
-+            'src/pnginfo.h',
-             'src/pngmem.c',
-             'src/pngpread.c',
-             'src/pngread.c',
-@@ -37,9 +52,8 @@
-             'src/pngrtran.c',
-             'src/pngrutil.c',
-             'src/pngset.c',
-+            'src/pngstruct.h',
-             'src/pngtrans.c',
--            'src/pngusr.h',
--            'src/pngvcrd.c',
-             'src/pngwio.c',
-             'src/pngwrite.c',
-             'src/pngwtran.c',
-@@ -54,6 +68,12 @@
-               # doesn't like that. This define tells libpng to not
-               # complain about our inclusion of setjmp.h.
-               'PNG_SKIP_SETJMP_CHECK',
-+
-+              # The PNG_FREE_ME_SUPPORTED define was dropped in libpng
-+              # 1.4.0beta78, with its behavior becoming the default
-+              # behavior.
-+              # Hence, we define it ourselves for version >= 1.4.0
-+              'PNG_FREE_ME_SUPPORTED',
-             ],
-           },
-           'export_dependent_settings': [

docker/alpine-edge/nginx-mainline/patches/modpagespeed/pthread_nonrecursive_np.patch

@@ -1,11 +0,0 @@
---- a/pagespeed/kernel/thread/pthread_rw_lock.cc
-+++ b/pagespeed/kernel/thread/pthread_rw_lock.cc
-@@ -31,7 +31,7 @@
-   //
-   // Other OS's (FreeBSD, Darwin, OpenSolaris) documentation suggests
-   // that they prefer writers by default.
--#ifdef linux
-+#if defined(linux) && defined(__GLIBC__)
-   pthread_rwlockattr_setkind_np(&attr_,
-                                 PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
- #endif

docker/alpine-edge/nginx-mainline/patches/modpagespeed/rename_c_symbols.patch

@@ -1,13 +0,0 @@
---- a/pagespeed/automatic/rename_c_symbols.sh
-+++ b/pagespeed/automatic/rename_c_symbols.sh
-@@ -24,8 +24,8 @@
- set -e  # exit script if any command returns an error
- set -u  # exit the script if any variable is uninitialized
-
--IN=$(readlink -f $1)
--OUT=$(readlink -f $2)
-+IN=$1
-+OUT=$2
-
- # Get a list of defined non-C++ symbols that are global and not weak.
- # _Z is used at start of C++-mangled symbol names.

docker/alpine-edge/nginx-mainline/patches/modpagespeed/stack_trace_posix.patch

@@ -1,64 +0,0 @@
---- a/third_party/chromium/src/base/debug/stack_trace_posix.cc
-+++ b/third_party/chromium/src/base/debug/stack_trace_posix.cc
-@@ -5,7 +5,9 @@
- #include "base/debug/stack_trace.h"
-
- #include <errno.h>
-+#if defined(HAVE_BACKTRACE)
- #include <execinfo.h>
-+#endif
- #include <fcntl.h>
- #include <signal.h>
- #include <stdio.h>
-@@ -64,7 +66,7 @@
-   // Note: code in this function is NOT async-signal safe (std::string uses
-   // malloc internally).
-
--#if defined(__GLIBCXX__)
-+#if defined(__GLIBCXX__) && defined(HAVE_BACKTRACE)
-
-   std::string::size_type search_from = 0;
-   while (search_from < text->size()) {
-@@ -145,7 +147,7 @@
-
-     handler->HandleOutput("\n");
-   }
--#else
-+#elif defined(HAVE_BACKTRACE)
-   bool printed = false;
-
-   // Below part is async-signal unsafe (uses malloc), so execute it only
-@@ -469,23 +471,31 @@
- StackTrace::StackTrace() {
-   // NOTE: This code MUST be async-signal safe (it's used by in-process
-   // stack dumping signal handler). NO malloc or stdio is allowed here.
--
-+#if defined(HAVE_BACKTRACE)
-   // Though the backtrace API man page does not list any possible negative
-   // return values, we take no chance.
-   count_ = std::max(backtrace(trace_, arraysize(trace_)), 0);
-+#else
-+  count_ = 0;
-+#endif
- }
-
- void StackTrace::Print() const {
-   // NOTE: This code MUST be async-signal safe (it's used by in-process
-   // stack dumping signal handler). NO malloc or stdio is allowed here.
--
-+#if defined(HAVE_BACKTRACE)
-   PrintBacktraceOutputHandler handler;
-   ProcessBacktrace(trace_, count_, &handler);
-+#endif
- }
-
- void StackTrace::OutputToStream(std::ostream* os) const {
-+#if !defined(HAVE_BACKTRACE)
-+(*os) << "(stack trace not supported)\n";
-+#else
-   StreamBacktraceOutputHandler handler(os);
-   ProcessBacktrace(trace_, count_, &handler);
-+#endif
- }
-
- namespace internal {

docker/alpine-edge/nginx-stable/Dockerfile

@@ -1,235 +0,0 @@
-ARG ALPINE_VERSION=edge
-
-########################
-# Build pagespeed psol #
-########################
-FROM alpine:$ALPINE_VERSION as pagespeed
-
-# Check https://github.com/apache/incubator-pagespeed-mod/tags
-ARG MOD_PAGESPEED_TAG=v1.13.35.2
-
-RUN apk add --no-cache \
-        apache2-dev \
-        apr-dev \
-        apr-util-dev \
-        build-base \
-        curl \
-        gettext-dev \
-        git \
-        gperf \
-        icu-dev \
-        libjpeg-turbo-dev \
-        libpng-dev \
-        libressl-dev \
-        pcre-dev \
-        py-setuptools \
-        zlib-dev \
-    ;
-
-WORKDIR /usr/src
-RUN git clone -b ${MOD_PAGESPEED_TAG} \
-              --recurse-submodules \
-              --depth=1 \
-              -c advice.detachedHead=false \
-              -j`nproc` \
-              https://github.com/apache/incubator-pagespeed-mod.git \
-              modpagespeed \
-    ;
-
-WORKDIR /usr/src/modpagespeed
-
-COPY patches/modpagespeed/*.patch ./
-
-RUN for i in *.patch; do printf "\r\nApplying patch ${i%%.*}\r\n"; patch -p1 < $i || exit 1; done
-
-WORKDIR /usr/src/modpagespeed/tools/gyp
-RUN ./setup.py install
-
-WORKDIR /usr/src/modpagespeed
-
-RUN build/gyp_chromium --depth=. \
-                       -D use_system_libs=1 \
-    && \
-    cd /usr/src/modpagespeed/pagespeed/automatic && \
-    make psol BUILDTYPE=Release \
-              CFLAGS+="-I/usr/include/apr-1" \
-              CXXFLAGS+="-I/usr/include/apr-1 -DUCHAR_TYPE=uint16_t" \
-              -j`nproc` \
-    ;
-
-RUN mkdir -p /usr/src/ngxpagespeed/psol/lib/Release/linux/x64 && \
-    mkdir -p /usr/src/ngxpagespeed/psol/include/out/Release && \
-    cp -R out/Release/obj /usr/src/ngxpagespeed/psol/include/out/Release/ && \
-    cp -R pagespeed/automatic/pagespeed_automatic.a /usr/src/ngxpagespeed/psol/lib/Release/linux/x64/ && \
-    cp -R net \
-          pagespeed \
-          testing \
-          third_party \
-          url \
-          /usr/src/ngxpagespeed/psol/include/ \
-    ;
-
-
-##########################################
-# Build Nginx with support for PageSpeed #
-##########################################
-FROM alpine:$ALPINE_VERSION AS nginx
-
-# Check https://github.com/apache/incubator-pagespeed-ngx/tags
-ARG NGX_PAGESPEED_TAG=v1.13.35.2-stable
-
-# Check http://nginx.org/en/download.html for the latest version.
-ARG NGINX_VERSION=1.14.1
-ARG NGINX_PGPKEY=520A9993A1C052F8
-ARG NGINX_BUILD_CONFIG="\
-        --prefix=/etc/nginx \
-        --sbin-path=/usr/sbin/nginx \
-        --modules-path=/usr/lib/nginx/modules \
-        --conf-path=/etc/nginx/nginx.conf \
-        --error-log-path=/var/log/nginx/error.log \
-        --http-log-path=/var/log/nginx/access.log \
-        --pid-path=/var/run/nginx.pid \
-        --lock-path=/var/run/nginx.lock \
-        --http-client-body-temp-path=/var/cache/nginx/client_temp \
-        --http-proxy-temp-path=/var/cache/nginx/proxy_temp \
-        --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp \
-        --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp \
-        --http-scgi-temp-path=/var/cache/nginx/scgi_temp \
-        --user=nginx \
-        --group=nginx \
-        --with-http_ssl_module \
-        --with-http_realip_module \
-        --with-http_addition_module \
-        --with-http_sub_module \
-        --with-http_dav_module \
-        --with-http_flv_module \
-        --with-http_mp4_module \
-        --with-http_gunzip_module \
-        --with-http_gzip_static_module \
-        --with-http_random_index_module \
-        --with-http_secure_link_module \
-        --with-http_stub_status_module \
-        --with-http_auth_request_module \
-        --with-http_xslt_module=dynamic \
-        --with-http_image_filter_module=dynamic \
-        --with-http_geoip_module=dynamic \
-        --with-threads \
-        --with-stream \
-        --with-stream_ssl_module \
-        --with-stream_ssl_preread_module \
-        --with-stream_realip_module \
-        --with-stream_geoip_module=dynamic \
-        --with-http_slice_module \
-        --with-mail \
-        --with-mail_ssl_module \
-        --with-compat \
-        --with-file-aio \
-        --with-http_v2_module \
-    "
-
-RUN apk add --no-cache \
-        apr-dev \
-        apr-util-dev \
-        build-base \
-        ca-certificates \
-        gd-dev \
-        geoip-dev \
-        git \
-        gnupg \
-        icu-dev \
-        libjpeg-turbo-dev \
-        libpng-dev \
-        libxslt-dev \
-        linux-headers \
-        libressl-dev \
-        pcre-dev \
-        tar \
-        zlib-dev \
-    ;
-
-WORKDIR /usr/src
-RUN git clone -b ${NGX_PAGESPEED_TAG} \
-              --recurse-submodules \
-              --shallow-submodules \
-              --depth=1 \
-              -c advice.detachedHead=false \
-              -j`nproc` \
-              https://github.com/apache/incubator-pagespeed-ngx.git \
-              ngxpagespeed \
-    ;
-
-RUN wget https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \
-         https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz.asc && \
-    (gpg --keyserver ha.pool.sks-keyservers.net --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \
-     gpg --keyserver hkp://keyserver.ubuntu.com:80 --keyserver-options timeout=10 --recv-keys ${NGINX_PGPKEY} || \
-     gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --keyserver-options timeout=10 --recv-keys $NGINX_PGPKEY} ) && \
-    gpg --trusted-key ${NGINX_PGPKEY} --verify nginx-${NGINX_VERSION}.tar.gz.asc
-
-COPY --from=pagespeed /usr/src/ngxpagespeed /usr/src/ngxpagespeed/
-
-WORKDIR /usr/src/nginx
-
-RUN tar zxf ../nginx-${NGINX_VERSION}.tar.gz --strip-components=1 -C .
-
-COPY patches/ngx/*.patch ./
-
-RUN for i in *.patch; do printf "\r\nApplying patch ${i%%.*}\r\n"; patch -p1 < $i || exit 1; done
-
-RUN ./configure \
-        ${NGINX_BUILD_CONFIG} \
-        --add-module=/usr/src/ngxpagespeed \
-        --with-ld-opt="-Wl,-z,relro,--start-group -lapr-1 -laprutil-1 -licudata -licuuc -lpng -lturbojpeg -ljpeg" \
-    && \
-    make install -j`nproc`
-
-RUN rm -rf /etc/nginx/html/ && \
-    mkdir /etc/nginx/conf.d/ && \
-    mkdir -p /usr/share/nginx/html/ && \
-    sed -i 's|^</body>|<p><a href="https://www.ngxpagespeed.com/"><img src="pagespeed.png" title="Nginx module for rewriting web pages to reduce latency and bandwidth" /></a></p>\n</body>|' html/index.html && \
-    install -m644 html/index.html /usr/share/nginx/html/ && \
-    install -m644 html/50x.html /usr/share/nginx/html/ && \
-    ln -s ../../usr/lib/nginx/modules /etc/nginx/modules && \
-    strip /usr/sbin/nginx* \
-          /usr/lib/nginx/modules/*.so \
-    ;
-
-COPY conf/nginx.conf /etc/nginx/nginx.conf
-COPY conf/nginx.vh.default.conf /etc/nginx/conf.d/default.conf
-COPY pagespeed.png /usr/share/nginx/html/
-
-
-##########################################
-# Combine everything with minimal layers #
-##########################################
-FROM alpine:$ALPINE_VERSION
-LABEL maintainer="Nico Berlee <nico.berlee@on2it.net>" \
-      version.mod-pagespeed="1.13.35.2" \
-      version.nginx="1.14.1" \
-      version.ngx-pagespeed="1.13.35.2"
-
-COPY --from=pagespeed /usr/bin/envsubst /usr/local/bin
-COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx
-COPY --from=nginx /usr/lib/nginx/modules/ /usr/lib/nginx/modules/
-COPY --from=nginx /etc/nginx /etc/nginx
-COPY --from=nginx /usr/share/nginx/html/ /usr/share/nginx/html/
-
-RUN apk --no-cache upgrade && \
-    scanelf --needed --nobanner --format '%n#p' /usr/sbin/nginx /usr/lib/nginx/modules/*.so /usr/local/bin/envsubst \
-            | tr ',' '\n' \
-            | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-            | xargs apk add --no-cache \
-    && \
-    apk add --no-cache tzdata
-
-RUN addgroup -S nginx && \
-    adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx && \
-    install -g nginx -o nginx -d /var/cache/ngx_pagespeed && \
-    mkdir -p /var/log/nginx && \
-    ln -sf /dev/stdout /var/log/nginx/access.log && \
-    ln -sf /dev/stderr /var/log/nginx/error.log
-
-EXPOSE 80
-
-STOPSIGNAL SIGTERM
-
-CMD ["/usr/sbin/nginx", "-g", "daemon off;"]

docker/alpine-edge/nginx-stable/conf/nginx.conf

@@ -1,32 +0,0 @@
-
-user  nginx;
-worker_processes  1;
-
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-
-
-events {
-    worker_connections  1024;
-}
-
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    keepalive_timeout  65;
-
-    #gzip  on;
-
-    include /etc/nginx/conf.d/*.conf;
-}

docker/alpine-edge/nginx-stable/conf/nginx.vh.default.conf

@@ -1,57 +0,0 @@
-server {
-    listen       80;
-    server_name  localhost;
-
-    #charset koi8-r;
-    #access_log  /var/log/nginx/host.access.log  main;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-    }
-
-    #error_page  404              /404.html;
-
-    # redirect server error pages to the static page /50x.html
-    #
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   /usr/share/nginx/html;
-    }
-
-    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-    #
-    #location ~ \.php$ {
-    #    proxy_pass   http://127.0.0.1;
-    #}
-
-    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-    #
-    #location ~ \.php$ {
-    #    root           html;
-    #    fastcgi_pass   127.0.0.1:9000;
-    #    fastcgi_index  index.php;
-    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
-    #    include        fastcgi_params;
-    #}
-    pagespeed on;
-
-    # Needs to exist and be writable by nginx.  Use tmpfs for best performance.
-    pagespeed FileCachePath /var/cache/ngx_pagespeed;
-
-    # Ensure requests for pagespeed optimized resources go to the pagespeed handler
-    # and no extraneous headers get set.
-    location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" {
-      add_header "" "";
-    }
-    location ~ "^/pagespeed_static/" { }
-    location ~ "^/ngx_pagespeed_beacon$" { }
-
-    # deny access to .htaccess files, if Apache's document root
-    # concurs with nginx's one
-    #
-    #location ~ /\.ht {
-    #    deny  all;
-    #}
-}
-

docker/alpine-edge/nginx-stable/patches/modpagespeed/automatic_makefile.patch

@@ -1,31 +0,0 @@
---- a/pagespeed/automatic/Makefile
-+++ b/pagespeed/automatic/Makefile
-@@ -146,8 +146,6 @@
-   pagespeed/libpagespeed_thread.a \
-   pagespeed/libpthread_system.a \
-   pagespeed/libutil.a \
--  third_party/apr/libapr.a \
--  third_party/aprutil/libaprutil.a \
-   third_party/base64/libbase64.a \
-   third_party/chromium/src/base/third_party/dynamic_annotations/libdynamic_annotations.a \
-   third_party/css_parser/libcss_parser.a \
-@@ -163,18 +161,11 @@
-   third_party/grpc/libgrpc_core.a \
-   third_party/grpc/libgrpc_cpp.a \
-   third_party/hiredis/libhiredis.a \
--  third_party/icu/libicudata.a \
--  third_party/icu/libicuuc.a \
-   third_party/jsoncpp/libjsoncpp.a \
--  third_party/libjpeg_turbo/libjpeg.a \
--  third_party/libjpeg_turbo/src/libjpeg_turbo.a \
--  third_party/libpng/libpng.a \
-   third_party/optipng/libopngreduc.a \
-   third_party/protobuf/libprotobuf_full_do_not_use.a \
-   third_party/re2/libre2.a \
--  third_party/serf/libopenssl.a \
-   third_party/serf/libserf.a \
--  third_party/zlib/libzlib.a \
-   url/liburl_lib.a
- 
- # The 'gclient' build flow uses 'xcodebuild' on Mac and 'make' on Linux.
-

docker/alpine-edge/nginx-stable/patches/modpagespeed/libpng16.patch

@@ -1,141 +0,0 @@
-From 7ea8d5fc141c7067c54ffa2b9fbc552c15089ca6 Mon Sep 17 00:00:00 2001
-From: ashishk-1 <ashish.k@gdbtech.in>
-Date: Thu, 18 Jan 2018 22:14:05 +0530
-Subject: [PATCH] Upgrading libpng library to version 1.6 (#1724)
-
----
- net/instaweb/rewriter/image.cc               |  8 ++++++++
- pagespeed/kernel/image/gif_reader.cc         |  4 ++--
- pagespeed/kernel/image/image_converter.cc    |  6 ++++++
- pagespeed/kernel/image/png_optimizer_test.cc |  6 ++++++
- third_party/libpng/libpng.gyp                | 26 +++++++++++++++++++++++---
- third_party/libpng/src                       |  2 +-
- 6 files changed, 46 insertions(+), 6 deletions(-)
-
-diff --git a/net/instaweb/rewriter/image.cc b/net/instaweb/rewriter/image.cc
-index 4f631182a..bb67bba35 100644
---- a/net/instaweb/rewriter/image.cc
-+++ b/net/instaweb/rewriter/image.cc
-@@ -21,6 +21,14 @@
- #include <algorithm>
- #include <cstddef>
-
-+extern "C" {
-+#ifdef USE_SYSTEM_ZLIB
-+#include "zlib.h"
-+#else
-+#include "third_party/zlib/zlib.h"
-+#endif
-+}  // extern "C"
-+
- #include "base/logging.h"
- #include "net/instaweb/rewriter/cached_result.pb.h"
- #include "net/instaweb/rewriter/public/image_data_lookup.h"
-diff --git a/pagespeed/kernel/image/gif_reader.cc b/pagespeed/kernel/image/gif_reader.cc
-index 7de69b3d7..bb0bc9cfc 100644
---- a/pagespeed/kernel/image/gif_reader.cc
-+++ b/pagespeed/kernel/image/gif_reader.cc
-@@ -411,8 +411,8 @@ bool ReadGifToPng(GifFileType* gif_file,
-   png_uint_32 height = png_get_image_height(paletted_png_ptr,
-                                             paletted_info_ptr);
-   for (png_uint_32 row = 1; row < height; ++row) {
--    memcpy(paletted_info_ptr->row_pointers[row],
--           paletted_info_ptr->row_pointers[0],
-+    memcpy(row_pointers[row],
-+           row_pointers[0],
-            row_size);
-   }
-
-diff --git a/pagespeed/kernel/image/image_converter.cc b/pagespeed/kernel/image/image_converter.cc
-index d796b5065..84b7aff74 100644
---- a/pagespeed/kernel/image/image_converter.cc
-+++ b/pagespeed/kernel/image/image_converter.cc
-@@ -30,6 +30,12 @@ extern "C" {
- #else
- #include "third_party/libpng/src/png.h"
- #endif
-+
-+#ifdef USE_SYSTEM_ZLIB
-+#include "zlib.h"
-+#else
-+#include "third_party/zlib/zlib.h"
-+#endif
- }  // extern "C"
-
- #include "base/logging.h"
-diff --git a/pagespeed/kernel/image/png_optimizer_test.cc b/pagespeed/kernel/image/png_optimizer_test.cc
-index 9ad915aff..3faa526a8 100644
---- a/pagespeed/kernel/image/png_optimizer_test.cc
-+++ b/pagespeed/kernel/image/png_optimizer_test.cc
-@@ -36,6 +36,12 @@ extern "C" {
- #else
- #include "third_party/libpng/src/png.h"
- #endif
-+
-+#ifdef USE_SYSTEM_ZLIB
-+#include "zlib.h"
-+#else
-+#include "third_party/zlib/zlib.h"
-+#endif
- }
-
- namespace {
-diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp
-index cfaafee00..d96a8f74c 100644
---- a/third_party/libpng/libpng.gyp
-+++ b/third_party/libpng/libpng.gyp
-@@ -22,14 +22,29 @@
-           'dependencies': [
-             '../zlib/zlib.gyp:zlib',
-           ],
-+          'actions': [
-+            {
-+              'action_name': 'copy_libpngconf_prebuilt',
-+              'inputs' : [],
-+              'outputs': [''],
-+              'action': [
-+                'cp',
-+                '-f',
-+                '<(DEPTH)/third_party/libpng/src/scripts/pnglibconf.h.prebuilt',
-+                '<(DEPTH)/third_party/libpng/src/pnglibconf.h',
-+              ],
-+            },
-+          ],
-           'msvs_guid': 'C564F145-9172-42C3-BFCB-6014CA97DBCD',
-           'sources': [
-+            'src/pngpriv.h',
-             'src/png.c',
-             'src/png.h',
-             'src/pngconf.h',
-+            'src/pngdebug.h',
-             'src/pngerror.c',
--            'src/pnggccrd.c',
-             'src/pngget.c',
-+            'src/pnginfo.h',
-             'src/pngmem.c',
-             'src/pngpread.c',
-             'src/pngread.c',
-@@ -37,9 +52,8 @@
-             'src/pngrtran.c',
-             'src/pngrutil.c',
-             'src/pngset.c',
-+            'src/pngstruct.h',
-             'src/pngtrans.c',
--            'src/pngusr.h',
--            'src/pngvcrd.c',
-             'src/pngwio.c',
-             'src/pngwrite.c',
-             'src/pngwtran.c',
-@@ -54,6 +68,12 @@
-               # doesn't like that. This define tells libpng to not
-               # complain about our inclusion of setjmp.h.
-               'PNG_SKIP_SETJMP_CHECK',
-+
-+              # The PNG_FREE_ME_SUPPORTED define was dropped in libpng
-+              # 1.4.0beta78, with its behavior becoming the default
-+              # behavior.
-+              # Hence, we define it ourselves for version >= 1.4.0
-+              'PNG_FREE_ME_SUPPORTED',
-             ],
-           },
-           'export_dependent_settings': [

docker/alpine-edge/nginx-stable/patches/modpagespeed/pthread_nonrecursive_np.patch

@@ -1,11 +0,0 @@
---- a/pagespeed/kernel/thread/pthread_rw_lock.cc
-+++ b/pagespeed/kernel/thread/pthread_rw_lock.cc
-@@ -31,7 +31,7 @@
-   //
-   // Other OS's (FreeBSD, Darwin, OpenSolaris) documentation suggests
-   // that they prefer writers by default.
--#ifdef linux
-+#if defined(linux) && defined(__GLIBC__)
-   pthread_rwlockattr_setkind_np(&attr_,
-                                 PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
- #endif

docker/alpine-edge/nginx-stable/patches/modpagespeed/rename_c_symbols.patch

@@ -1,13 +0,0 @@
---- a/pagespeed/automatic/rename_c_symbols.sh
-+++ b/pagespeed/automatic/rename_c_symbols.sh
-@@ -24,8 +24,8 @@
- set -e  # exit script if any command returns an error
- set -u  # exit the script if any variable is uninitialized
-
--IN=$(readlink -f $1)
--OUT=$(readlink -f $2)
-+IN=$1
-+OUT=$2
-
- # Get a list of defined non-C++ symbols that are global and not weak.
- # _Z is used at start of C++-mangled symbol names.

docker/alpine-edge/nginx-stable/patches/modpagespeed/stack_trace_posix.patch

@@ -1,64 +0,0 @@
---- a/third_party/chromium/src/base/debug/stack_trace_posix.cc
-+++ b/third_party/chromium/src/base/debug/stack_trace_posix.cc
-@@ -5,7 +5,9 @@
- #include "base/debug/stack_trace.h"
-
- #include <errno.h>
-+#if defined(HAVE_BACKTRACE)
- #include <execinfo.h>
-+#endif
- #include <fcntl.h>
- #include <signal.h>
- #include <stdio.h>
-@@ -64,7 +66,7 @@
-   // Note: code in this function is NOT async-signal safe (std::string uses
-   // malloc internally).
-
--#if defined(__GLIBCXX__)
-+#if defined(__GLIBCXX__) && defined(HAVE_BACKTRACE)
-
-   std::string::size_type search_from = 0;
-   while (search_from < text->size()) {
-@@ -145,7 +147,7 @@
-
-     handler->HandleOutput("\n");
-   }
--#else
-+#elif defined(HAVE_BACKTRACE)
-   bool printed = false;
-
-   // Below part is async-signal unsafe (uses malloc), so execute it only
-@@ -469,23 +471,31 @@
- StackTrace::StackTrace() {
-   // NOTE: This code MUST be async-signal safe (it's used by in-process
-   // stack dumping signal handler). NO malloc or stdio is allowed here.
--
-+#if defined(HAVE_BACKTRACE)
-   // Though the backtrace API man page does not list any possible negative
-   // return values, we take no chance.
-   count_ = std::max(backtrace(trace_, arraysize(trace_)), 0);
-+#else
-+  count_ = 0;
-+#endif
- }
-
- void StackTrace::Print() const {
-   // NOTE: This code MUST be async-signal safe (it's used by in-process
-   // stack dumping signal handler). NO malloc or stdio is allowed here.
--
-+#if defined(HAVE_BACKTRACE)
-   PrintBacktraceOutputHandler handler;
-   ProcessBacktrace(trace_, count_, &handler);
-+#endif
- }
-
- void StackTrace::OutputToStream(std::ostream* os) const {
-+#if !defined(HAVE_BACKTRACE)
-+(*os) << "(stack trace not supported)\n";
-+#else
-   StreamBacktraceOutputHandler handler(os);
-   ProcessBacktrace(trace_, count_, &handler);
-+#endif
- }
-
- namespace internal {

docker/alpine-edge/nginx-stable/patches/ngx/gcc8.patch

@@ -1,190 +0,0 @@
-diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
-index bc43f53ed9..3eec1b7dd0 100644
---- a/src/http/modules/ngx_http_fastcgi_module.c
-+++ b/src/http/modules/ngx_http_fastcgi_module.c
-@@ -3264,7 +3264,8 @@ ngx_http_fastcgi_init_params(ngx_conf_t *cf, ngx_http_fastcgi_loc_conf_t *conf,
-             return NGX_ERROR;
-         }
- 
--        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
-+        copy->code = (ngx_http_script_code_pt) (void *)
-+                                                 ngx_http_script_copy_len_code;
-         copy->len = src[i].key.len;
- 
-         copy = ngx_array_push_n(params->lengths,
-@@ -3273,7 +3274,8 @@ ngx_http_fastcgi_init_params(ngx_conf_t *cf, ngx_http_fastcgi_loc_conf_t *conf,
-             return NGX_ERROR;
-         }
- 
--        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
-+        copy->code = (ngx_http_script_code_pt) (void *)
-+                                                 ngx_http_script_copy_len_code;
-         copy->len = src[i].skip_empty;
- 
- 
-diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c
-index 837ad9a2ea..300d927047 100644
---- a/src/http/modules/ngx_http_grpc_module.c
-+++ b/src/http/modules/ngx_http_grpc_module.c
-@@ -4389,7 +4389,8 @@ ngx_http_grpc_init_headers(ngx_conf_t *cf, ngx_http_grpc_loc_conf_t *conf,
-             return NGX_ERROR;
-         }
- 
--        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
-+        copy->code = (ngx_http_script_code_pt) (void *)
-+                                                 ngx_http_script_copy_len_code;
-         copy->len = src[i].key.len;
- 
-         size = (sizeof(ngx_http_script_copy_code_t)
-diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
-index c9ad638df9..e7f829d653 100644
---- a/src/http/modules/ngx_http_proxy_module.c
-+++ b/src/http/modules/ngx_http_proxy_module.c
-@@ -3493,7 +3493,8 @@ ngx_http_proxy_init_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
-             return NGX_ERROR;
-         }
- 
--        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
-+        copy->code = (ngx_http_script_code_pt) (void *)
-+                                                 ngx_http_script_copy_len_code;
-         copy->len = src[i].key.len;
- 
-         size = (sizeof(ngx_http_script_copy_code_t)
-diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c
-index 3fb227b28c..9bd45bd136 100644
---- a/src/http/modules/ngx_http_scgi_module.c
-+++ b/src/http/modules/ngx_http_scgi_module.c
-@@ -1724,7 +1724,8 @@ ngx_http_scgi_init_params(ngx_conf_t *cf, ngx_http_scgi_loc_conf_t *conf,
-             return NGX_ERROR;
-         }
- 
--        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
-+        copy->code = (ngx_http_script_code_pt) (void *)
-+                                                 ngx_http_script_copy_len_code;
-         copy->len = src[i].key.len + 1;
- 
-         copy = ngx_array_push_n(params->lengths,
-@@ -1733,7 +1734,8 @@ ngx_http_scgi_init_params(ngx_conf_t *cf, ngx_http_scgi_loc_conf_t *conf,
-             return NGX_ERROR;
-         }
- 
--        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
-+        copy->code = (ngx_http_script_code_pt) (void *)
-+                                                 ngx_http_script_copy_len_code;
-         copy->len = src[i].skip_empty;
- 
- 
-diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c
-index 124da4db56..238bcf8a3b 100644
---- a/src/http/modules/ngx_http_uwsgi_module.c
-+++ b/src/http/modules/ngx_http_uwsgi_module.c
-@@ -1987,7 +1987,8 @@ ngx_http_uwsgi_init_params(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *conf,
-             return NGX_ERROR;
-         }
- 
--        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
-+        copy->code = (ngx_http_script_code_pt) (void *)
-+                                                 ngx_http_script_copy_len_code;
-         copy->len = src[i].key.len;
- 
-         copy = ngx_array_push_n(params->lengths,
-@@ -1996,7 +1997,8 @@ ngx_http_uwsgi_init_params(ngx_conf_t *cf, ngx_http_uwsgi_loc_conf_t *conf,
-             return NGX_ERROR;
-         }
- 
--        copy->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
-+        copy->code = (ngx_http_script_code_pt) (void *)
-+                                                 ngx_http_script_copy_len_code;
-         copy->len = src[i].skip_empty;
- 
- 
-diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
-index 96f3ec6965..1a87735617 100644
---- a/src/http/ngx_http_script.c
-+++ b/src/http/ngx_http_script.c
-@@ -695,7 +695,8 @@ ngx_http_script_add_copy_code(ngx_http_script_compile_t *sc, ngx_str_t *value,
-         return NGX_ERROR;
-     }
- 
--    code->code = (ngx_http_script_code_pt) ngx_http_script_copy_len_code;
-+    code->code = (ngx_http_script_code_pt) (void *)
-+                                                 ngx_http_script_copy_len_code;
-     code->len = len;
- 
-     size = (sizeof(ngx_http_script_copy_code_t) + len + sizeof(uintptr_t) - 1)
-@@ -784,7 +785,8 @@ ngx_http_script_add_var_code(ngx_http_script_compile_t *sc, ngx_str_t *name)
-         return NGX_ERROR;
-     }
- 
--    code->code = (ngx_http_script_code_pt) ngx_http_script_copy_var_len_code;
-+    code->code = (ngx_http_script_code_pt) (void *)
-+                                             ngx_http_script_copy_var_len_code;
-     code->index = (uintptr_t) index;
- 
-     code = ngx_http_script_add_code(*sc->values,
-@@ -1178,8 +1180,8 @@ ngx_http_script_add_capture_code(ngx_http_script_compile_t *sc, ngx_uint_t n)
-         return NGX_ERROR;
-     }
- 
--    code->code = (ngx_http_script_code_pt)
--                      ngx_http_script_copy_capture_len_code;
-+    code->code = (ngx_http_script_code_pt) (void *)
-+                                         ngx_http_script_copy_capture_len_code;
-     code->n = 2 * n;
- 
- 
-@@ -1293,7 +1295,8 @@ ngx_http_script_add_full_name_code(ngx_http_script_compile_t *sc)
-         return NGX_ERROR;
-     }
- 
--    code->code = (ngx_http_script_code_pt) ngx_http_script_full_name_len_code;
-+    code->code = (ngx_http_script_code_pt) (void *)
-+                                            ngx_http_script_full_name_len_code;
-     code->conf_prefix = sc->conf_prefix;
- 
-     code = ngx_http_script_add_code(*sc->values,
-diff --git a/src/stream/ngx_stream_script.c b/src/stream/ngx_stream_script.c
-index aa555ca2c1..b00e7086f7 100644
---- a/src/stream/ngx_stream_script.c
-+++ b/src/stream/ngx_stream_script.c
-@@ -587,7 +587,8 @@ ngx_stream_script_add_copy_code(ngx_stream_script_compile_t *sc,
-         return NGX_ERROR;
-     }
- 
--    code->code = (ngx_stream_script_code_pt) ngx_stream_script_copy_len_code;
-+    code->code = (ngx_stream_script_code_pt) (void *)
-+                                               ngx_stream_script_copy_len_code;
-     code->len = len;
- 
-     size = (sizeof(ngx_stream_script_copy_code_t) + len + sizeof(uintptr_t) - 1)
-@@ -677,8 +678,8 @@ ngx_stream_script_add_var_code(ngx_stream_script_compile_t *sc, ngx_str_t *name)
-         return NGX_ERROR;
-     }
- 
--    code->code = (ngx_stream_script_code_pt)
--                      ngx_stream_script_copy_var_len_code;
-+    code->code = (ngx_stream_script_code_pt) (void *)
-+                                           ngx_stream_script_copy_var_len_code;
-     code->index = (uintptr_t) index;
- 
-     code = ngx_stream_script_add_code(*sc->values,
-@@ -767,8 +768,8 @@ ngx_stream_script_add_capture_code(ngx_stream_script_compile_t *sc,
-         return NGX_ERROR;
-     }
- 
--    code->code = (ngx_stream_script_code_pt)
--                      ngx_stream_script_copy_capture_len_code;
-+    code->code = (ngx_stream_script_code_pt) (void *)
-+                                       ngx_stream_script_copy_capture_len_code;
-     code->n = 2 * n;
- 
- 
-@@ -859,7 +860,7 @@ ngx_stream_script_add_full_name_code(ngx_stream_script_compile_t *sc)
-         return NGX_ERROR;
-     }
- 
--    code->code = (ngx_stream_script_code_pt)
-+    code->code = (ngx_stream_script_code_pt) (void *)
-                                           ngx_stream_script_full_name_len_code;
-     code->conf_prefix = sc->conf_prefix;
- 

scripts/build_ngx_pagespeed.sh

@@ -1,824 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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]
-
-Options:
-  -v, --ngx-pagespeed-version <ngx_pagespeed version>
-      What version of ngx_pagespeed to build.  Valid options include:
-      * latest-beta
-      * 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.
-
-  -n, --nginx-version <nginx version>
-      What version of nginx to build.  If not set, this script only prepares the
-      ngx_pagespeed module, and expects you to handle including it when you
-      build nginx.
-
-      If you pass in 'latest' then this script scrapes the nginx download page
-      and attempts to determine the latest version automatically.
-
-  -m, --dynamic-module
-      Build ngx_pagespeed as a dynamic module.
-
-  -b, --builddir <directory>
-      Where to build.  Defaults to \$HOME.
-
-  -p, --no-deps-check
-      By default, this script checks for the packages it depends on and tries to
-      install them.  If you have installed dependencies from source or are on a
-      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.
-
-  -h, --help
-      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 "$@"
-
-  # 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.
-  echo >&2
-  echo "For usage information, run this script with --help" >&2
-  exit 1
-}
-
-
-function status() {
-  echo_color "$GREEN" "$@"
-}
-
-# Intended to be called as:
-#   bash <(curl dl.google.com/.../build_ngx_pagespeed.sh) <args>
-
-# If we set -e or -u then users of this script will see it silently exit on
-# failure.  Instead we need to check the exit status of each command manually.
-# 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
-  else
-    if ! "$@"; then
-      error "Failure running '$@', exiting."
-      exit 1
-    fi
-  fi
-}
-
-function redhat_is_installed() {
-  local package_name="$1"
-  rpm -qa $package_name | grep -q .
-}
-
-function debian_is_installed() {
-  local package_name="$1"
-  dpkg -l $package_name | grep ^ii | grep -q .
-}
-
-function version_sort() {
-  # We'd rather use sort -V, but that's not available on Centos 5.  This works
-  # for versions in the form A.B.C.D or shorter, which is enough for our use.
-  sort -t '.' -k 1,1 -k 2,2 -k 3,3 -k 4,4 -g
-}
-
-# Compare two numeric versions in the form "A.B.C".  Works with version numbers
-# having up to four components, since that's enough to handle both nginx (3) and
-# ngx_pagespeed (4).
-function version_older_than() {
-  local test_version="$1"
-  local compare_to="$2"
-
-  local older_version=$(echo $@ | tr ' ' '\n' | version_sort | head -n 1)
-  test "$older_version" != "$compare_to"
-}
-
-function determine_latest_nginx_version() {
-  # Scrape nginx's download page to try to find the most recent nginx version.
-
-  nginx_download_url="https://nginx.org/en/download.html"
-  function report_error() {
-    fail "
-Couldn't automatically determine the latest nginx version: failed to $@
-$nginx_download_url"
-  }
-
-  nginx_download_page=$(curl -sS --fail "$nginx_download_url") || \
-    report_error "download"
-
-  download_refs=$(echo "$nginx_download_page" | \
-    grep -o '/download/nginx-[0-9.]*[.]tar[.]gz') || \
-    report_error "parse"
-
-  versions_available=$(echo "$download_refs" | \
-    sed -e 's~^/download/nginx-~~' -e 's~\.tar\.gz$~~') || \
-    report_error "extract versions from"
-
-  latest_version=$(echo "$versions_available" | version_sort | tail -n 1) || \
-    report_error "determine latest version from"
-
-  if version_older_than "$latest_version" "1.11.4"; then
-    fail "
-Expected the latest version of nginx to be at least 1.11.4 but found
-$latest_version on $nginx_download_url"
-  fi
-
-  echo "$latest_version"
-}
-
-# Usage:
-#  install_dependencies install_pkg_cmd is_pkg_installed_cmd dep1 dep2 ...
-#
-# install_pkg_cmd is a command to install a dependency
-# is_pkg_installed_cmd is a command that returns true if the dependency is
-#   already installed
-# each dependency is a package name
-function install_dependencies() {
-  local install_pkg_cmd="$1"
-  local is_pkg_installed_cmd="$2"
-  shift 2
-
-  local missing_dependencies=""
-
-  for package_name in "$@"; do
-    if ! $is_pkg_installed_cmd $package_name; then
-      missing_dependencies+="$package_name "
-    fi
-  done
-  if [ -n "$missing_dependencies" ]; then
-    status "Detected that we're missing the following depencencies:"
-    echo "  $missing_dependencies"
-    status "Installing them:"
-    run sudo $install_pkg_cmd $missing_dependencies
-  fi
-}
-
-function gcc_too_old() {
-  # We need gcc >= 4.8
-  local gcc_major_version=$(gcc -dumpversion | awk -F. '{print $1}')
-  if [ "$gcc_major_version" -lt 4 ]; then
-    return 0  # too old
-  elif [ "$gcc_major_version" -gt 4 ]; then
-    return 1  # plenty new
-  fi
-  # It's gcc 4.x, check if x >= 8:
-  local gcc_minor_version=$(gcc -dumpversion | awk -F. '{print $2}')
-  test "$gcc_minor_version" -lt 8
-}
-
-function continue_or_exit() {
-  if "$ASSUME_YES"; then
-    return
-  fi
-
-  local prompt="$1"
-  echo_color "$YELLOW" -n "$prompt"
-  read -p " [Y/n] " yn
-  if [[ "$yn" == N* || "$yn" == n* ]]; then
-    echo "Cancelled."
-    exit 0
-  fi
-}
-
-# If a string is very simple we don't need to quote it.  But we should quote
-# everything else to be safe.
-function needs_quoting() {
-  echo "$@" | grep -q '[^a-zA-Z0-9./_=-]'
-}
-
-function escape_for_quotes() {
-  echo "$@" | sed -e 's~\\~\\\\~g' -e "s~'~\\\\'~g"
-}
-
-function quote_arguments() {
-  local argument_str=""
-  for argument in "$@"; do
-    if [ -n "$argument_str" ]; then
-      argument_str+=" "
-    fi
-    if needs_quoting "$argument"; then
-      argument="'$(escape_for_quotes "$argument")'"
-    fi
-    argument_str+="$argument"
-  done
-  echo "$argument_str"
-}
-
-function build_ngx_pagespeed() {
-  getopt --test
-  if [ "$?" != 4 ]; then
-    # Even Centos 5 and Ubuntu 10 LTS have new-style getopt, so I don't expect
-    # this to be hit in practice on systems that are actually able to run
-    # PageSpeed.
-    fail "Your version of getopt is too old.  Exiting with no changes made."
-  fi
-
-  opts=$(getopt -o v:n:mb:pslt:ya:dh \
-    --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 \
-    -n "$(basename "$0")" -- "$@")
-  if [ $? != 0 ]; then
-    usage
-    exit 1
-  fi
-  eval set -- "$opts"
-
-  NPS_VERSION="DEFAULT"
-  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
-    case "$1" in
-      -v | --ngx-pagespeed-version) shift
-        NPS_VERSION="$1"
-        shift
-        ;;
-      -n | --nginx-version) shift
-        NGINX_VERSION="$1"
-        shift
-        ;;
-      -m | --dynamic-module) shift
-        DYNAMIC_MODULE=true
-        ;;
-      -b | --builddir) shift
-        BUILDDIR="$1"
-        shift
-        ;;
-      -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"
-        ;;
-      -h | --help) shift
-        usage
-        exit 0
-        ;;
-      --) shift
-        break
-        ;;
-      *)
-        echo "Invalid argument: $1"
-        usage
-        exit 1
-        ;;
-    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.
-    NGINX_VERSION=$(determine_latest_nginx_version) || exit 1
-  fi
-
-  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
-      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."
-    fi
-
-    if [ ! -z "NGINX_VERSION" ]; then
-      if version_older_than "$NGINX_VERSION" "1.9.13"; then
-        fail "
-You're trying to build nginx $NGINX_VERSION as a dynamic module but nginx didn't
-add support for dynamic modules in a way compatible with ngx_pagespeed until
-1.9.13."
-      fi
-    fi
-  fi
-
-  if "$DRYRUN"; then
-    TEMPDIR="/tmp/output-of-mktemp"
-  else
-    TEMPDIR=$(mktemp -d)
-    function cleanup_tempdir {
-      rm -rf "$TEMPDIR"
-    }
-    trap cleanup_tempdir EXIT
-  fi
-
-  extra_flags=()
-  # Now make sure our dependencies are installed.
-  if "$DO_DEPS_CHECK"; then
-    INSTALL_FLAGS=""
-    
-    if "$ASSUME_YES"; then
-      INSTALL_FLAGS="-y"
-    fi
-  
-    if [ -f /etc/debian_version ]; then
-      status "Detected debian-based distro."
-
-      install_dependencies "apt-get install ${INSTALL_FLAGS}" debian_is_installed \
-        build-essential zlib1g-dev libpcre3 libpcre3-dev unzip wget uuid-dev
-
-      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."
-          run sudo apt-get install ${INSTALL_FLAGS} gcc-mozilla
-        fi
-
-        extra_flags=("--with-cc=/usr/lib/gcc-mozilla/bin/gcc" \
-                     "--with-ld-opt=-static-libstdc++")
-      fi
-
-    elif [ -f /etc/redhat-release ]; then
-      status "Detected redhat-based distro."
-
-      install_dependencies "yum install ${INSTALL_FLAGS}" redhat_is_installed \
-        gcc-c++ pcre-devel zlib-devel make unzip wget libuuid-devel
-      if gcc_too_old; then
-        if [ ! -e /opt/rh/devtoolset-2/root/usr/bin/gcc ]; then
-          redhat_major_version=$(
-            cat /etc/redhat-release | grep -o -E '[0-9]+' | head -n 1)
-          if [ "$redhat_major_version" == 5 ]; then
-            slc_version=5
-          elif [ "$redhat_major_version" == 6 ]; then
-            slc_version=6
-          else
-            fail "
-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."
-          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"
-          run sudo wget "$slc_key" -O "$slc_key_out"
-          run sudo rpm --import "$slc_key_out"
-
-          repo_fname="/etc/yum.repos.d/slc${slc_version}-devtoolset.repo"
-          if [ -e "$repo_fname" ]; then
-            fail "Expected $repo_fname not to exist; aborting."
-          fi
-
-          repo_url="https://linux.web.cern.ch/linux/scientific${slc_version}/"
-          repo_url+="/docs/repository/cern/devtoolset/"
-          repo_url+="slc${slc_version}-devtoolset.repo"
-          run sudo wget -O "$repo_fname" "$repo_url"
-          run sudo yum install ${INSTALL_FLAGS} devtoolset-2-gcc-c++ devtoolset-2-binutils
-        fi
-        extra_flags=("--with-cc=/opt/rh/devtoolset-2/root/usr/bin/gcc")
-      fi
-    else
-      fail "
-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."
-  else
-    status "Not checking whether operating system dependencies are installed."
-  fi
-
-  function delete_if_already_exists() {
-    if "$DRYRUN"; then return; fi
-
-    local directory="$1"
-    if [ -d "$directory" ]; then
-      if [ ${#directory} -lt 8 ]; then
-        fail "
-Not deleting $directory; name is suspiciously short.  Something is wrong."
-      fi
-
-      continue_or_exit "OK to delete $directory?"
-      run rm -rf "$directory"
-    fi
-  }
-
-  # 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
-  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"
-    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_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
-    fi
-  else
-    nps_baseurl="https://github.com/apache/incubator-pagespeed-ngx/archive"
-    nps_downloaded="$TEMPDIR/$nps_downloaded_fname.zip"
-    status "Downloading ngx_pagespeed..."
-    run wget "$nps_baseurl/$tag_name.zip" -O "$nps_downloaded"
-    # Read the directory name from the zip, the first line is expected to have it.
-    nps_module_dir=$(unzip -qql "$nps_downloaded" | head -n1 | tr -s ' ' | cut -d' ' -f5-)
-    nps_module_dir="$BUILDDIR/${nps_module_dir::-1}"
-    delete_if_already_exists "$nps_module_dir"
-    status "Extracting ngx_pagespeed..."
-    run unzip -q "$nps_downloaded" -d "$BUILDDIR"
-    run cd "$nps_module_dir"
-  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
-      if "$DO_DEPS_CHECK"; then
-        skip_deps_arg=""
-      else
-        skip_deps_arg="--skip_deps"
-      fi
-
-      run install/build_psol.sh --skip_tests --skip_packaging "$skip_deps_arg"
-      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
-
-  if "$DYNAMIC_MODULE"; then
-    add_module="--add-dynamic-module=$nps_module_dir"
-  else
-    add_module="--add-module=$nps_module_dir"
-  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 [ ${#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'."
-    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"
-      echo "already-built nginx you're going to need to rebuild your nginx with"
-      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
-
-    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[@]}"
-
-    if ! "$DEVEL"; then
-      continue_or_exit "Build nginx?"
-    fi
-    run make
-
-    if "$DEVEL"; then
-      run 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
-      echo "To rebuild after changes:"
-      echo "  scripts/rebuild.sh"
-    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"
-    fi
-  fi
-  if "$DRYRUN"; then
-    echo_color "$YELLOW" "[this was a dry run; your system is unchanged]"
-  fi
-}
-
-# Start running things from a call at the end so if this script is executed
-# after a partial download it doesn't do anything.
-build_ngx_pagespeed "$@"

scripts/format_binary_url.sh

@@ -1,40 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
-
-if [ $# -ne 1 ]; then
-  echo "Usage: $(basename $0) <url_file>" >&2
-  exit 1
-fi
-
-url_file=$1
-
-if [ ! -e "$url_file" ]; then
-  echo "Url file '$url_file' missing!" >&2
-fi
-
-# The size names must match install/build_psol.sh in mod_pagespeed
-if [ "$(uname -m)" = x86_64 ]; then
-  bit_size_name=x64
-else
-  bit_size_name=ia32
-fi
-
-sed -e 's/$BIT_SIZE_NAME/'$bit_size_name'/g' $url_file

scripts/pagespeed_libraries_generator.sh

@@ -1,34 +1,21 @@
 #!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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/apache/incubator-pagespeed-ngx/issues/532
+# Inspired by https://github.com/pagespeed/ngx_pagespeed/issues/532
 #
 # Usage:
 #   scripts/pagespeed_libraries_generator.sh > pagespeed_libraries.conf
 #
 # Then have nginx include that configuration file and enable the filter
 # canonicalize_javascript_libraries.
+#
+# Author: vid@zippykid.com (Vid Luther)
+#         jefftk@google.com (Jeff Kaufman)
 
-URL="https://github.com/apache/incubator-pagespeed-mod/raw/master/"
+URL="https://modpagespeed.googlecode.com/svn/trunk/src/"
 URL+="net/instaweb/genfiles/conf/pagespeed_libraries.conf"
-curl -L -s -S "$URL" \
+curl -s "$URL" \
     | grep ModPagespeedLibrary \
     | while read library size hash url ; do
   echo "  pagespeed Library $size $hash $url;"

scripts/prepare_psol.sh

@@ -0,0 +1,94 @@
+#!/bin/bash
+#
+# Copyright 2012 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.
+#
+# Author: jefftk@google.com (Jeff Kaufman)
+#
+# Usage:
+#   scripts/prepare_psol.sh /path/to/mod_pagespeed/src
+#
+# Creates a directory psol/ and copies headers and a few source files from a
+# depot_tools (glient) checkout into psol/include.  Along with creating
+# binaries, this is a step in preparing psol.tar.gz for distribution.
+#
+
+set -u  # check for undefined variables
+set -e  # exit on failed commands
+
+if [ "$(basename "$PWD")" != "ngx_pagespeed" ] ; then
+  echo "$(basename $0) must be invoked from the ngx_pagespeed directory"
+  exit 1
+fi
+
+if [ $# -ne 1 ] ; then
+  echo "Usage: $(basename $0) /path/to/mod_pagespeed/src"
+  exit 1
+fi
+
+MOD_PAGESPEED_SRC="$1"
+
+if [ "$(basename "$(dirname "$MOD_PAGESPEED_SRC")")/$( \
+        basename "$MOD_PAGESPEED_SRC")" != "mod_pagespeed/src" ] ; then
+  echo "Usage: $(basename $0) /path/to/mod_pagespeed/src"
+  exit 1
+fi
+
+if [ -e psol ] ; then
+  echo "A psol/ directory already exists.  Move it somewhere else and rerun."
+  exit 1
+fi
+mkdir psol/
+# Copy over the .h files, plus a few selected .cc and .c files.
+rsync -arvz "$MOD_PAGESPEED_SRC/" "psol/include/" --prune-empty-dirs \
+  --exclude=".svn" \
+  --exclude=".git" \
+  --include='*.h' \
+  --include='*/' \
+  --include="apr_thread_compatible_pool.cc" \
+  --include="serf_url_async_fetcher.cc" \
+  --include="apr_mem_cache.cc" \
+  --include="key_value_codec.cc" \
+  --include="apr_memcache2.c" \
+  --include="loopback_route_fetcher.cc" \
+  --include="add_headers_fetcher.cc" \
+  --include="console_css_out.cc" \
+  --include="console_out.cc" \
+  --include="dense_hash_map" \
+  --include="dense_hash_set" \
+  --include="sparse_hash_map" \
+  --include="sparse_hash_set" \
+  --include="sparsetable" \
+  --include="mod_pagespeed_console_out.cc" \
+  --include="mod_pagespeed_console_css_out.cc" \
+  --include="mod_pagespeed_console_html_out.cc" \
+  --exclude='*'
+mkdir -p psol/lib/Debug/linux/ia32
+mkdir -p psol/lib/Debug/linux/x64
+mkdir -p psol/lib/Release/linux/ia32
+mkdir -p psol/lib/Release/linux/x64
+
+# Log that we did this.
+SVN_REVISION="$(svn info $MOD_PAGESPEED_SRC | grep Revision | awk '{print $2}')"
+SVN_TAG="$(svn info $MOD_PAGESPEED_SRC | grep URL |  awk -F/ '{print $(NF-1)}')"
+
+DATE="$(date +%F)"
+echo "${DATE}: Copied from mod_pagespeed ${SVN_TAG}@r${SVN_REVISION} ($USER)" \
+  >> psol/include_history.txt
+
+echo
+echo "Output is in psol/include.  Now put binaries in psol/lib following"
+echo "https://github.com/pagespeed/ngx_pagespeed/wiki/Building-Release-Binaries"
+echo "and then you can distribute PSOL."
+

scripts/rebuild.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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/log_message_handler.cc

@@ -1,23 +1,20 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-
-
+// Copyright 2010 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.
+//
+// Author: jmarantz@google.com (Joshua Marantz)
+// Author: sligocki@google.com (Shawn Ligocki)
+// Author: jefftk@google.com (Jeff Kaufman)
 
 // TODO(jefftk): share more of this code with apache's log_message_handler
 
@@ -32,7 +29,7 @@
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
 #include "net/instaweb/public/version.h"
-#include "pagespeed/kernel/base/string_util.h"
+#include "net/instaweb/util/public/string_util.h"
 
 // Make sure we don't attempt to use LOG macros here, since doing so
 // would cause us to go into an infinite log loop.
@@ -41,7 +38,7 @@
 
 namespace {
 
-ngx_log_t* ngx_log = NULL;
+ngx_log_t* log = NULL;
 
 ngx_uint_t GetNgxLogLevel(int severity) {
   switch (severity) {
@@ -81,7 +78,7 @@ bool LogMessageHandler(int severity, const char* file, int line,
     message.resize(last_msg_character_index);
   }
 
-  ngx_log_error(this_log_level, ngx_log, 0, "[ngx_pagespeed %s] %s",
+  ngx_log_error(this_log_level, log, 0, "[ngx_pagespeed %s] %s",
                 net_instaweb::kModPagespeedVersion,
                 message.c_str());
 
@@ -102,12 +99,12 @@ namespace log_message_handler {
 
 
 void Install(ngx_log_t* log_in) {
-  ngx_log = log_in;
+  log = log_in;
   logging::SetLogMessageHandler(&LogMessageHandler);
 
   // All VLOG(2) and higher will be displayed as DEBUG logs if the nginx log
   // level is DEBUG.
-  if (ngx_log->log_level >= NGX_LOG_DEBUG) {
+  if (log->log_level >= NGX_LOG_DEBUG) {
     logging::SetMinLogLevel(-2);
   }
 }

src/log_message_handler.h

@@ -1,23 +1,20 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-
-
+// Copyright 2010 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.
+//
+// Author: jmarantz@google.com (Joshua Marantz)
+// Author: sligocki@google.com (Shawn Ligocki)
+// Author: jefftk@google.com (Jeff Kaufman)
 
 #ifndef LOG_MESSAGE_HANDLER_H_
 #define LOG_MESSAGE_HANDLER_H_

src/ngx_base_fetch.cc

@@ -1,206 +1,51 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2012 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.
  */
 
-
-#include "ngx_pagespeed.h"  // Must come first, see comments in CollectHeaders.
-
-#include <unistd.h> //for usleep
+// Author: jefftk@google.com (Jeff Kaufman)
 
 #include "ngx_base_fetch.h"
-#include "ngx_event_connection.h"
 #include "ngx_list_iterator.h"
 
-#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_options.h"
+#include "ngx_pagespeed.h"
+
+#include "net/instaweb/http/public/response_headers.h"
 #include "net/instaweb/rewriter/public/rewrite_stats.h"
-#include "pagespeed/kernel/base/google_message_handler.h"
-#include "pagespeed/kernel/base/message_handler.h"
-#include "pagespeed/kernel/base/posix_timer.h"
-#include "pagespeed/kernel/http/response_headers.h"
+#include "net/instaweb/util/public/google_message_handler.h"
+#include "net/instaweb/util/public/message_handler.h"
 
 namespace net_instaweb {
 
-const char kHeadersComplete = 'H';
-const char kFlush = 'F';
-const char kDone = 'D';
-
-NgxEventConnection* NgxBaseFetch::event_connection = NULL;
-int NgxBaseFetch::active_base_fetches = 0;
-
-NgxBaseFetch::NgxBaseFetch(StringPiece url,
-                           ngx_http_request_t* r,
+NgxBaseFetch::NgxBaseFetch(ngx_http_request_t* r, int pipe_fd,
                            NgxServerContext* server_context,
                            const RequestContextPtr& request_ctx,
-                           PreserveCachingHeaders preserve_caching_headers,
-                           NgxBaseFetchType base_fetch_type,
-                           const RewriteOptions* options)
+                           PreserveCachingHeaders preserve_caching_headers)
     : AsyncFetch(request_ctx),
-      url_(url.data(), url.size()),
       request_(r),
       server_context_(server_context),
-      options_(options),
-      need_flush_(false),
       done_called_(false),
       last_buf_sent_(false),
+      pipe_fd_(pipe_fd),
       references_(2),
-      base_fetch_type_(base_fetch_type),
-      preserve_caching_headers_(preserve_caching_headers),
-      detached_(false),
-      suppress_(false) {
+      ipro_lookup_(false),
+      preserve_caching_headers_(preserve_caching_headers) {
   if (pthread_mutex_init(&mutex_, NULL)) CHECK(0);
-  __sync_add_and_fetch(&NgxBaseFetch::active_base_fetches, 1);
 }
 
 NgxBaseFetch::~NgxBaseFetch() {
   pthread_mutex_destroy(&mutex_);
-  __sync_add_and_fetch(&NgxBaseFetch::active_base_fetches, -1);
-}
-
-bool NgxBaseFetch::Initialize(ngx_cycle_t* cycle) {
-  CHECK(event_connection == NULL) << "event connection already set";
-  event_connection = new NgxEventConnection(ReadCallback);
-  return event_connection->Init(cycle);
-}
-
-void NgxBaseFetch::Terminate() {
-  if (event_connection != NULL) {
-    GoogleMessageHandler handler;
-    PosixTimer timer;
-    int64 timeout_us = Timer::kSecondUs * 30;
-    int64 end_us = timer.NowUs() + timeout_us;
-    static unsigned int sleep_microseconds = 100;
-
-    handler.Message(
-        kInfo,"NgxBaseFetch::Terminate rounding up %d active base fetches.",
-        NgxBaseFetch::active_base_fetches);
-
-    // Try to continue processing and get the active base fetch count to 0
-    // until the timeout expires.
-    // TODO(oschaaf): This needs more work.
-    while (NgxBaseFetch::active_base_fetches > 0 && end_us > timer.NowUs()) {
-      event_connection->Drain();
-      usleep(sleep_microseconds);
-    }
-
-    if (NgxBaseFetch::active_base_fetches != 0) {
-      handler.Message(
-          kWarning,"NgxBaseFetch::Terminate timed out with %d active base fetches.",
-          NgxBaseFetch::active_base_fetches);
-    }
-
-    // Close down the named pipe.
-    event_connection->Shutdown();
-    delete event_connection;
-    event_connection = NULL;
-  }
-}
-
-const char* BaseFetchTypeToCStr(NgxBaseFetchType type) {
-  switch(type) {
-    case kPageSpeedResource:
-      return "ps resource";
-    case kHtmlTransform:
-      return "html transform";
-    case kAdminPage:
-      return "admin page";
-    case kIproLookup:
-      return "ipro lookup";
-    case kPageSpeedProxy:
-      return "pagespeed proxy";
-  }
-  CHECK(false);
-  return "can't get here";
-}
-
-// TODO(oschaaf): replace the ngx_log_error with VLOGS or pass in a
-// MessageHandler and use that.
-void NgxBaseFetch::ReadCallback(const ps_event_data& data) {
-  NgxBaseFetch* base_fetch = reinterpret_cast<NgxBaseFetch*>(data.sender);
-  ngx_http_request_t* r = base_fetch->request();
-  bool detached = base_fetch->detached();
-#if (NGX_DEBUG)  // `type` is unused if NGX_DEBUG isn't set, needed for -Werror.
-  const char* type = BaseFetchTypeToCStr(base_fetch->base_fetch_type_);
-#endif
-  int refcount = base_fetch->DecrementRefCount();
-
-#if (NGX_DEBUG)
-  ngx_log_error(NGX_LOG_DEBUG, ngx_cycle->log, 0,
-     "pagespeed [%p] event: %c. bf:%p (%s) - refcnt:%d - det: %c", r,
-     data.type, base_fetch, type, refcount, detached ? 'Y': 'N');
-#endif
-
-  // If we ended up destructing the base fetch, or the request context is
-  // detached, skip this event.
-  if (refcount == 0 || detached) {
-    return;
-  }
-
-  ps_request_ctx_t* ctx = ps_get_request_context(r);
-
-  // If our request context was zeroed, skip this event.
-  // See https://github.com/apache/incubator-pagespeed-ngx/issues/1081
-  if (ctx == NULL) {
-    // Should not happen normally, when it does this message will cause our
-    // system tests to fail.
-    ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0,
-        "pagespeed [%p] skipping event: request context gone", r);
-    return;
-  }
-
-  // Normally we expect the sender to equal the active NgxBaseFetch instance.
-  DCHECK(data.sender == ctx->base_fetch);
-
-  // If someone changed our request context or NgxBaseFetch, skip processing.
-  if (data.sender != ctx->base_fetch) {
-      ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, 0,
-          "pagespeed [%p] skipping event: event originating from disassociated"
-          " NgxBaseFetch instance.", r);
-      return;
-  }
-
-  int rc;
-  bool run_posted = true;
-  // If we are unlucky enough to have our connection finalized mid-ipro-lookup,
-  // we must enter a different flow. Also see ps_in_place_check_header_filter().
-  if ((ctx->base_fetch->base_fetch_type_ != kIproLookup)
-      && r->connection->error) {
-    ngx_log_error(NGX_LOG_DEBUG, ngx_cycle->log, 0,
-      "pagespeed [%p] request already finalized %d", r, r->count);
-    rc = NGX_ERROR;
-    run_posted = false;
-  } else {
-    rc = ps_base_fetch::ps_base_fetch_handler(r);
-  }
-
-#if (NGX_DEBUG)
-  ngx_log_error(NGX_LOG_DEBUG, ngx_cycle->log, 0,
-                "pagespeed [%p] ps_base_fetch_handler() returned %d for %c",
-                r, rc, data.type);
-#endif
-
-  ngx_connection_t* c = r->connection;
-  ngx_http_finalize_request(r, rc);
-
-  if (run_posted) {
-    // See http://forum.nginx.org/read.php?2,253006,253061
-    ngx_http_run_posted_requests(c);
-  }
 }
 
 void NgxBaseFetch::Lock() {
@@ -230,11 +75,8 @@ ngx_int_t NgxBaseFetch::CopyBufferToNginx(ngx_chain_t** link_ptr) {
     return NGX_AGAIN;
   }
 
-  int rc = string_piece_to_buffer_chain(request_->pool, buffer_, link_ptr,
-                                        done_called_ /* send_last_buf */,
-                                        need_flush_);
-  need_flush_ = false;
-
+  int rc = string_piece_to_buffer_chain(
+      request_->pool, buffer_, link_ptr, done_called_ /* send_last_buf */);
   if (rc != NGX_OK) {
     return rc;
   }
@@ -262,13 +104,6 @@ ngx_int_t NgxBaseFetch::CollectAccumulatedWrites(ngx_chain_t** link_ptr) {
 }
 
 ngx_int_t NgxBaseFetch::CollectHeaders(ngx_http_headers_out_t* headers_out) {
-  // nginx defines _FILE_OFFSET_BITS to 64, which changes the size of off_t.
-  // If a standard header is accidentally included before the nginx header,
-  // on a 32-bit system off_t will be 4 bytes and we don't assign all the
-  // bits of content_length_n. Sanity check that did not happen.
-  // This could use static_assert, but this file is not built with --std=c++11.
-  bool sanity_check_off_t[sizeof(off_t) == 8 ? 1 : -1] __attribute__ ((unused));
-
   const ResponseHeaders* pagespeed_headers = response_headers();
 
   if (content_length_known()) {
@@ -280,19 +115,21 @@ ngx_int_t NgxBaseFetch::CollectHeaders(ngx_http_headers_out_t* headers_out) {
                                       preserve_caching_headers_);
 }
 
-void NgxBaseFetch::RequestCollection(char type) {
-  if (suppress_) {
-    return;
-  }
+void NgxBaseFetch::RequestCollection() {
+  int rc;
+  char c = 'A';  // What byte we write is arbitrary.
+  while (true) {
+    rc = write(pipe_fd_, &c, 1);
+    if (rc == 1) {
+      break;
+    } else if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) {
+      // TODO(jefftk): is this rare enough that spinning isn't a problem?  Could
+      // we get into a case where the pipe fills up and we spin forever?
 
-  // We must optimistically increment the refcount, and decrement it
-  // when we conclude we failed. If we only increment on a successfull write,
-  // there's a small chance that between writing and adding to the refcount
-  // both pagespeed and nginx will release their refcount -- destructing
-  // this NgxBaseFetch instance.
-  IncrementRefCount();
-  if (!event_connection->WriteEvent(type, this)) {
-    DecrementRefCount();
+    } else {
+      perror("NgxBaseFetch::RequestCollection");
+      break;
+    }
   }
 }
 
@@ -300,63 +137,49 @@ void NgxBaseFetch::HandleHeadersComplete() {
   int status_code = response_headers()->status_code();
   bool status_ok = (status_code != 0) && (status_code < 400);
 
-  if ((base_fetch_type_ != kIproLookup) || status_ok) {
+  if (!ipro_lookup_ || status_ok) {
     // If this is a 404 response we need to count it in the stats.
     if (response_headers()->status_code() == HttpStatus::kNotFound) {
       server_context_->rewrite_stats()->resource_404_count()->Add(1);
     }
   }
 
-  RequestCollection(kHeadersComplete);  // Headers available.
-
   // For the IPRO lookup, supress notification of the nginx side here.
-  // If we send both the headerscomplete event and the one from done, nasty
-  // stuff will happen if we loose the race with with the nginx side destructing
-  // this base fetch instance.
-  if (base_fetch_type_ == kIproLookup && !status_ok) {
-    suppress_ = true;
+  // If we send both this event and the one from done, nasty stuff will happen
+  // if we loose the race with with the nginx side destructing this base fetch
+  // instance (and thereby clearing the byte and its pending extraneous event.
+  if (!ipro_lookup_) {
+    RequestCollection();  // Headers available.
   }
 }
 
 bool NgxBaseFetch::HandleFlush(MessageHandler* handler) {
-  Lock();
-  need_flush_ = true;
-  Unlock();
-  RequestCollection(kFlush);  // A new part of the response body is available
+  RequestCollection();  // A new part of the response body is available.
   return true;
 }
 
-int NgxBaseFetch::DecrementRefCount() {
-  return DecrefAndDeleteIfUnreferenced();
+void NgxBaseFetch::Release() {
+  DecrefAndDeleteIfUnreferenced();
 }
 
-int NgxBaseFetch::IncrementRefCount() {
-  return __sync_add_and_fetch(&references_, 1);
-}
-
-int NgxBaseFetch::DecrefAndDeleteIfUnreferenced() {
+void NgxBaseFetch::DecrefAndDeleteIfUnreferenced() {
   // Creates a full memory barrier.
-  int r = __sync_add_and_fetch(&references_, -1);
-  if (r == 0) {
+  if (__sync_add_and_fetch(&references_, -1) == 0) {
     delete this;
   }
-  return r;
 }
 
 void NgxBaseFetch::HandleDone(bool success) {
   // TODO(jefftk): it's possible that instead of locking here we can just modify
   // CopyBufferToNginx to only read done_called_ once.
-  CHECK(!done_called_) << "Done already called!";
   Lock();
   done_called_ = true;
   Unlock();
-  RequestCollection(kDone);
+
+  close(pipe_fd_);  // Indicates to nginx that we're done with the rewrite.
+  pipe_fd_ = -1;
+
   DecrefAndDeleteIfUnreferenced();
 }
 
-bool NgxBaseFetch::IsCachedResultValid(const ResponseHeaders& headers) {
-  return OptionsAwareHTTPCacheCallback::IsCacheValid(
-      url_, *options_, request_context(), headers);
-}
-
 }  // namespace net_instaweb

src/ngx_base_fetch.h

@@ -1,54 +1,38 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2012 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.
  */
 
-
+// Author: jefftk@google.com (Jeff Kaufman)
 //
 // Collects output from pagespeed and buffers it until nginx asks for it.
-// Notifies nginx via NgxEventConnection to call ReadCallback() when
-// the headers are computed, when a flush should be performed, and when done.
+// Notifies nginx via pipe to call CollectAccumulatedWrites() on flush.
 //
 //  - nginx creates a base fetch and passes it to a new proxy fetch.
 //  - The proxy fetch manages rewriting and thread complexity, and through
 //    several chained steps passes rewritten html to HandleWrite().
 //  - Written data is buffered.
-//  - When HandleHeadersComplete(), HandleFlush(), or HandleDone() is called by
-//    PSOL, events are written to NgxEventConnection which will end up being
-//    handled by ReadCallback() on nginx's thread.
-//    When applicable, request processing will be continued via a call to
-//    ps_base_fetch_handler().
-//  - ps_base_fetch_handler() will pull the header and body bytes from PSOL
-//    via CollectAccumulatedWrites() and write those to the module's output.
+//  - When Flush() is called the base fetch writes a byte to a pipe nginx is
+//    watching so nginx knows to call CollectAccumulatedWrites() to pick up the
+//    rewritten html.
+//  - When Done() is called the base fetch closes the pipe, which tells nginx to
+//    make a final call to CollectAccumulatedWrites().
 //
-// This class is referred to in three places: the proxy fetch, nginx's request,
-// and pending events written to the associated NgxEventConnection. It must stay
-// alive until the proxy fetch and nginx request are finished, and no more
-// events are pending.
-//  - The proxy fetch will call Done() to indicate this.
-//  - nginx will call Detach() when the associated request is handled
-//    completely (e.g. the request context is about to be destroyed).
-//  - ReadCallback() will call DecrementRefCount() on instances associated to
-//    events it handles.
-//
-// When the last reference is dropped, this class will delete itself.
-//
-// TODO(jmarantz): consider sharing the cache-invalidation infrastructure
-// with ApacheFetch, using a common base class.
+// This class is referred two in two places: the proxy fetch and nginx's
+// request.  It must stay alive until both are finished.  The proxy fetch will
+// call Done() to indicate this; nginx will call Release().  Once both Done()
+// and Release() have been called this class will delete itself.
 
 #ifndef NGX_BASE_FETCH_H_
 #define NGX_BASE_FETCH_H_
@@ -61,46 +45,22 @@ extern "C" {
 
 #include "ngx_pagespeed.h"
 
-#include "ngx_event_connection.h"
 #include "ngx_server_context.h"
 
 #include "net/instaweb/http/public/async_fetch.h"
-#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "pagespeed/kernel/base/string.h"
-#include "pagespeed/kernel/http/headers.h"
+#include "net/instaweb/http/public/headers.h"
+#include "net/instaweb/util/public/string.h"
 
 namespace net_instaweb {
 
-enum NgxBaseFetchType {
-  kIproLookup,
-  kHtmlTransform,
-  kPageSpeedResource,
-  kAdminPage,
-  kPageSpeedProxy
-};
-
 class NgxBaseFetch : public AsyncFetch {
  public:
-  NgxBaseFetch(StringPiece url, ngx_http_request_t* r,
+  NgxBaseFetch(ngx_http_request_t* r, int pipe_fd,
                NgxServerContext* server_context,
                const RequestContextPtr& request_ctx,
-               PreserveCachingHeaders preserve_caching_headers,
-               NgxBaseFetchType base_fetch_type,
-               const RewriteOptions* options);
+               PreserveCachingHeaders preserve_caching_headers);
   virtual ~NgxBaseFetch();
 
-  // Statically initializes event_connection, require for PSOL and nginx to
-  // communicate.
-  static bool Initialize(ngx_cycle_t* cycle);
-
-  // Attempts to finish up request processing queued up in the named pipe and
-  // PSOL for a fixed amount of time. If time is up, a fast and rough shutdown
-  // is attempted.
-  // Statically terminates and NULLS event_connection.
-  static void Terminate();
-
-  static void ReadCallback(const ps_event_data& data);
-
   // Puts a chain in link_ptr if we have any output data buffered.  Returns
   // NGX_OK on success, NGX_ERROR on errors.  If there's no data to send, sends
   // data only if Done() has been called.  Indicates the end of output by
@@ -117,24 +77,9 @@ class NgxBaseFetch : public AsyncFetch {
   // time for resource fetches.  Not called at all for proxy fetches.
   ngx_int_t CollectHeaders(ngx_http_headers_out_t* headers_out);
 
-  // Called by nginx to decrement the refcount.
-  int DecrementRefCount();
-
-  // Called by pagespeed to increment the refcount.
-  int IncrementRefCount();
-
-  // Detach() is called when the nginx side releases this base fetch. It
-  // sets detached_ to true and decrements the refcount. We need to know
-  // this to be able to handle events which nginx request context has been
-  // released while the event was in-flight.
-  void Detach() { detached_ = true; DecrementRefCount(); }
-
-  bool detached() { return detached_; }
-
-  ngx_http_request_t* request() { return request_; }
-  NgxBaseFetchType base_fetch_type() { return base_fetch_type_; }
-
-  bool IsCachedResultValid(const ResponseHeaders& headers) override;
+  // Called by nginx when it's done with us.
+  void Release();
+  void set_ipro_lookup(bool x) { ipro_lookup_ = x; }
 
  private:
   virtual bool HandleWrite(const StringPiece& sp, MessageHandler* handler);
@@ -144,7 +89,7 @@ class NgxBaseFetch : public AsyncFetch {
 
   // Indicate to nginx that we would like it to call
   // CollectAccumulatedWrites().
-  void RequestCollection(char type);
+  void RequestCollection();
 
   // Lock must be acquired first.
   // Returns:
@@ -160,32 +105,20 @@ class NgxBaseFetch : public AsyncFetch {
 
   // Called by Done() and Release().  Decrements our reference count, and if
   // it's zero we delete ourself.
-  int DecrefAndDeleteIfUnreferenced();
+  void DecrefAndDeleteIfUnreferenced();
 
-  static NgxEventConnection* event_connection;
-
-  // Live count of NgxBaseFetch instances that are currently in use.
-  static int active_base_fetches;
-
-  GoogleString url_;
   ngx_http_request_t* request_;
   GoogleString buffer_;
   NgxServerContext* server_context_;
-  const RewriteOptions* options_;
-  bool need_flush_;
   bool done_called_;
   bool last_buf_sent_;
+  int pipe_fd_;
   // How many active references there are to this fetch. Starts at two,
-  // decremented once when Done() is called and once when Detach() is called.
-  // Incremented for each event written by pagespeed for this NgxBaseFetch, and
-  // decremented on the nginx side for each event read for it.
+  // decremented once when Done() is called and once when Release() is called.
   int references_;
   pthread_mutex_t mutex_;
-  NgxBaseFetchType base_fetch_type_;
+  bool ipro_lookup_;
   PreserveCachingHeaders preserve_caching_headers_;
-  // Set to true just before the nginx side releases its reference
-  bool detached_;
-  bool suppress_;
 
   DISALLOW_COPY_AND_ASSIGN(NgxBaseFetch);
 };

src/ngx_caching_headers.cc

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * 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.
  */
 
-
+// Author: jefftk@google.com (Jeff Kaufman)
 
 #include "ngx_caching_headers.h"
 #include "ngx_list_iterator.h"

src/ngx_caching_headers.h

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * 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.
  */
 
-
+// Author: jefftk@google.com (Jeff Kaufman)
 
 #ifndef NGX_CACHING_HEADERS_H_
 #define NGX_CACHING_HEADERS_H_

src/ngx_event_connection.cc

@@ -1,183 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-
-
-
-extern "C" {
-
-#include <ngx_channel.h>
-
-}
-
-#include "ngx_event_connection.h"
-
-#include "pagespeed/kernel/base/google_message_handler.h"
-#include "pagespeed/kernel/base/message_handler.h"
-
-namespace net_instaweb {
-
-  NgxEventConnection::NgxEventConnection(callbackPtr callback)
-    : event_handler_(callback) {
-}
-
-bool NgxEventConnection::Init(ngx_cycle_t* cycle) {
-  int file_descriptors[2];
-
-  if (pipe(file_descriptors) != 0) {
-    ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, "pagespeed: pipe() failed");
-    return false;
-  }
-  if (ngx_nonblocking(file_descriptors[0]) == -1) {
-    ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
-                  ngx_nonblocking_n "pagespeed:  pipe[0] failed");
-  } else if (ngx_nonblocking(file_descriptors[1]) == -1) {
-    ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
-                  ngx_nonblocking_n "pagespeed:  pipe[1] failed");
-  } else if (!CreateNgxConnection(cycle, file_descriptors[0])) {
-    ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
-                  "pagespeed: failed to create connection.");
-  } else {
-    pipe_read_fd_ = file_descriptors[0];
-    pipe_write_fd_ = file_descriptors[1];
-    // Attempt to bump the pipe capacity, because running out of buffer space
-    // can potentially lead up to writes spinning on EAGAIN.
-    // See https://github.com/apache/incubator-pagespeed-ngx/issues/1380
-    // TODO(oschaaf): Consider implementing a queueing mechanism for retrying
-    // failed writes.
-#ifdef F_SETPIPE_SZ
-    fcntl(pipe_write_fd_, F_SETPIPE_SZ, 200*1024 /* minimal amount of bytes */);
-#endif
-    return true;
-  }
-  close(file_descriptors[0]);
-  close(file_descriptors[1]);
-  return false;
-}
-
-bool NgxEventConnection::CreateNgxConnection(ngx_cycle_t* cycle,
-                                             ngx_fd_t pipe_fd) {
-  // pipe_fd (the read side of the pipe will end up as c->fd on the
-  // underlying ngx_connection_t that gets created here)
-  ngx_int_t rc = ngx_add_channel_event(cycle, pipe_fd, NGX_READ_EVENT,
-      &NgxEventConnection::ReadEventHandler);
-  return rc  == NGX_OK;
-}
-
-void NgxEventConnection::ReadEventHandler(ngx_event_t* ev) {
-  ngx_connection_t* c = static_cast<ngx_connection_t*>(ev->data);
-  ngx_int_t result = ngx_handle_read_event(ev, 0);
-  if (result != NGX_OK) {
-    CHECK(false) << "pagespeed: ngx_handle_read_event error: " << result;
-  }
-
-  if (ev->timedout) {
-    ev->timedout = 0;
-    return;
-  }
-
-  if (!NgxEventConnection::ReadAndNotify(c->fd)) {
-    // This was copied from ngx_channel_handler(): for epoll, we need to call
-    // ngx_del_conn(). Sadly, no documentation as to why.
-    if (ngx_event_flags & NGX_USE_EPOLL_EVENT) {
-      ngx_del_conn(c, 0);
-    }
-    ngx_close_connection(c);
-    ngx_del_event(ev, NGX_READ_EVENT, 0);
-  }
-}
-
-// Deserialize ps_event_data's from the pipe as they become available.
-// Subsequently do some bookkeeping, cleanup, and error checking to keep
-// the mess out of ps_base_fetch_handler.
-bool NgxEventConnection::ReadAndNotify(ngx_fd_t fd) {
-  while (true) {
-    // We read only one ps_event_data at a time for now:
-    // We can end up recursing all the way and end up calling ourselves here.
-    // If that happens in the middle of looping over multiple ps_event_data's we
-    // have obtained with read(), the results from the next read() will make us
-    // process events out of order. Which can give headaches.
-    // Alternatively, we could maintain a queue to make sure we process in
-    // sequence
-    ps_event_data data;
-    ngx_int_t size = read(fd, static_cast<void*>(&data), sizeof(data));
-
-    if (size == -1) {
-      if (errno == EINTR) {
-        continue;
-      // TODO(oschaaf): should we worry about spinning here?
-      } else if (ngx_errno == EAGAIN || ngx_errno == EWOULDBLOCK) {
-        return true;
-      }
-    }
-
-    if (size <= 0) {
-      return false;
-    }
-
-    data.connection->event_handler_(data);
-    return true;
-  }
-}
-
-bool NgxEventConnection::WriteEvent(void* sender) {
-  return WriteEvent('X' /* Anything char is fine */, sender);
-}
-
-bool NgxEventConnection::WriteEvent(char type, void* sender) {
-  ssize_t size = 0;
-  ps_event_data data;
-
-  ngx_memzero(&data, sizeof(data));
-  data.type = type;
-  data.sender = sender;
-  data.connection = this;
-
-  while (true) {
-    size = write(pipe_write_fd_,
-                 static_cast<void*>(&data), sizeof(data));
-    if (size == sizeof(data)) {
-      return true;
-    } else if (size == -1) {
-      // TODO(oschaaf): should we worry about spinning here?
-      if (ngx_errno == EINTR || ngx_errno == EAGAIN
-          || ngx_errno == EWOULDBLOCK) {
-        continue;
-      } else {
-        return false;
-      }
-    } else {
-      CHECK(false) << "pagespeed: unexpected return value from write(): "
-                   << size;
-    }
-  }
-  CHECK(false) << "Should not get here";
-  return false;
-}
-
-// Reads and processes what is available in the pipe.
-void NgxEventConnection::Drain() {
-  NgxEventConnection::ReadAndNotify(pipe_read_fd_);
-}
-
-void NgxEventConnection::Shutdown() {
-  close(pipe_write_fd_);
-  close(pipe_read_fd_);
-}
-
-}  // namespace net_instaweb

src/ngx_event_connection.h

@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-
-
-//
-// NgxEventConnection implements a means to send events from other threads to
-// nginx's event loop, and is implemented by a named pipe under the hood.
-// A single instance is used by NgxBaseFetch, and one instance is created per
-// NgxUrlAsyncFetcher when native fetching is on.
-
-#ifndef NGX_EVENT_CONNECTION_H_
-#define NGX_EVENT_CONNECTION_H_
-
-extern "C" {
-#include <ngx_http.h>
-}
-
-#include <pthread.h>
-
-#include "pagespeed/kernel/base/string.h"
-#include "pagespeed/kernel/http/headers.h"
-
-namespace net_instaweb {
-
-class NgxEventConnection;
-
-// Represents a single event that can be written to or read from the pipe.
-// Technically, sender is the only data we need to send. type and connection are
-// included to provide a means to trace the events along with some more
-// info.
-typedef struct {
-  char type;
-  void* sender;
-  NgxEventConnection* connection;
-} ps_event_data;
-
-// Handler signature for receiving events
-typedef void (*callbackPtr)(const ps_event_data&);
-
-// Abstracts a connection to nginx through which events can be written.
-class NgxEventConnection {
- public:
-  explicit NgxEventConnection(callbackPtr handler);
-
-  // Creates the file descriptors and ngx_connection_t required for event
-  // messaging between pagespeed and nginx.
-  bool Init(ngx_cycle_t* cycle);
-  // Shuts down the underlying file descriptors and connection created in Init()
-  void Shutdown();
-  // Constructs a ps_event_data and writes it to the underlying named pipe.
-  bool WriteEvent(char type, void* sender);
-  // Convenience overload for clients that have a single event type.
-  bool WriteEvent(void* sender);
-  // Reads and processes what is available in the named pipe's buffer.
-  void Drain();
- private:
-  static bool CreateNgxConnection(ngx_cycle_t* cycle, ngx_fd_t pipe_fd);
-  static void ReadEventHandler(ngx_event_t* e);
-  static bool ReadAndNotify(ngx_fd_t fd);
-
-  callbackPtr event_handler_;
-  // We own these file descriptors
-  ngx_fd_t pipe_write_fd_;
-  ngx_fd_t pipe_read_fd_;
-
-  DISALLOW_COPY_AND_ASSIGN(NgxEventConnection);
-};
-
-}  // namespace net_instaweb
-
-#endif  // NGX_EVENT_CONNECTION_H_

src/ngx_fetch.cc

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2012 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.
  */
 
-
+// Author: x.dinic@gmail.com (Junmin Xiong)
 //
 //  - The fetch is started by the main thread.
 //  - Resolver event was hooked when a NgxFetch starting. It could
@@ -33,43 +30,85 @@
 // TODO(oschaaf): style: reindent namespace according to google C++ style guide
 // TODO(oschaaf): Retry mechanism for failures on a re-used k-a connection.
 // Currently we don't think it's going to be an issue, see the comments at
-// https://github.com/apache/incubator-pagespeed-ngx/pull/781.
+// https://github.com/pagespeed/ngx_pagespeed/pull/781.
 
 extern "C" {
 #include <nginx.h>
 }
 
 #include "ngx_fetch.h"
-
+#include "net/instaweb/util/public/basictypes.h"
 #include "base/logging.h"
 
 #include <algorithm>
 #include <string>
-#include <typeinfo>
 #include <vector>
 
+#include "net/instaweb/util/public/scoped_ptr.h"
 #include "net/instaweb/http/public/async_fetch.h"
 #include "net/instaweb/http/public/inflating_fetch.h"
+#include "net/instaweb/http/public/request_headers.h"
+#include "net/instaweb/http/public/response_headers.h"
+#include "net/instaweb/http/public/response_headers_parser.h"
 #include "net/instaweb/public/version.h"
 #include "net/instaweb/public/global_constants.h"
-#include "pagespeed/kernel/base/basictypes.h"
-#include "pagespeed/kernel/base/condvar.h"
-#include "pagespeed/kernel/base/message_handler.h"
-#include "pagespeed/kernel/base/pool.h"
-#include "pagespeed/kernel/base/pool_element.h"
-#include "pagespeed/kernel/base/scoped_ptr.h"
-#include "pagespeed/kernel/base/statistics.h"
-#include "pagespeed/kernel/base/string_writer.h"
-#include "pagespeed/kernel/base/string_util.h"
-#include "pagespeed/kernel/base/thread_system.h"
-#include "pagespeed/kernel/base/timer.h"
-#include "pagespeed/kernel/base/writer.h"
-#include "pagespeed/kernel/http/request_headers.h"
-#include "pagespeed/kernel/http/response_headers.h"
-#include "pagespeed/kernel/http/response_headers_parser.h"
+#include "net/instaweb/util/public/condvar.h"
+#include "net/instaweb/util/public/message_handler.h"
+#include "net/instaweb/util/public/pool.h"
+#include "net/instaweb/util/public/pool_element.h"
+#include "net/instaweb/util/public/pthread_mutex.h"
+#include "net/instaweb/util/public/statistics.h"
+#include "net/instaweb/util/public/string_writer.h"
+#include "net/instaweb/util/public/string_util.h"
+#include "net/instaweb/util/public/thread_system.h"
+#include "net/instaweb/util/public/timer.h"
+#include "net/instaweb/util/public/writer.h"
 
 namespace net_instaweb {
 
+class NgxConnection : public PoolElement<NgxConnection> {
+ public:
+  NgxConnection(MessageHandler* handler, int max_keepalive_requests);
+  ~NgxConnection();
+  void SetSock(u_char *sockaddr, socklen_t socklen) {
+    socklen_ = socklen;
+    ngx_memcpy(&sockaddr_, sockaddr, socklen);
+  }
+  // Close ensures that NgxConnection deletes itself at the appropriate time,
+  // which can be after receiving a non-keepalive response, or when the remote
+  // server closes the connection when the NgxConnection is pooled and idle.
+  void Close();
+
+  // Once keepalive is disabled, it can't be toggled back on.
+  void set_keepalive(bool k) { keepalive_ = keepalive_ && k; }
+  bool keepalive() { return keepalive_; }
+
+  typedef Pool<NgxConnection> NgxConnectionPool;
+
+  static NgxConnection* Connect(ngx_peer_connection_t* pc,
+                                MessageHandler* handler,
+                                int max_keepalive_requests);
+  static void IdleWriteHandler(ngx_event_t* ev);
+  static void IdleReadHandler(ngx_event_t* ev);
+
+  static NgxConnectionPool connection_pool;
+  static PthreadMutex connection_pool_mutex;
+
+  // c_ is owned by NgxConnection and freed in ::Close()
+  ngx_connection_t* c_;
+  static const int64 keepalive_timeout_ms;
+  static const GoogleString ka_header;
+
+ private:
+  int max_keepalive_requests_;
+  bool keepalive_;
+  socklen_t socklen_;
+  u_char sockaddr_[NGX_SOCKADDRLEN];
+  MessageHandler* handler_;
+
+  DISALLOW_COPY_AND_ASSIGN(NgxConnection);
+};
+
 NgxConnection::NgxConnectionPool NgxConnection::connection_pool;
 PthreadMutex NgxConnection::connection_pool_mutex;
 // Default keepalive 60s.
@@ -90,18 +129,7 @@ NgxConnection::NgxConnection(MessageHandler* handler,
 }
 
 NgxConnection::~NgxConnection() {
-  CHECK(c_ == NULL) << "NgxConnection: Underlying connection should be NULL";
-}
-
-void NgxConnection::Terminate() {
-  for (NgxConnectionPool::iterator p = connection_pool.begin();
-       p != connection_pool.end(); ++p) {
-    NgxConnection* nc = *p;
-    ngx_close_connection(nc->c_);
-    nc->c_ = NULL;
-    delete nc;
-  }
-  connection_pool.Clear();
+  CHECK(c_ == NULL) << "NgxFetch: Underlying connection should be NULL";
 }
 
 NgxConnection* NgxConnection::Connect(ngx_peer_connection_t* pc,
@@ -134,7 +162,7 @@ NgxConnection* NgxConnection::Connect(ngx_peer_connection_t* pc,
         connection_pool.Remove(nc);
 
         ngx_log_error(NGX_LOG_DEBUG, pc->log, 0,
-                      "NgxFetch: re-using connection %p (pool size: %l)",
+                      "NgxFetch: re-using connection %p (pool size: %l)\n",
                       nc, connection_pool.size());
         return nc;
       }
@@ -165,7 +193,7 @@ void NgxConnection::Close() {
         // out or has been closed remotely.
         connection_pool.Remove(this);
         ngx_log_error(NGX_LOG_DEBUG, c_->log, 0,
-                      "NgxFetch: removed connection %p (pool size: %l)",
+                      "NgxFetch: removed connection %p (pool size: %l)\n",
                       this, connection_pool.size());
         removed_from_pool = true;
         break;
@@ -212,7 +240,7 @@ void NgxConnection::Close() {
     connection_pool.Add(this);
     ngx_log_error(NGX_LOG_DEBUG, c_->log, 0,
                   "NgxFetch: Added connection %p (pool size: %l - "
-                  " max_keepalive_requests_ %d)",
+                  " max_keepalive_requests_ %d)\n",
                   this, connection_pool.size(), max_keepalive_requests_);
   }
 }
@@ -227,6 +255,7 @@ void NgxConnection::IdleWriteHandler(ngx_event_t* ev) {
   if (n == NGX_AGAIN) {
     return;
   }
+  DCHECK(false) << "NgxFetch: Unexpected write event" << n;
 }
 
 void NgxConnection::IdleReadHandler(ngx_event_t* ev) {
@@ -300,7 +329,7 @@ bool NgxFetch::Start(NgxUrlAsyncFetcher* fetcher) {
   fetcher_ = fetcher;
   bool ok = Init();
   if (ok) {
-    ngx_log_error(NGX_LOG_DEBUG, log_, 0, "NgxFetch %p: initialized",
+    ngx_log_error(NGX_LOG_DEBUG, log_, 0, "NgxFetch %p: initialized\n",
                   this);
   }  // else Init() will have emitted a reason
   return ok;
@@ -318,9 +347,7 @@ bool NgxFetch::Init() {
   }
 
   if (!ParseUrl()) {
-    message_handler_->Message(kError, 
-                              "NgxFetch: ParseUrl() failed for [%s]:%s",
-                              str_url_.c_str(), url_.err);
+    message_handler_->Message(kError, "NgxFetch: ParseUrl() failed");
     return false;
   }
 
@@ -387,7 +414,7 @@ bool NgxFetch::Init() {
       return false;
     } else {
       ngx_log_error(NGX_LOG_DEBUG, log_, 0,
-                    "NgxFetch %p: start resolve for: %s",
+                    "NgxFetch %p: start resolve for: %s\n",
                     this, s_ipaddress.c_str());
     }
 
@@ -423,7 +450,7 @@ const char* NgxFetch::str_url() {
 // This function should be called only once. The only argument is sucess or
 // not.
 void NgxFetch::CallbackDone(bool success) {
-  ngx_log_error(NGX_LOG_DEBUG, log_, 0, "NgxFetch %p: CallbackDone: %s",
+  ngx_log_error(NGX_LOG_DEBUG, log_, 0, "NgxFetch %p: CallbackDone: %s\n",
                 this, success ? "OK":"FAIL");
 
   if (async_fetch_ == NULL) {
@@ -460,7 +487,7 @@ void NgxFetch::CallbackDone(bool success) {
         }
       }
       ngx_log_error(NGX_LOG_DEBUG, log_, 0,
-                    "NgxFetch %p: connection %p attempt keep-alive: %s",
+                    "NgxFetch %p: connection %p attempt keep-alive: %s\n",
                     this, connection_, keepalive ? "Yes":"No");
     }
 
@@ -469,6 +496,9 @@ void NgxFetch::CallbackDone(bool success) {
     connection_ = NULL;
   }
 
+  // TODO(oschaaf): see https://github.com/pagespeed/ngx_pagespeed/pull/755
+  async_fetch_->Done(success);
+
   if (fetcher_ != NULL) {
     if (fetcher_->track_original_content_length()
         && async_fetch_->response_headers()->Has(
@@ -478,7 +508,7 @@ void NgxFetch::CallbackDone(bool success) {
     }
     fetcher_->FetchComplete(this);
   }
-  async_fetch_->Done(success);
+
   async_fetch_ = NULL;
 }
 
@@ -540,16 +570,8 @@ void NgxFetch::ResolveDoneHandler(ngx_resolver_ctx_t* resolver_ctx) {
   ngx_uint_t i;
   // Find the first ipv4 address. We don't support ipv6 yet.
   for (i = 0; i < resolver_ctx->naddrs; i++) {
-    // Old versions of nginx and tengine have a different definition of addrs,
-    // work around to make sure we are using the right type (ngx_addr_t*).
-    ngx_addr_t* ngx_addrs = reinterpret_cast<ngx_addr_t*>(resolver_ctx->addrs);
-    if (typeid(*ngx_addrs) == typeid(*resolver_ctx->addrs)) {
-      if (reinterpret_cast<struct sockaddr_in*>(ngx_addrs[i].sockaddr)
-              ->sin_family == AF_INET) {
-        break;
-      }
-    } else {
-      // We're using an old version that uses in_addr_t* for addrs.
+    if (reinterpret_cast<struct sockaddr_in*>(
+            resolver_ctx->addrs[i].sockaddr)->sin_family == AF_INET) {
       break;
     }
   }
@@ -709,7 +731,7 @@ int NgxFetch::Connect() {
   connection_ = NgxConnection::Connect(&pc, message_handler(),
                                        fetcher_->max_keepalive_requests_);
   ngx_log_error(NGX_LOG_DEBUG, fetcher_->log_, 0,
-                "NgxFetch %p Connect() connection %p for [%s]",
+                "NgxFetch %p Connect() connection %p for [%s]\n",
                 this, connection_, str_url());
 
   if (connection_ == NULL) {
@@ -725,13 +747,13 @@ int NgxFetch::Connect() {
 }
 
 // When the fetch sends the request completely, it will hook the read event,
-// and prepare to parse the response. Timer set in Init() is still in effect.
+// and prepare to parse the response.
 void NgxFetch::ConnectionWriteHandler(ngx_event_t* wev) {
   ngx_connection_t* c = static_cast<ngx_connection_t*>(wev->data);
   NgxFetch* fetch = static_cast<NgxFetch*>(c->data);
   ngx_buf_t* out = fetch->out_;
-  bool ok = true;
-  while (wev->ready && out->pos < out->last) {
+
+  while (out->pos < out->last) {
     int n = c->send(c, out->pos, out->last - out->pos);
     ngx_log_error(NGX_LOG_DEBUG, fetch->log_, 0,
                   "NgxFetch %p: ConnectionWriteHandler "
@@ -740,36 +762,31 @@ void NgxFetch::ConnectionWriteHandler(ngx_event_t* wev) {
     if (n >= 0) {
       out->pos += n;
     } else if (n == NGX_AGAIN) {
-      break;
+      if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
+        fetch->CallbackDone(false);
+      }
+      // Timer set in Init() is still in effect.
+      return;
     } else {
-      ok = false;
-      break;
+      c->error = 1;
+      fetch->CallbackDone(false);
+      return;
     }
   }
 
-  if (ok) {
-    if (out->pos == out->last) {
-      ok = ngx_handle_read_event(c->read, 0) == NGX_OK;
-    } else {
-      ok = ngx_handle_write_event(c->write, 0) == NGX_OK;
-    }
-  }
-
-  if (!ok) {
-    fetch->message_handler()->Message(
-        kWarning, "NgxFetch %p: failed to hook next event", fetch);
+  if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
     c->error = 1;
     fetch->CallbackDone(false);
   }
+
+  return;
 }
 
-// Timer set in Init() is still in effect.
 void NgxFetch::ConnectionReadHandler(ngx_event_t* rev) {
   ngx_connection_t* c = static_cast<ngx_connection_t*>(rev->data);
   NgxFetch* fetch = static_cast<NgxFetch*>(c->data);
-  bool ok = true;
 
-  while(rev->ready) {
+  for (;;) {
     int n = c->recv(
         c, fetch->in_->start, fetch->in_->end - fetch->in_->start);
 
@@ -779,39 +796,56 @@ void NgxFetch::ConnectionReadHandler(ngx_event_t* rev) {
 
     if (n == NGX_AGAIN) {
       break;
-    } else if (n == 0) {
+    }
+
+    if (n == 0) {
       // If the content length was not known, we assume that we have read
       // all if we at least parsed the headers.
       // If we do know the content length, having a mismatch on the bytes read
       // will be interpreted as an error.
-      ok = (fetch->content_length_known_ && fetch->content_length_ == fetch->bytes_received_)
-          || fetch->parser_.headers_complete();
-      fetch->done_ = true;
-      break;
+      if (fetch->content_length_known_) {
+        fetch->CallbackDone(fetch->content_length_ == fetch->bytes_received_);
+      } else {
+        fetch->CallbackDone(fetch->parser_.headers_complete());
+      }
+
+      return;
     } else if (n > 0) {
       fetch->in_->pos = fetch->in_->start;
       fetch->in_->last = fetch->in_->start + n;
-      ok = fetch->response_handler(c);
-      if (fetch->done_ || !ok) {
-        break;
+      if (!fetch->response_handler(c)) {
+        fetch->CallbackDone(false);
+        return;
       }
+
+      if (fetch->done_) {
+        fetch->CallbackDone(true);
+        return;
+      }
+    }
+
+    if (!rev->ready) {
+      break;
     }
   }
 
-  if (!ok) {
-    fetch->CallbackDone(false);
-  } else if (fetch->done_) {
+  if (fetch->done_) {
     fetch->CallbackDone(true);
-  } else if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+    return;
+  }
+
+  if (ngx_handle_read_event(rev, 0) != NGX_OK) {
     fetch->CallbackDone(false);
   }
+
+  // Timer set in Init() is still in effect.
 }
 
 // Parse the status line: "HTTP/1.1 200 OK\r\n"
 bool NgxFetch::HandleStatusLine(ngx_connection_t* c) {
   NgxFetch* fetch = static_cast<NgxFetch*>(c->data);
   ngx_log_error(NGX_LOG_DEBUG, fetch->log_, 0,
-                "NgxFetch %p: Handle status line", fetch);
+                "NgxFetch %p: Handle status line\n", fetch);
 
   // This function only works after Nginx-1.1.4. Before nginx-1.1.4,
   // ngx_http_parse_status_line didn't save http_version.
@@ -824,20 +858,14 @@ bool NgxFetch::HandleStatusLine(ngx_connection_t* c) {
   } else if (n == NGX_AGAIN) {  // not completed
     return true;
   }
-
   ResponseHeaders* response_headers =
       fetch->async_fetch_->response_headers();
   response_headers->SetStatusAndReason(
       static_cast<HttpStatus::Code>(fetch->get_status_code()));
   response_headers->set_major_version(fetch->get_major_version());
   response_headers->set_minor_version(fetch->get_minor_version());
-
-  fetch->in_->pos += n;
   fetch->set_response_handler(NgxFetch::HandleHeader);
-  if ((fetch->in_->last - fetch->in_->pos) > 0) {
-    return fetch->response_handler(c);
-  }
-  return true;
+  return fetch->response_handler(c);
 }
 
 // Parse the HTTP headers
@@ -849,16 +877,12 @@ bool NgxFetch::HandleHeader(ngx_connection_t* c) {
                                        fetch->message_handler_);
 
   ngx_log_error(NGX_LOG_DEBUG, fetch->log_, 0,
-                "NgxFetch %p: Handle headers", fetch);
+                "NgxFetch %p: Handle headers\n", fetch);
 
   if (n > size) {
     return false;
   } else if (fetch->parser_.headers_complete()) {
-    // TODO(oschaaf): We should also check if the request method was HEAD
-    // - but I don't think PSOL uses that at this point.
-    if (fetch->get_status_code() == 304 || fetch->get_status_code() == 204) {
-      fetch->done_ = true;
-    } else if (fetch->async_fetch_->response_headers()->FindContentLength(
+    if (fetch->async_fetch_->response_headers()->FindContentLength(
             &fetch->content_length_)) {
       if (fetch->content_length_ < 0) {
         fetch->message_handler_->Message(
@@ -879,11 +903,9 @@ bool NgxFetch::HandleHeader(ngx_connection_t* c) {
     }
 
     fetch->in_->pos += n;
-    if (!fetch->done_) {
-      fetch->set_response_handler(NgxFetch::HandleBody);
-      if ((fetch->in_->last - fetch->in_->pos) > 0) {
-        return fetch->response_handler(c);
-      }
+    fetch->set_response_handler(NgxFetch::HandleBody);
+    if ((fetch->in_->last - fetch->in_->pos) > 0) {
+      return fetch->response_handler(c);
     }
   } else {
     fetch->in_->pos += n;
@@ -900,7 +922,7 @@ bool NgxFetch::HandleBody(ngx_connection_t* c) {
   fetch->bytes_received_add(size);
 
   ngx_log_error(NGX_LOG_DEBUG, fetch->log_, 0,
-                "NgxFetch %p: Handle body (%d bytes)", fetch, size);
+                "NgxFetch %p: Handle body (%d bytes)\n", fetch, size);
 
   if ( fetch->async_fetch_->Write(StringPiece(data, size),
                                   fetch->message_handler()) ) {
@@ -910,7 +932,7 @@ bool NgxFetch::HandleBody(ngx_connection_t* c) {
     fetch->in_->pos += size;
   } else {
     ngx_log_error(NGX_LOG_DEBUG, fetch->log_, 0,
-                  "NgxFetch %p: async fetch write failure", fetch);
+                  "NgxFetch %p: async fetch write failure\n", fetch);
     return false;
   }
   return true;
@@ -919,7 +941,7 @@ bool NgxFetch::HandleBody(ngx_connection_t* c) {
 void NgxFetch::TimeoutHandler(ngx_event_t* tev) {
   NgxFetch* fetch = static_cast<NgxFetch*>(tev->data);
   ngx_log_error(NGX_LOG_DEBUG, fetch->log_, 0,
-                "NgxFetch %p: TimeoutHandler called", fetch);
+                "NgxFetch %p: TimeoutHandler called\n", fetch);
   fetch->CallbackDone(false);
 }
 
@@ -943,8 +965,8 @@ void NgxFetch::FixUserAgent() {
     user_agent += "NgxNativeFetcher";
   }
   GoogleString version = StrCat(
-      " (", kModPagespeedSubrequestUserAgent,
-      "/" MOD_PAGESPEED_VERSION_STRING "-" LASTCHANGE_STRING ")");
+      " ", kModPagespeedSubrequestUserAgent,
+      "/" MOD_PAGESPEED_VERSION_STRING "-" LASTCHANGE_STRING);
   if (!StringPiece(user_agent).ends_with(version)) {
     user_agent += version;
   }

src/ngx_fetch.h

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2012 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.
  */
 
-
+// Author: x.dinic@gmail.com (Junmin Xiong)
 //
 // PageSpeed needs some way to talk to the internet and request resources.  For
 // example, if it's optimizing www.example.com/index.html and it sees html with
@@ -42,14 +39,12 @@ extern "C" {
 
 #include "ngx_url_async_fetcher.h"
 #include <vector>
+#include "net/instaweb/util/public/basictypes.h"
+#include "net/instaweb/util/public/pool.h"
+#include "net/instaweb/util/public/string.h"
 #include "net/instaweb/http/public/url_async_fetcher.h"
-#include "pagespeed/kernel/base/basictypes.h"
-#include "pagespeed/kernel/base/pool.h"
-#include "pagespeed/kernel/base/string.h"
-#include "pagespeed/kernel/http/response_headers.h"
-#include "pagespeed/kernel/http/response_headers_parser.h"
-#include "pagespeed/kernel/thread/pthread_mutex.h"
-
+#include "net/instaweb/http/public/response_headers.h"
+#include "net/instaweb/http/public/response_headers_parser.h"
 
 namespace net_instaweb {
 
@@ -58,51 +53,6 @@ typedef bool (*response_handler_pt)(ngx_connection_t* c);
 class NgxUrlAsyncFetcher;
 class NgxConnection;
 
-class NgxConnection : public PoolElement<NgxConnection> {
- public:
-  NgxConnection(MessageHandler* handler, int max_keepalive_requests);
-  ~NgxConnection();
-  void SetSock(u_char *sockaddr, socklen_t socklen) {
-    socklen_ = socklen;
-    ngx_memcpy(&sockaddr_, sockaddr, socklen);
-  }
-  // Close ensures that NgxConnection deletes itself at the appropriate time,
-  // which can be after receiving a non-keepalive response, or when the remote
-  // server closes the connection when the NgxConnection is pooled and idle.
-  void Close();
-
-  // Once keepalive is disabled, it can't be toggled back on.
-  void set_keepalive(bool k) { keepalive_ = keepalive_ && k; }
-  bool keepalive() { return keepalive_; }
-
-  typedef Pool<NgxConnection> NgxConnectionPool;
-
-  static NgxConnection* Connect(ngx_peer_connection_t* pc,
-                                MessageHandler* handler,
-                                int max_keepalive_requests);
-  static void IdleWriteHandler(ngx_event_t* ev);
-  static void IdleReadHandler(ngx_event_t* ev);
-  // Terminate will cleanup any idle connections upon shutdown.
-  static void Terminate();
-
-  static NgxConnectionPool connection_pool;
-  static PthreadMutex connection_pool_mutex;
-
-  // c_ is owned by NgxConnection and freed in ::Close()
-  ngx_connection_t* c_;
-  static const int64 keepalive_timeout_ms;
-  static const GoogleString ka_header;
-
- private:
-  int max_keepalive_requests_;
-  bool keepalive_;
-  socklen_t socklen_;
-  u_char sockaddr_[NGX_SOCKADDRLEN];
-  MessageHandler* handler_;
-
-  DISALLOW_COPY_AND_ASSIGN(NgxConnection);
-};
-
 class NgxFetch : public PoolElement<NgxFetch> {
  public:
   NgxFetch(const GoogleString& url,

src/ngx_gzip_setter.cc

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2014 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.
  */
 
-
+// Author: kspoelstra@we-amp.com (Kees Spoelstra)
 
 #include "ngx_gzip_setter.h"
 
@@ -108,10 +105,10 @@ void NgxGZipSetter::Init(ngx_conf_t* cf) {
 #if (NGX_HTTP_GZIP)
   bool gzip_signature_mismatch = false;
   bool other_signature_mismatch = false;
-  for (int m = 0; cf->cycle->modules[m] != NULL; m++) {
-    if (cf->cycle->modules[m]->commands != NULL) {
-      for (int c = 0; cf->cycle->modules[m]->commands[c].name.len; c++) {
-        ngx_command_t* current_command =& cf->cycle->modules[m]->commands[c];
+  for (int m = 0; ngx_modules[m] != NULL; m++) {
+    if (ngx_modules[m]->commands != NULL) {
+      for (int c = 0; ngx_modules[m]->commands[c].name.len; c++) {
+        ngx_command_t* current_command =& ngx_modules[m]->commands[c];
 
         // We look for the gzip command, and the exact signature we trust
         // this means configured as an config location offset
@@ -124,7 +121,7 @@ void NgxGZipSetter::Init(ngx_conf_t* cf) {
           if (IsNgxFlagCommand(current_command)) {
             current_command->set = ngx_gzip_redirect_conf_set_flag_slot;
             gzip_command_.command_ = current_command;
-            gzip_command_.module_ = cf->cycle->modules[m];
+            gzip_command_.module_ = ngx_modules[m];
             enabled_ = 1;
           } else {
             ngx_conf_log_error(
@@ -139,7 +136,7 @@ void NgxGZipSetter::Init(ngx_conf_t* cf) {
           if (IsNgxEnumCommand(current_command)) {
             current_command->set = ngx_gzip_redirect_conf_set_enum_slot;
             gzip_http_version_command_.command_ = current_command;
-            gzip_http_version_command_.module_ = cf->cycle->modules[m];
+            gzip_http_version_command_.module_ = ngx_modules[m];
           } else {
             ngx_conf_log_error(
                 NGX_LOG_WARN, cf, 0,
@@ -153,7 +150,7 @@ void NgxGZipSetter::Init(ngx_conf_t* cf) {
           if (IsNgxBitmaskCommand(current_command)) {
             current_command->set = ngx_gzip_redirect_conf_set_bitmask_slot;
             gzip_proxied_command_.command_ = current_command;
-            gzip_proxied_command_.module_ = cf->cycle->modules[m];
+            gzip_proxied_command_.module_ = ngx_modules[m];
           } else {
             ngx_conf_log_error(
                 NGX_LOG_WARN, cf, 0,
@@ -167,7 +164,7 @@ void NgxGZipSetter::Init(ngx_conf_t* cf) {
           if (IsNgxHttpTypesCommand(current_command)) {
             current_command->set = ngx_gzip_redirect_http_types_slot;
             gzip_http_types_command_.command_ = current_command;
-            gzip_http_types_command_.module_ = cf->cycle->modules[m];
+            gzip_http_types_command_.module_ = ngx_modules[m];
           } else {
             ngx_conf_log_error(
                 NGX_LOG_WARN, cf, 0,
@@ -181,7 +178,7 @@ void NgxGZipSetter::Init(ngx_conf_t* cf) {
           if (IsNgxFlagCommand(current_command)) {
             current_command->set = ngx_gzip_redirect_conf_set_flag_slot;
             gzip_vary_command_.command_ = current_command;
-            gzip_vary_command_.module_ = cf->cycle->modules[m];
+            gzip_vary_command_.module_ = ngx_modules[m];
           } else {
             ngx_conf_log_error(
                 NGX_LOG_WARN, cf, 0,
@@ -313,7 +310,7 @@ void NgxGZipSetter::EnableGZipForLocation(ngx_conf_t* cf) {
   }
   if (gzip_proxied_command_.command_) {
     SetNgxConfBitmask(
-        cf, &gzip_proxied_command_, NGX_HTTP_GZIP_PROXIED_ANY);
+        cf, &gzip_http_version_command_, NGX_HTTP_GZIP_PROXIED_ANY);
   }
 
   // This is actually the most prone to future API changes, because gzip_types

src/ngx_gzip_setter.h

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2014 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.
  */
 
-
+// Author: kspoelstra@we-amp.com (Kees Spoelstra)
 
 /*
  * NgxGZipSetter sets up gzip for pagespeed
@@ -63,7 +60,7 @@ extern "C" {
 
 #include "ngx_pagespeed.h"
 
-#include "pagespeed/kernel/base/basictypes.h"
+#include "net/instaweb/util/public/basictypes.h"
 
 namespace net_instaweb {
 

src/ngx_list_iterator.cc

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * 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.
  */
 
-
+// Author: jefftk@google.com (Jeff Kaufman)
 
 #include "ngx_list_iterator.h"
 

src/ngx_list_iterator.h

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * 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.
  */
 
-
+// Author: jefftk@google.com (Jeff Kaufman)
 //
 // Simplifies iteration over nginx lists.
 //

src/ngx_message_handler.cc

@@ -1,36 +1,30 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-
-
+// 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.
 
+// Author: oschaaf@gmail.com (Otto van der Schaaf)
 
 #include "ngx_message_handler.h"
 
 #include <signal.h>
 
+#include "net/instaweb/util/public/abstract_mutex.h"
+#include "net/instaweb/util/public/debug.h"
+#include "net/instaweb/util/public/shared_circular_buffer.h"
+#include "net/instaweb/util/public/string_util.h"
 #include "net/instaweb/public/version.h"
-#include "pagespeed/kernel/base/abstract_mutex.h"
-#include "pagespeed/kernel/base/debug.h"
 #include "pagespeed/kernel/base/posix_timer.h"
-#include "pagespeed/kernel/base/string_util.h"
 #include "pagespeed/kernel/base/time_util.h"
-#include "pagespeed/kernel/sharedmem/shared_circular_buffer.h"
 
 namespace {
 
@@ -94,29 +88,32 @@ ngx_uint_t NgxMessageHandler::GetNgxLogLevel(MessageType type) {
   return NGX_LOG_ALERT;
 }
 
-void NgxMessageHandler::MessageSImpl(MessageType type,
-                                     const GoogleString& message) {
+void NgxMessageHandler::MessageVImpl(MessageType type, const char* msg,
+                                     va_list args) {
+  ngx_uint_t log_level = GetNgxLogLevel(type);
+  GoogleString formatted_message = Format(msg, args);
   if (log_ != NULL) {
-    ngx_uint_t log_level = GetNgxLogLevel(type);
     ngx_log_error(log_level, log_, 0/*ngx_err_t*/, "[%s %s] %s",
-                  kModuleName, kModPagespeedVersion, message.c_str());
+                  kModuleName, kModPagespeedVersion, formatted_message.c_str());
   } else {
-    GoogleMessageHandler::MessageSImpl(type, message);
+    GoogleMessageHandler::MessageVImpl(type, msg, args);
   }
-  AddMessageToBuffer(type, message);
+  // Prepare a log message for the SharedCircularBuffer only.
+  AddMessageToBuffer(type, formatted_message);
 }
 
-void NgxMessageHandler::FileMessageSImpl(
-    MessageType type, const char* file, int line, const GoogleString& message) {
+void NgxMessageHandler::FileMessageVImpl(MessageType type, const char* file,
+                                         int line, const char* msg,
+                                         va_list args) {
+  ngx_uint_t log_level = GetNgxLogLevel(type);
+  GoogleString formatted_message = Format(msg, args);
   if (log_ != NULL) {
-    ngx_uint_t log_level = GetNgxLogLevel(type);
     ngx_log_error(log_level, log_, 0/*ngx_err_t*/, "[%s %s] %s:%d:%s",
                   kModuleName, kModPagespeedVersion, file, line,
-                  message.c_str());
+                  formatted_message.c_str());
   } else {
-    GoogleMessageHandler::FileMessageSImpl(type, file, line, message);
+    GoogleMessageHandler::FileMessageVImpl(type, file, line, msg, args);
   }
-  AddMessageToBuffer(type, file, line, message);
 }
 
 }  // namespace net_instaweb

src/ngx_message_handler.h

@@ -1,44 +1,34 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-
-
+// 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.
 
+// Author: oschaaf@gmail.com (Otto van der Schaaf)
 
 #ifndef NGX_MESSAGE_HANDLER_H_
 #define NGX_MESSAGE_HANDLER_H_
 
 extern "C" {
-  #include <ngx_auto_config.h>
-#if (NGX_THREADS)
-  #include <ngx_thread.h>
-#endif
   #include <ngx_core.h>
   #include <ngx_log.h>
 }
 
 #include <cstdarg>
 
-#include "pagespeed/kernel/base/basictypes.h"
-#include "pagespeed/kernel/base/message_handler.h"
-#include "pagespeed/kernel/base/string.h"
-#include "pagespeed/kernel/base/string_util.h"
-#include "pagespeed/system/system_message_handler.h"
+#include "net/instaweb/system/public/system_message_handler.h"
+#include "net/instaweb/util/public/basictypes.h"
+#include "net/instaweb/util/public/message_handler.h"
+#include "net/instaweb/util/public/string.h"
+#include "net/instaweb/util/public/string_util.h"
 
 namespace net_instaweb {
 
@@ -59,10 +49,10 @@ class NgxMessageHandler : public SystemMessageHandler {
   ngx_log_t* log() { return log_; }
 
  protected:
-  virtual void MessageSImpl(MessageType type, const GoogleString& message);
+  virtual void MessageVImpl(MessageType type, const char* msg, va_list args);
 
-  virtual void FileMessageSImpl(MessageType type, const char* file,
-                                int line, const GoogleString& message);
+  virtual void FileMessageVImpl(MessageType type, const char* filename,
+                                int line, const char* msg, va_list args);
 
  private:
   ngx_uint_t GetNgxLogLevel(MessageType type);

src/ngx_pagespeed.h

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2012 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.
  */
 
-
+// Author: jefftk@google.com (Jeff Kaufman)
 
 #ifndef NGX_PAGESPEED_H_
 #define NGX_PAGESPEED_H_
@@ -37,8 +34,8 @@ extern "C" {
 }
 
 #include "base/logging.h"
-#include "pagespeed/kernel/base/string_util.h"
-#include "pagespeed/kernel/http/response_headers.h"
+#include "net/instaweb/http/public/response_headers.h"
+#include "net/instaweb/util/public/string_util.h"
 
 namespace net_instaweb {
 
@@ -55,7 +52,7 @@ class InPlaceResourceRecorder;
 // NGX_DECLINED immediately unless send_last_buf.
 ngx_int_t string_piece_to_buffer_chain(
     ngx_pool_t* pool, StringPiece sp,
-    ngx_chain_t** link_ptr, bool send_last_buf, bool send_flush);
+    ngx_chain_t** link_ptr, bool send_last_buf);
 
 StringPiece str_to_string_piece(ngx_str_t s);
 
@@ -87,11 +84,15 @@ enum PreserveCachingHeaders {
 typedef struct {
   NgxBaseFetch* base_fetch;
 
+  ngx_connection_t* pagespeed_connection;
   ngx_http_request_t* r;
 
   bool html_rewrite;
   bool in_place;
 
+  bool write_pending;
+  bool fetch_done;
+
   PreserveCachingHeaders preserve_caching_headers;
 
   // for html rewrite
@@ -106,16 +107,8 @@ typedef struct {
   // We need to remember the URL here as well since we may modify what NGX
   // gets by stripping our special query params and honoring X-Forwarded-Proto.
   GoogleString url_string;
-
-  // We need to remember if the upstream had headers_out->location set, because
-  // we should mirror that when we write it back. nginx may absolutify
-  // Location: headers that start with '/' without regarding X-Forwarded-Proto.
-  bool location_field_set;
-  bool psol_vary_accept_only;
-  bool follow_flushes;
 } ps_request_ctx_t;
 
-ps_request_ctx_t* ps_get_request_context(ngx_http_request_t* r);
 
 void copy_request_headers_from_ngx(const ngx_http_request_t* r,
                                    RequestHeaders* headers);
@@ -130,12 +123,6 @@ ngx_int_t copy_response_headers_to_ngx(
 
 StringPiece ps_determine_host(ngx_http_request_t* r);
 
-namespace ps_base_fetch {
-
-ngx_int_t ps_base_fetch_handler(ngx_http_request_t* r);
-
-}  // namespace ps_base_fetch
-
 }  // namespace net_instaweb
 
 #endif  // NGX_PAGESPEED_H_

src/ngx_rewrite_driver_factory.cc

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2012 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.
  */
 
-
+// Author: jefftk@google.com (Jeff Kaufman)
 
 #include "ngx_rewrite_driver_factory.h"
 
@@ -29,30 +26,30 @@
 #include "ngx_server_context.h"
 #include "ngx_url_async_fetcher.h"
 
+#include "net/instaweb/http/public/content_type.h"
 #include "net/instaweb/http/public/rate_controller.h"
 #include "net/instaweb/http/public/rate_controlling_url_async_fetcher.h"
 #include "net/instaweb/http/public/wget_url_fetcher.h"
 #include "net/instaweb/rewriter/public/rewrite_driver.h"
 #include "net/instaweb/rewriter/public/rewrite_driver_factory.h"
 #include "net/instaweb/rewriter/public/server_context.h"
+#include "net/instaweb/system/public/in_place_resource_recorder.h"
+#include "net/instaweb/system/public/serf_url_async_fetcher.h"
+#include "net/instaweb/system/public/system_caches.h"
+#include "net/instaweb/system/public/system_rewrite_options.h"
+#include "net/instaweb/util/public/google_message_handler.h"
+#include "net/instaweb/util/public/null_shared_mem.h"
+#include "net/instaweb/util/public/posix_timer.h"
 #include "net/instaweb/util/public/property_cache.h"
-#include "pagespeed/kernel/base/google_message_handler.h"
-#include "pagespeed/kernel/base/null_shared_mem.h"
-#include "pagespeed/kernel/base/posix_timer.h"
-#include "pagespeed/kernel/base/stdio_file_system.h"
-#include "pagespeed/kernel/base/string.h"
-#include "pagespeed/kernel/base/string_util.h"
-#include "pagespeed/kernel/base/thread_system.h"
-#include "pagespeed/kernel/http/content_type.h"
-#include "pagespeed/kernel/sharedmem/shared_circular_buffer.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_statistics.h"
+#include "net/instaweb/util/public/scheduler_thread.h"
+#include "net/instaweb/util/public/shared_circular_buffer.h"
+#include "net/instaweb/util/public/shared_mem_statistics.h"
+#include "net/instaweb/util/public/slow_worker.h"
+#include "net/instaweb/util/public/stdio_file_system.h"
+#include "net/instaweb/util/public/string.h"
+#include "net/instaweb/util/public/string_util.h"
+#include "net/instaweb/util/public/thread_system.h"
 #include "pagespeed/kernel/thread/pthread_shared_mem.h"
-#include "pagespeed/kernel/thread/scheduler_thread.h"
-#include "pagespeed/kernel/thread/slow_worker.h"
-#include "pagespeed/system/in_place_resource_recorder.h"
-#include "pagespeed/system/serf_url_async_fetcher.h"
-#include "pagespeed/system/system_caches.h"
-#include "pagespeed/system/system_rewrite_options.h"
 
 namespace net_instaweb {
 
@@ -72,6 +69,7 @@ NgxRewriteDriverFactory::NgxRewriteDriverFactory(
     SystemThreadSystem* system_thread_system, StringPiece hostname, int port)
     : SystemRewriteDriverFactory(process_context, system_thread_system,
         NULL /* default shared memory runtime */, hostname, port),
+      main_conf_(NULL),
       threads_started_(false),
       ngx_message_handler_(
           new NgxMessageHandler(timer(), thread_system()->NewMutex())),
@@ -85,9 +83,8 @@ NgxRewriteDriverFactory::NgxRewriteDriverFactory(
       ngx_shared_circular_buffer_(NULL),
       hostname_(hostname.as_string()),
       port_(port),
-      process_script_variables_mode_(ProcessScriptVariablesMode::kOff),
-      process_script_variables_set_(false),
-      shut_down_(false) {
+      process_script_variables_(false),
+      process_script_variables_set_(false) {
   InitializeDefaultOptions();
   default_options()->set_beacon_url("/ngx_pagespeed_beacon");
   SystemRewriteOptions* system_options = dynamic_cast<SystemRewriteOptions*>(
@@ -150,17 +147,18 @@ NamedLockManager* NgxRewriteDriverFactory::DefaultLockManager() {
 
 RewriteOptions* NgxRewriteDriverFactory::NewRewriteOptions() {
   NgxRewriteOptions* options = new NgxRewriteOptions(thread_system());
-  // TODO(jefftk): figure out why using SetDefaultRewriteLevel like
-  // mod_pagespeed does in mod_instaweb.cc:create_dir_config() isn't enough here
-  // -- if you use that instead then ngx_pagespeed doesn't actually end up
-  // defaulting CoreFilters.
-  // See: https://github.com/apache/incubator-pagespeed-ngx/issues/1190
   options->SetRewriteLevel(RewriteOptions::kCoreFilters);
   return options;
 }
 
-RewriteOptions* NgxRewriteDriverFactory::NewRewriteOptionsForQuery() {
-  return new NgxRewriteOptions(thread_system());
+bool NgxRewriteDriverFactory::InitNgxUrlAsyncFetchers() {
+  log_ = ngx_cycle->log;
+  for (size_t i = 0; i < ngx_url_async_fetchers_.size(); ++i) {
+    if (!ngx_url_async_fetchers_[i]->Init()) {
+      return false;
+    }
+  }
+  return true;
 }
 
 bool NgxRewriteDriverFactory::CheckResolver() {
@@ -188,13 +186,6 @@ ServerContext* NgxRewriteDriverFactory::NewServerContext() {
   return NULL;
 }
 
-void NgxRewriteDriverFactory::ShutDown() {
-  if (!shut_down_) {
-    shut_down_ = true;
-    SystemRewriteDriverFactory::ShutDown();
-  }
-}
-
 void NgxRewriteDriverFactory::ShutDownMessageHandlers() {
   ngx_message_handler_->set_buffer(NULL);
   ngx_html_parse_message_handler_->set_buffer(NULL);
@@ -219,19 +210,9 @@ void NgxRewriteDriverFactory::StartThreads() {
   threads_started_ = true;
 }
 
-void NgxRewriteDriverFactory::SetMainConf(NgxRewriteOptions* main_options) {
-  // Propagate process-scope options from the copy we had during nginx option
-  // parsing to our own.
-  if (main_options != NULL) {
-    default_options()->MergeOnlyProcessScopeOptions(*main_options);
-  }
-}
-
-void NgxRewriteDriverFactory::LoggingInit(
-    ngx_log_t* log, bool may_install_crash_handler) {
-  log_ = log;
+void NgxRewriteDriverFactory::LoggingInit(ngx_log_t* log) {
   net_instaweb::log_message_handler::Install(log);
-  if (may_install_crash_handler && install_crash_handler()) {
+  if (install_crash_handler()) {
     NgxMessageHandler::InstallCrashHandler(log);
   }
   ngx_message_handler_->set_log(log);
@@ -269,23 +250,4 @@ void NgxRewriteDriverFactory::InitStats(Statistics* statistics) {
   InPlaceResourceRecorder::InitStats(statistics);
 }
 
-void NgxRewriteDriverFactory::PrepareForkedProcess(const char* name) {
-  ngx_pid = ngx_getpid();  // Needed for logging to have the right PIDs.
-  SystemRewriteDriverFactory::PrepareForkedProcess(name);
-}
-
-void NgxRewriteDriverFactory::NameProcess(const char* name) {
-  SystemRewriteDriverFactory::NameProcess(name);
-
-  // Superclass set status with prctl.  Nginx has a helper function for setting
-  // argv[0] as well, so let's use that.  We'll show up as:
-  //
-  //    nginx: pagespeed $name
-
-  char name_for_setproctitle[32];
-  snprintf(name_for_setproctitle, sizeof(name_for_setproctitle),
-           "pagespeed %s", name);
-  ngx_setproctitle(name_for_setproctitle);
-}
-
 }  // namespace net_instaweb

src/ngx_rewrite_driver_factory.h

@@ -1,32 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2012 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.
  */
 
-
+// Author: jefftk@google.com (Jeff Kaufman)
 
 #ifndef NGX_REWRITE_DRIVER_FACTORY_H_
 #define NGX_REWRITE_DRIVER_FACTORY_H_
 
 extern "C" {
-  #include <ngx_auto_config.h>
-#if (NGX_THREADS)
-  #include <ngx_thread.h>
-#endif
   #include <ngx_core.h>
   #include <ngx_http.h>
   #include <ngx_config.h>
@@ -35,9 +28,13 @@ extern "C" {
 
 #include <set>
 
-#include "pagespeed/kernel/base/md5_hasher.h"
-#include "pagespeed/kernel/base/scoped_ptr.h"
-#include "pagespeed/system/system_rewrite_driver_factory.h"
+#include "net/instaweb/system/public/system_rewrite_driver_factory.h"
+#include "net/instaweb/util/public/md5_hasher.h"
+#include "net/instaweb/util/public/scoped_ptr.h"
+
+// TODO(oschaaf): We should reparent ApacheRewriteDriverFactory and
+// NgxRewriteDriverFactory to a new class OriginRewriteDriverFactory and factor
+// out as much as possible.
 
 namespace net_instaweb {
 
@@ -51,12 +48,6 @@ class SlowWorker;
 class Statistics;
 class SystemThreadSystem;
 
-enum ProcessScriptVariablesMode {
-  kOff,
-  kLegacyRestricted,
-  kAll
-};
-
 class NgxRewriteDriverFactory : public SystemRewriteDriverFactory {
  public:
   // We take ownership of the thread system.
@@ -72,10 +63,10 @@ class NgxRewriteDriverFactory : public SystemRewriteDriverFactory {
   virtual Timer* DefaultTimer();
   virtual NamedLockManager* DefaultLockManager();
   // Create a new RewriteOptions.  In this implementation it will be an
-  // NgxRewriteOptions, and it will have CoreFilters explicitly set.
+  // NgxRewriteOptions.
   virtual RewriteOptions* NewRewriteOptions();
-  virtual RewriteOptions* NewRewriteOptionsForQuery();
   virtual ServerContext* NewDecodingServerContext();
+  bool InitNgxUrlAsyncFetchers();
   // Check resolver configured or not.
   bool CheckResolver();
 
@@ -85,7 +76,6 @@ class NgxRewriteDriverFactory : public SystemRewriteDriverFactory {
   static void InitStats(Statistics* statistics);
   NgxServerContext* MakeNgxServerContext(StringPiece hostname, int port);
   virtual ServerContext* NewServerContext();
-  virtual void ShutDown();
 
   // Starts pagespeed threads if they've not been started already.  Must be
   // called after the caller has finished any forking it intends to do.
@@ -100,7 +90,7 @@ class NgxRewriteDriverFactory : public SystemRewriteDriverFactory {
     InitStats(statistics);
   }
 
-  void SetMainConf(NgxRewriteOptions* main_conf);
+  void set_main_conf(NgxRewriteOptions* main_conf) {  main_conf_ = main_conf; }
 
   void set_resolver(ngx_resolver_t* resolver) {
     resolver_ = resolver;
@@ -121,32 +111,32 @@ class NgxRewriteDriverFactory : public SystemRewriteDriverFactory {
   void set_native_fetcher_max_keepalive_requests(int x) {
     native_fetcher_max_keepalive_requests_ = x;
   }
-  ProcessScriptVariablesMode process_script_variables() {
-    return process_script_variables_mode_;
+  bool process_script_variables() {
+    return process_script_variables_;
   }
 
-  void LoggingInit(ngx_log_t* log, bool may_install_crash_handler);
+  void LoggingInit(ngx_log_t* log);
 
   virtual void ShutDownMessageHandlers();
 
   virtual void SetCircularBuffer(SharedCircularBuffer* buffer);
 
-  bool SetProcessScriptVariables(ProcessScriptVariablesMode mode) {
+  bool SetProcessScriptVariables(bool process_script_variables) {
     if (!process_script_variables_set_) {
-      process_script_variables_mode_ = mode;
+      process_script_variables_ = process_script_variables;
       process_script_variables_set_ = true;
       return true;
     }
     return false;
   }
 
-  virtual void PrepareForkedProcess(const char* name);
-
-  virtual void NameProcess(const char* name);
-
  private:
   Timer* timer_;
 
+  // main_conf will have only options set in the main block.  It may be NULL,
+  // and we do not take ownership.
+  NgxRewriteOptions* main_conf_;
+
   bool threads_started_;
   NgxMessageHandler* ngx_message_handler_;
   NgxMessageHandler* ngx_html_parse_message_handler_;
@@ -167,9 +157,8 @@ class NgxRewriteDriverFactory : public SystemRewriteDriverFactory {
 
   GoogleString hostname_;
   int port_;
-  ProcessScriptVariablesMode process_script_variables_mode_;
+  bool process_script_variables_;
   bool process_script_variables_set_;
-  bool shut_down_;
 
   DISALLOW_COPY_AND_ASSIGN(NgxRewriteDriverFactory);
 };

src/ngx_rewrite_options.cc

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2012 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.
  */
 
-
+// Author: jefftk@google.com (Jeff Kaufman)
 
 #include "ngx_rewrite_options.h"
 
@@ -33,9 +30,9 @@ extern "C" {
 #include "net/instaweb/public/version.h"
 #include "net/instaweb/rewriter/public/file_load_policy.h"
 #include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "pagespeed/kernel/base/message_handler.h"
-#include "pagespeed/kernel/base/timer.h"
-#include "pagespeed/system/system_caches.h"
+#include "net/instaweb/system/public/system_caches.h"
+#include "net/instaweb/util/public/message_handler.h"
+#include "net/instaweb/util/public/timer.h"
 
 namespace net_instaweb {
 
@@ -115,7 +112,7 @@ void NgxRewriteOptions::AddProperties() {
       false);
   add_ngx_option(
       "", &NgxRewriteOptions::global_statistics_path_, "ngsp",
-      kGlobalStatisticsPath, kProcessScopeStrict,
+      kGlobalStatisticsPath, kProcessScope,
       "Set the global statistics path. Ex: /ngx_pagespeed_global_statistics",
       false);
   add_ngx_option(
@@ -130,8 +127,7 @@ void NgxRewriteOptions::AddProperties() {
       kServerScope, "Set the admin path.  Ex: /pagespeed_admin", false);
   add_ngx_option(
       "", &NgxRewriteOptions::global_admin_path_, "ngap", kGlobalAdminPath,
-      kProcessScopeStrict,
-      "Set the global admin path.  Ex: /pagespeed_global_admin",
+      kProcessScope, "Set the global admin path.  Ex: /pagespeed_global_admin",
       false);
 
   MergeSubclassProperties(ngx_properties_);
@@ -184,10 +180,10 @@ RewriteOptions::OptionScope NgxRewriteOptions::GetOptionScope(
        it != all_options().end(); ++it) {
     RewriteOptions::OptionBase* option = *it;
     if (option->option_name() == option_name) {
-      // We treat kLegacyProcessScope as kProcessScopeStrict, failing to start
-      // if an option is out of place.
-      return option->scope() == kLegacyProcessScope ? kProcessScopeStrict
-                                                    : option->scope();
+      // We treat kProcessScope as kProcessScopeStrict, failing to start if an
+      // option is out of place.
+      return option->scope() == kProcessScope ? kProcessScopeStrict
+                                              : option->scope();
     }
   }
   return kDirectoryScope;
@@ -195,18 +191,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;
 }
 
@@ -265,8 +258,7 @@ const char* ps_error_string_for_option(
 const char* NgxRewriteOptions::ParseAndSetOptions(
     StringPiece* args, int n_args, ngx_pool_t* pool, MessageHandler* handler,
     NgxRewriteDriverFactory* driver_factory,
-    RewriteOptions::OptionScope scope, ngx_conf_t* cf,
-    ProcessScriptVariablesMode script_mode) {
+    RewriteOptions::OptionScope scope, ngx_conf_t* cf, bool compile_scripts) {
   CHECK_GE(n_args, 1);
 
   StringPiece directive = args[0];
@@ -282,43 +274,14 @@ const char* NgxRewriteOptions::ParseAndSetOptions(
         pool, directive, "cannot be set at this scope.");
   }
 
-  bool compile_scripts = false;
-
-  if (script_mode != ProcessScriptVariablesMode::kOff) {
-    // In the old mode we only allowed a few, so restrict to those.
-    compile_scripts =
-        StringCaseStartsWith(directive, "LoadFromFile") ||
-        StringCaseEqual(directive, "EnableFilters") ||
-        StringCaseEqual(directive, "DisableFilters") ||
-        StringCaseEqual(directive, "DownstreamCachePurgeLocationPrefix") ||
-        StringCaseEqual(directive, "DownstreamCachePurgeMethod") ||
-        StringCaseEqual(directive,
-                        "DownstreamCacheRewrittenPercentageThreshold") ||
-        StringCaseEqual(directive, "ShardDomain");
-    // In the new behaviour we also allow scripting of query- and directory-
-    // scoped options.
-    compile_scripts |=
-        script_mode == ProcessScriptVariablesMode::kAll &&
-        (GetOptionScope(directive) <= RewriteOptions::kDirectoryScope ||
-         (StringCaseEqual(directive, "Allow") ||
-          StringCaseEqual(directive, "BlockingRewriteRefererUrls") ||
-          StringCaseEqual(directive, "Disallow") ||
-          StringCaseEqual(directive, "DistributableFilters") ||
-          StringCaseEqual(directive, "Domain") ||
-          StringCaseEqual(directive, "ExperimentVariable") ||
-          StringCaseEqual(directive, "ExperimentSpec") ||
-          StringCaseEqual(directive, "ForbidFilters") ||
-          StringCaseEqual(directive, "RetainComment") ||
-          StringCaseEqual(directive, "CustomFetchHeader") ||
-          StringCaseEqual(directive, "MapOriginDomain") ||
-          StringCaseEqual(directive, "MapProxyDomain") ||
-          StringCaseEqual(directive, "MapRewriteDomain") ||
-          StringCaseEqual(directive, "UrlValuedAttribute") ||
-          StringCaseEqual(directive, "Library")));
-  }
-
   ScriptLine* script_line;
   script_line = NULL;
+  // Only allow script variable support for LoadFromFile for now.
+  // Note that LoadFromFile should not be scriptable on wildcard hosts,
+  // as browsers might be able to manipulate its natural use-case: $http_host.
+  if (!StringCaseStartsWith(directive, "LoadFromFile")) {
+    compile_scripts = false;
+  }
 
   if (n_args == 1 && StringCaseEqual(directive, "ClearInheritedScripts")) {
     clear_inherited_scripts_ = true;
@@ -394,23 +357,24 @@ const char* NgxRewriteOptions::ParseAndSetOptions(
       }
     } else if (StringCaseEqual("ProcessScriptVariables", args[0])) {
       if (scope == RewriteOptions::kProcessScopeStrict) {
-        ProcessScriptVariablesMode mode;
-        if (StringCaseEqual(arg, "all")) {
-          mode = ProcessScriptVariablesMode::kAll;
-        } else if (StringCaseEqual(arg, "on")) {
-          mode = ProcessScriptVariablesMode::kLegacyRestricted;
+        if (StringCaseEqual(arg, "on")) {
+          if (driver_factory->SetProcessScriptVariables(true)) {
+            result = RewriteOptions::kOptionOk;
+          } else {
+            return const_cast<char*>(
+                "pagespeed ProcessScriptVariables: can only be set once");
+          }
         } else if (StringCaseEqual(arg, "off")) {
-          mode = ProcessScriptVariablesMode::kOff;
+          if (driver_factory->SetProcessScriptVariables(false)) {
+            result = RewriteOptions::kOptionOk;
+          } else {
+            return const_cast<char*>(
+                "pagespeed ProcessScriptVariables: can only be set once");
+          }
         } else {
           return const_cast<char*>(
               "pagespeed ProcessScriptVariables: invalid value");
         }
-        if (driver_factory->SetProcessScriptVariables(mode)) {
-          result = RewriteOptions::kOptionOk;
-        } else {
-          return const_cast<char*>(
-              "pagespeed ProcessScriptVariables: can only be set once");
-        }
       } else {
         return const_cast<char*>(
             "ProcessScriptVariables is only allowed at the top level");
@@ -421,7 +385,7 @@ const char* NgxRewriteOptions::ParseAndSetOptions(
         result = driver_factory->ParseAndSetOption1(
             directive,
             arg,
-            scope >= RewriteOptions::kLegacyProcessScope,
+            scope >= RewriteOptions::kProcessScope,
             &msg,
             handler);
       }
@@ -434,7 +398,7 @@ const char* NgxRewriteOptions::ParseAndSetOptions(
           directive,
           args[1],
           args[2],
-          scope >= RewriteOptions::kLegacyProcessScope,
+          scope >= RewriteOptions::kProcessScope,
           &msg,
           handler);
     }
@@ -506,7 +470,7 @@ bool NgxRewriteOptions::ExecuteScriptVariables(
 
       const char* status = ParseAndSetOptions(args, script_line->n_args(),
           r->pool, handler, driver_factory, script_line->scope(), NULL /*cf*/,
-          ProcessScriptVariablesMode::kOff);
+          false /*compile scripts*/);
 
       if (status != NULL) {
         script_error = true;
@@ -546,6 +510,10 @@ NgxRewriteOptions* NgxRewriteOptions::Clone() const {
   return options;
 }
 
+void NgxRewriteOptions::Merge(const RewriteOptions& src) {
+  SystemRewriteOptions::Merge(src);
+}
+
 const NgxRewriteOptions* NgxRewriteOptions::DynamicCast(
     const RewriteOptions* instance) {
   return dynamic_cast<const NgxRewriteOptions*>(instance);

src/ngx_rewrite_options.h

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2012 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.
  */
 
-
+// Author: jefftk@google.com (Jeff Kaufman)
 
 // Manage configuration for pagespeed.  Compare to ApacheConfig.
 
@@ -32,13 +29,11 @@ extern "C" {
 
 #include <vector>
 
-#include "ngx_rewrite_driver_factory.h"
-
+#include "net/instaweb/util/public/message_handler.h"
+#include "net/instaweb/util/public/ref_counted_ptr.h"
+#include "net/instaweb/util/public/stl_util.h"          // for STLDeleteElements
 #include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "pagespeed/kernel/base/message_handler.h"
-#include "pagespeed/kernel/base/ref_counted_ptr.h"
-#include "pagespeed/kernel/base/stl_util.h"          // for STLDeleteElements
-#include "pagespeed/system/system_rewrite_options.h"
+#include "net/instaweb/system/public/system_rewrite_options.h"
 
 #define NGX_PAGESPEED_MAX_ARGS 10
 
@@ -136,7 +131,7 @@ class NgxRewriteOptions : public SystemRewriteOptions {
   const char* ParseAndSetOptions(
       StringPiece* args, int n_args, ngx_pool_t* pool, MessageHandler* handler,
       NgxRewriteDriverFactory* driver_factory, OptionScope scope,
-      ngx_conf_t* cf, ProcessScriptVariablesMode script_mode);
+      ngx_conf_t* cf, bool compile_scripts);
   bool ExecuteScriptVariables(
       ngx_http_request_t* r, MessageHandler* handler,
       NgxRewriteDriverFactory* driver_factory);
@@ -145,6 +140,7 @@ class NgxRewriteOptions : public SystemRewriteOptions {
 
   // Make an identical copy of these options and return it.
   virtual NgxRewriteOptions* Clone() const;
+  virtual void Merge(const RewriteOptions& src);
 
   // Returns a suitably down cast version of 'instance' if it is an instance
   // of this class, NULL if not.

src/ngx_server_context.cc

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2012 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.
  */
 
-
+// Author: jefftk@google.com (Jeff Kaufman)
 
 #include "ngx_server_context.h"
 
@@ -30,16 +27,15 @@ extern "C" {
 #include "ngx_rewrite_driver_factory.h"
 #include "ngx_rewrite_options.h"
 #include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "pagespeed/system/add_headers_fetcher.h"
-#include "pagespeed/system/loopback_route_fetcher.h"
-#include "pagespeed/system/system_request_context.h"
+#include "net/instaweb/system/public/add_headers_fetcher.h"
+#include "net/instaweb/system/public/loopback_route_fetcher.h"
+#include "net/instaweb/system/public/system_request_context.h"
 
 namespace net_instaweb {
 
 NgxServerContext::NgxServerContext(
     NgxRewriteDriverFactory* factory, StringPiece hostname, int port)
-    : SystemServerContext(factory, hostname, port),
-      ngx_http2_variable_index_(NGX_ERROR) {
+    : SystemServerContext(factory, hostname, port) {
 }
 
 NgxServerContext::~NgxServerContext() { }
@@ -52,7 +48,7 @@ SystemRequestContext* NgxServerContext::NewRequestContext(
     ngx_http_request_t* r) {
   // Based on ngx_http_variable_server_port.
   bool port_set = false;
-  int local_port = 0;
+  int local_port;
 #if (NGX_HAVE_INET6)
   if (r->connection->local_sockaddr->sa_family == AF_INET6) {
     local_port = ntohs(reinterpret_cast<struct sockaddr_in6*>(
@@ -74,23 +70,11 @@ SystemRequestContext* NgxServerContext::NewRequestContext(
     local_ip.len = 0;
   }
 
-  SystemRequestContext* ctx = new SystemRequestContext(
-      thread_system()->NewMutex(), timer(),
-      ps_determine_host(r), local_port, str_to_string_piece(local_ip));
-
-  // See if http2 is in use.
-  if (ngx_http2_variable_index_ >= 0) {
-    ngx_http_variable_value_t* val =
-        ngx_http_get_indexed_variable(r, ngx_http2_variable_index_);
-    if (val != NULL && val->valid) {
-      StringPiece str_val(reinterpret_cast<char*>(val->data), val->len);
-      if (str_val == "h2" || str_val == "h2c") {
-        ctx->set_using_http2(true);
-      }
-    }
-  }
-
-  return ctx;
+  return new SystemRequestContext(thread_system()->NewMutex(),
+                                  timer(),
+                                  ps_determine_host(r),
+                                  local_port,
+                                  str_to_string_piece(local_ip));
 }
 
 GoogleString NgxServerContext::FormatOption(StringPiece option_name,

src/ngx_server_context.h

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2012 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.
  */
 
-
+// Author: jefftk@google.com (Jeff Kaufman)
 
 // Manage pagespeed state across requests.  Compare to ApacheResourceManager.
 
@@ -25,7 +22,7 @@
 #define NGX_SERVER_CONTEXT_H_
 
 #include "ngx_message_handler.h"
-#include "pagespeed/system/system_server_context.h"
+#include "net/instaweb/system/public/system_server_context.h"
 
 extern "C" {
 #include <ngx_http.h>
@@ -43,9 +40,8 @@ class NgxServerContext : public SystemServerContext {
       NgxRewriteDriverFactory* factory, StringPiece hostname, int port);
   virtual ~NgxServerContext();
 
-  // We don't allow ProxyFetch to fetch HTML via MapProxyDomain. We will call
-  // set_trusted_input() on any ProxyFetches we use to transform internal HTML.
-  virtual bool ProxiesHtml() const { return false; }
+  // We expect to use ProxyFetch with HTML.
+  virtual bool ProxiesHtml() const { return true; }
 
   // Call only when you need an NgxRewriteOptions.  If you don't need
   // nginx-specific behavior, call global_options() instead which doesn't
@@ -61,18 +57,8 @@ class NgxServerContext : public SystemServerContext {
 
   virtual GoogleString FormatOption(StringPiece option_name, StringPiece args);
 
-  void set_ngx_http2_variable_index(ngx_int_t idx) {
-    ngx_http2_variable_index_ = idx;
-  }
-
-  ngx_int_t ngx_http2_variable_index() const {
-    return ngx_http2_variable_index_;
-  }
-
  private:
   NgxRewriteDriverFactory* ngx_factory_;
-  // what index the "http2" var is, or NGX_ERROR.
-  ngx_int_t ngx_http2_variable_index_;
 
   DISALLOW_COPY_AND_ASSIGN(NgxServerContext);
 };

src/ngx_url_async_fetcher.cc

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2012 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.
  */
 
-
+// Author: x.dinic@gmail.com (Junmin Xiong)
 
 extern "C" {
   #include <ngx_http.h>
@@ -34,22 +31,22 @@ extern "C" {
 #include <map>
 #include <set>
 
+#include "net/instaweb/util/public/basictypes.h"
 #include "net/instaweb/http/public/async_fetch.h"
 #include "net/instaweb/http/public/inflating_fetch.h"
+#include "net/instaweb/http/public/request_headers.h"
+#include "net/instaweb/http/public/response_headers.h"
+#include "net/instaweb/http/public/response_headers_parser.h"
 #include "net/instaweb/public/version.h"
-#include "pagespeed/kernel/base/basictypes.h"
-#include "pagespeed/kernel/base/condvar.h"
-#include "pagespeed/kernel/base/message_handler.h"
-#include "pagespeed/kernel/base/pool.h"
-#include "pagespeed/kernel/base/pool_element.h"
-#include "pagespeed/kernel/base/statistics.h"
-#include "pagespeed/kernel/base/string_util.h"
-#include "pagespeed/kernel/base/thread_system.h"
-#include "pagespeed/kernel/base/timer.h"
-#include "pagespeed/kernel/base/writer.h"
-#include "pagespeed/kernel/http/request_headers.h"
-#include "pagespeed/kernel/http/response_headers.h"
-#include "pagespeed/kernel/http/response_headers_parser.h"
+#include "net/instaweb/util/public/condvar.h"
+#include "net/instaweb/util/public/message_handler.h"
+#include "net/instaweb/util/public/pool.h"
+#include "net/instaweb/util/public/pool_element.h"
+#include "net/instaweb/util/public/statistics.h"
+#include "net/instaweb/util/public/string_util.h"
+#include "net/instaweb/util/public/thread_system.h"
+#include "net/instaweb/util/public/timer.h"
+#include "net/instaweb/util/public/writer.h"
 
 namespace net_instaweb {
 
@@ -68,8 +65,7 @@ namespace net_instaweb {
       thread_system_(thread_system),
       message_handler_(handler),
       mutex_(NULL),
-      max_keepalive_requests_(max_keepalive_requests),
-      event_connection_(NULL) {
+      max_keepalive_requests_(max_keepalive_requests) {
     resolver_timeout_ = resolver_timeout;
     fetch_timeout_ = fetch_timeout;
     ngx_memzero(&proxy_, sizeof(proxy_));
@@ -80,17 +76,12 @@ namespace net_instaweb {
     mutex_ = thread_system_->NewMutex();
     log_ = log;
     pool_ = NULL;
+    command_connection_ = NULL;
+    pipe_fd_ = -1;
     resolver_ = resolver;
-    // If init fails, set shutdown_ so no fetches will be attempted.
-    if (!Init(const_cast<ngx_cycle_t*>(ngx_cycle))) {
-      shutdown_ = true;
-      message_handler_->Message(
-          kError, "NgxUrlAsyncFetcher failed to init, fetching disabled.");
-    }
   }
 
   NgxUrlAsyncFetcher::~NgxUrlAsyncFetcher() {
-    DCHECK(shutdown_)  << "Shut down before destructing NgxUrlAsyncFetcher.";
     message_handler_->Message(
         kInfo,
         "Destruct NgxUrlAsyncFetcher with [%d] active fetchers",
@@ -98,12 +89,19 @@ namespace net_instaweb {
 
     CancelActiveFetches();
     active_fetches_.DeleteAll();
-    NgxConnection::Terminate();
 
     if (pool_ != NULL) {
       ngx_destroy_pool(pool_);
       pool_ = NULL;
     }
+    if (command_connection_ != NULL) {
+      ngx_close_connection(command_connection_);
+      command_connection_ = NULL;
+    }
+    if (pipe_fd_ != -1) {
+      close(pipe_fd_);
+      pipe_fd_ = -1;
+    }
     if (mutex_ != NULL) {
       delete mutex_;
       mutex_ = NULL;
@@ -154,13 +152,9 @@ namespace net_instaweb {
 
   // Create the pool for fetcher, create the pipe, add the read event for main
   // thread. It should be called in the worker process.
-  bool NgxUrlAsyncFetcher::Init(ngx_cycle_t* cycle) {
-    log_ = cycle->log;
-    CHECK(event_connection_ == NULL) << "event connection already set";
-    event_connection_ = new NgxEventConnection(ReadCallback);
-    if (!event_connection_->Init(cycle)) {
-      return false;
-    }
+  bool NgxUrlAsyncFetcher::Init() {
+    log_ = ngx_cycle->log;
+
     if (pool_ == NULL) {
       pool_ = ngx_create_pool(4096, log_);
       if (pool_ == NULL) {
@@ -170,6 +164,41 @@ namespace net_instaweb {
       }
     }
 
+    int pipe_fds[2];
+    int rc = pipe(pipe_fds);
+    if (rc != 0) {
+      ngx_log_error(NGX_LOG_ERR, log_, 0, "pipe() failed");
+      return false;
+    }
+    if (ngx_nonblocking(pipe_fds[0]) == -1) {
+      ngx_log_error(NGX_LOG_ERR, log_, 0, "nonblocking pipe[0] failed");
+      return false;
+    }
+    if (ngx_nonblocking(pipe_fds[1]) == -1) {
+      ngx_log_error(NGX_LOG_ERR, log_, 0, "nonblocking pipe[1] failed");
+      return false;
+    }
+
+    pipe_fd_ = pipe_fds[1];
+    command_connection_ = ngx_get_connection(pipe_fds[0], log_);
+    if (command_connection_ == NULL) {
+      close(pipe_fds[1]);
+      close(pipe_fds[0]);
+      pipe_fd_ = -1;
+      return false;
+    }
+
+    command_connection_->recv = ngx_recv;
+    command_connection_->send = ngx_send;
+    command_connection_->recv_chain = ngx_recv_chain;
+    command_connection_->send_chain = ngx_send_chain;
+    command_connection_->log = log_;
+    command_connection_->read->log = log_;
+    command_connection_->write->log = log_;
+    command_connection_->data = this;
+    command_connection_->read->handler = CommandHandler;
+    ngx_add_event(command_connection_->read, NGX_READ_EVENT, 0);
+
     if (proxy_.url.len == 0) {
       return true;
     }
@@ -185,29 +214,8 @@ namespace net_instaweb {
   }
 
   void NgxUrlAsyncFetcher::ShutDown() {
-    shutdown_ = true;
-    if (!pending_fetches_.empty()) {
-      for (Pool<NgxFetch>::iterator p = pending_fetches_.begin(),
-           e = pending_fetches_.end(); p != e; p++) {
-        NgxFetch* fetch = *p;
-        fetch->CallbackDone(false);
-      }
-      pending_fetches_.DeleteAll();
-    }
-
-    if (!active_fetches_.empty()) {
-      for (Pool<NgxFetch>::iterator p = active_fetches_.begin(),
-           e = active_fetches_.end(); p != e; p++) {
-        NgxFetch* fetch = *p;
-        fetch->CallbackDone(false);
-      }
-      active_fetches_.Clear();
-    }
-    if (event_connection_ != NULL) {
-      event_connection_->Shutdown();
-      delete event_connection_;
-      event_connection_ = NULL;
-    }
+      shutdown_ = true;
+      SendCmd('S');
   }
 
   // It's called in the rewrite thread. All the fetches are started at
@@ -215,46 +223,92 @@ namespace net_instaweb {
   void NgxUrlAsyncFetcher::Fetch(const GoogleString& url,
                                  MessageHandler* message_handler,
                                  AsyncFetch* async_fetch) {
-    // Don't accept new fetches when shut down. This flow is also entered when
-    // we did not initialize properly in ::Init().
-    if (shutdown_) {
-      async_fetch->Done(false);
-      return;
-    }
     async_fetch = EnableInflation(async_fetch);
     NgxFetch* fetch = new NgxFetch(url, async_fetch,
           message_handler, log_);
     ScopedMutex lock(mutex_);
     pending_fetches_.Add(fetch);
+    SendCmd('F');
+  }
 
-    // TODO(oschaaf): thread safety on written vs shutdown.
-    // It is possible that shutdown() is called after writing an event? In that
-    // case, this could (rarely) fail when it shouldn't.
-    bool written = event_connection_->WriteEvent(this);
-    CHECK(written || shutdown_) << "NgxUrlAsyncFetcher: event write failure";
+  // send command to nginx main thread
+  // 'F' : start a fetch
+  // 'S' : shutdown the fetcher
+  bool NgxUrlAsyncFetcher::SendCmd(const char command) {
+    int rc;
+    while (true) {
+      rc = write(pipe_fd_, &command, 1);
+      if (rc == 1) {
+        return true;
+      } else if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) {
+        // TODO(junmin): It's rare. But it need be fixed.
+      } else {
+        return false;
+      }
+    }
+    return true;
   }
 
   // This is the read event which is called in the main thread.
   // It will do the real work. Add the work event and start the fetch.
-  void NgxUrlAsyncFetcher::ReadCallback(const ps_event_data& data) {
-    std::vector<NgxFetch*> to_start;
-    NgxUrlAsyncFetcher* fetcher = reinterpret_cast<NgxUrlAsyncFetcher*>(
-      data.sender);
+  void NgxUrlAsyncFetcher::CommandHandler(ngx_event_t* cmdev) {
+    char command;
+    int rc;
+    ngx_connection_t* c = static_cast<ngx_connection_t*>(cmdev->data);
+    NgxUrlAsyncFetcher* fetcher = static_cast<NgxUrlAsyncFetcher*>(c->data);
+    do {
+      rc = read(c->fd, &command, 1);
+    } while (rc == -1 && errno == EINTR);
 
-    fetcher->mutex_->Lock();
-    fetcher->completed_fetches_.DeleteAll();
+    CHECK(rc == -1 || rc == 0 || rc == 1);
 
-    for (Pool<NgxFetch>::iterator p = fetcher->pending_fetches_.begin(),
-             e = fetcher->pending_fetches_.end(); p != e; p++) {
-      NgxFetch* fetch = *p;
-      to_start.push_back(fetch);
+    if (rc == -1 || rc == 0) {
+      // EAGAIN
+      return;
     }
 
-    fetcher->pending_fetches_.Clear();
-    fetcher->mutex_->Unlock();
+    std::vector<NgxFetch*> to_start;
 
-    for (size_t i = 0; i < to_start.size(); i++) {
-      fetcher->StartFetch(to_start[i]);
+    switch (command) {
+      // All the new fetches are appended in the pending_fetches.
+      // Start all these fetches.
+      case 'F':
+        fetcher->mutex_->Lock();
+        fetcher->completed_fetches_.DeleteAll();
+        for (Pool<NgxFetch>::iterator p = fetcher->pending_fetches_.begin(),
+                 e = fetcher->pending_fetches_.end(); p != e; p++) {
+          NgxFetch* fetch = *p;
+          to_start.push_back(fetch);
+        }
+
+        fetcher->pending_fetches_.Clear();
+        fetcher->mutex_->Unlock();
+
+        for (size_t i = 0; i < to_start.size(); i++) {
+          fetcher->StartFetch(to_start[i]);
+        }
+        CHECK(ngx_handle_read_event(cmdev, 0) == NGX_OK);
+        break;
+
+      // Shutdown all the fetches.
+      case 'S':
+        if (!fetcher->pending_fetches_.empty()) {
+          fetcher->pending_fetches_.DeleteAll();
+        }
+
+        if (!fetcher->active_fetches_.empty()) {
+          for (Pool<NgxFetch>::iterator p = fetcher->active_fetches_.begin(),
+               e = fetcher->active_fetches_.end(); p != e; p++) {
+            NgxFetch* fetch = *p;
+            fetch->CallbackDone(false);
+          }
+          fetcher->active_fetches_.Clear();
+        }
+        CHECK(ngx_del_event(cmdev, NGX_READ_EVENT, 0) == NGX_OK);
+        break;
+
+      default:
+        break;
     }
 
     return;

src/ngx_url_async_fetcher.h

@@ -1,23 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
+ * Copyright 2012 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.
  */
 
-
+// Author: x.dinic@gmail.com(Junmin Xiong)
 //
 // Fetch the resources asynchronously in Nginx. The fetcher is called in
 // the rewrite thread.
@@ -36,14 +33,11 @@ extern "C" {
 }
 
 #include <vector>
-
-#include "ngx_event_connection.h"
-
 #include "net/instaweb/http/public/url_async_fetcher.h"
-#include "pagespeed/kernel/base/basictypes.h"
-#include "pagespeed/kernel/base/pool.h"
-#include "pagespeed/kernel/base/string.h"
-#include "pagespeed/kernel/base/thread_system.h"
+#include "net/instaweb/util/public/basictypes.h"
+#include "net/instaweb/util/public/pool.h"
+#include "net/instaweb/util/public/string.h"
+#include "net/instaweb/util/public/thread_system.h"
 
 
 namespace net_instaweb {
@@ -66,20 +60,21 @@ class NgxUrlAsyncFetcher : public UrlAsyncFetcher {
 
   // It should be called in the module init_process callback function. Do some
   // intializations which can't be done in the master process
-  bool Init(ngx_cycle_t* cycle);
+  bool Init();
 
   // shutdown all the fetches.
   virtual void ShutDown();
 
-  // the read handler in the main thread
-  static void ReadCallback(const ps_event_data& data);
-
   virtual bool SupportsHttps() const { return false; }
 
   virtual void Fetch(const GoogleString& url,
                      MessageHandler* message_handler,
                      AsyncFetch* callback);
 
+  // send the command from the current thread to main thread
+  bool SendCmd(const char command);
+  // the read handler in the main thread
+  static void CommandHandler(ngx_event_t* cmdev);
   bool StartFetch(NgxFetch* fetch);
 
   // Remove the completed fetch from the active fetch set, and put it into a
@@ -142,13 +137,13 @@ class NgxUrlAsyncFetcher : public UrlAsyncFetcher {
 
   ngx_pool_t* pool_;
   ngx_log_t* log_;
+  ngx_connection_t* command_connection_;  // the command pipe
+  int pipe_fd_;  // the write pipe end
   ngx_resolver_t* resolver_;
   int max_keepalive_requests_;
   ngx_msec_t resolver_timeout_;
   ngx_msec_t fetch_timeout_;
 
-  NgxEventConnection* event_connection_;
-
   DISALLOW_COPY_AND_ASSIGN(NgxUrlAsyncFetcher);
 };
 

test/run_tests.sh

@@ -1,21 +1,21 @@
 #!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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.
-
+#
+# 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.
+#
+# Author: jefftk@google.com (Jeff Kaufman)
+#
 # Runs ngx_pagespeed system tests.
 #
 # Exits with status 0 if all tests pass.
@@ -23,19 +23,10 @@
 # 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
+#   ./run_tests.sh primary_port secondary_port mod_pagespeed_dir
+# Example:
+#   ./run_tests.sh 8050 8051 /path/to/mod_pagespeed
 #
-# 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:
-#   PRIMARY_PORT=1234 ./run_tests.sh /.../mod_pagespeed /.../nginx/binary
 
 # Normally we test only with the native fetcher off.  Set
 # TEST_NATIVE_FETCHER=true to also test the native fetcher, set
@@ -52,37 +43,26 @@ 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 4 ] ; then
+  echo "Usage: $0 primary_port secondary_port mod_pagespeed_dir"
+  echo "  nginx_executable"
   exit 2
 fi
 
-: ${PRIMARY_PORT:=8050}
-: ${SECONDARY_PORT:=8051}
-: ${CONTROLLER_PORT:=8053}
-: ${RCPORT:=9991}
-: ${PAGESPEED_TEST_HOST:=selfsigned.modpagespeed.com}
-: ${PHP_PORT:=9000}
+PRIMARY_PORT="$1"
+SECONDARY_PORT="$2"
+MOD_PAGESPEED_DIR="$3"
+NGINX_EXECUTABLE="$4"
 
 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" \
     MOD_PAGESPEED_DIR="$MOD_PAGESPEED_DIR" \
     NGINX_EXECUTABLE="$NGINX_EXECUTABLE" \
-    PAGESPEED_TEST_HOST="$PAGESPEED_TEST_HOST" \
     RUN_TESTS="$RUN_TESTS" \
-    CONTROLLER_PORT="$CONTROLLER_PORT" \
-    RCPORT="$RCPORT" \
     bash "$this_dir/nginx_system_test.sh"
   STATUS=$?
   echo "With $@ setup."

test/valgrind.sup

@@ -1,19 +1,19 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
+# 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.
+#
+# Author: oschaaf@we-amp.com (Otto van der Schaaf)
+
 
 # The first few suppressions can be found in other modules
 # and easily found when searched for, and seem false positives.
@@ -101,7 +101,7 @@
    fun:ngx_process_events_and_timers
    fun:ngx_worker_process_cycle
 }
-# Mentioned in https://github.com/apache/incubator-pagespeed-ngx/issues/103
+# Mentioned in https://github.com/pagespeed/ngx_pagespeed/issues/103
 # Assuming a false postives as the issue is closed.
 {
    <nginx false positive>
@@ -163,31 +163,3 @@
    fun:_ZN3re23DFA10AddToQueueEPNS0_5WorkqEij
    ...
 }
-
-{
-   <re2 uninitialized value in optimized code>
-   Memcheck:Value8
-   fun:_ZNK3re210SparseSetTIvE8containsEi
-   ...
-}
-
-{
-   <re2 uninitialized value in optimized code>
-   Memcheck:Cond
-   fun:_ZNK3re210SparseSetTIvE8containsEi
-   ...
-}
-
-{
-   <re2 uninitialized value in optimized code>
-   Memcheck:Value8
-   fun:_ZNK3re211SparseArrayIiE9has_indexEi
-   ...
-}
-
-{
-   <re2 uninitialized value in optimized code>
-   Memcheck:Cond
-   fun:_ZNK3re211SparseArrayIiE9has_indexEi
-   ...
-}