Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Otto van der Schaaf
|
4aeb203468 | ||
|
Otto van der Schaaf
|
30e85eff1f | ||
|
Otto van der Schaaf
|
b3c883d54f | ||
|
Dibyendu Das
|
f73a591738 | ||
|
Nico Berlee
|
ced02f1821 | ||
|
Otto van der Schaaf
|
24fe429a6f | ||
|
Elena Tverdokhlib
|
61a4b592d2 | ||
|
Nico Berlee
|
c24e387462 | ||
|
Jimmy Casey
|
1ca55ba5d7 | ||
|
David Sanders
|
3bb65a9055 | ||
|
David Sanders
|
449045f982 | ||
|
David Sanders
|
98d353ebf4 | ||
|
David Sanders
|
343851a930 | ||
|
Otto van der Schaaf
|
2e202e5c8d | ||
|
Otto van der Schaaf
|
c48ca9e990 | ||
|
Otto van der Schaaf
|
daf1d9446c | ||
|
Otto van der Schaaf
|
4f1565bb2a | ||
|
Otto van der Schaaf
|
e733a838c3 | ||
|
Otto van der Schaaf
|
ccaa714a85 | ||
|
Otto van der Schaaf
|
ab07fb8968 | ||
|
Otto van der Schaaf
|
605e61f0a7 |
@@ -0,0 +1,17 @@
|
||||
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
|
||||
+1
-1
@@ -1 +1 @@
|
||||
https://dl.google.com/dl/page-speed/psol/1.13.35.1-$BIT_SIZE_NAME.tar.gz
|
||||
https://dist.apache.org/repos/dist/release/incubator/pagespeed/1.14.36.1/x64/psol-1.14.36.1-apache-incubating-$BIT_SIZE_NAME.tar.gz
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
[](https://travis-ci.org/pagespeed/ngx_pagespeed)
|
||||
[](https://travis-ci.org/apache/incubator-pagespeed-ngx)
|
||||
|
||||
ngx_pagespeed speeds up your site and reduces page load time by automatically
|
||||
applying web performance best practices to pages and associated assets (CSS,
|
||||
|
||||
@@ -35,7 +35,7 @@ if [ "$mod_pagespeed_dir" = "unset" ] ; then
|
||||
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/pagespeed/ngx_pagespeed/wiki/Building-PSOL-From-Source"
|
||||
https://github.com/apache/incubator-pagespeed-ngx/wiki/Building-PSOL-From-Source"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
+18
@@ -1,6 +1,24 @@
|
||||
# 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
|
||||
|
||||
@@ -0,0 +1,187 @@
|
||||
# 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).
|
||||
|
||||
|
||||
|
||||
# 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.
|
||||
@@ -0,0 +1,230 @@
|
||||
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;"]
|
||||
@@ -0,0 +1,32 @@
|
||||
|
||||
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;
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
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;
|
||||
#}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
@@ -0,0 +1,31 @@
|
||||
--- 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.
|
||||
|
||||
@@ -0,0 +1,141 @@
|
||||
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': [
|
||||
@@ -0,0 +1,11 @@
|
||||
--- 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
|
||||
@@ -0,0 +1,13 @@
|
||||
--- 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.
|
||||
@@ -0,0 +1,64 @@
|
||||
--- 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 {
|
||||
@@ -0,0 +1,231 @@
|
||||
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;"]
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
|
||||
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;
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
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;
|
||||
#}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
@@ -0,0 +1,31 @@
|
||||
--- 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.
|
||||
|
||||
@@ -0,0 +1,141 @@
|
||||
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': [
|
||||
@@ -0,0 +1,11 @@
|
||||
--- 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
|
||||
@@ -0,0 +1,13 @@
|
||||
--- 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.
|
||||
@@ -0,0 +1,64 @@
|
||||
--- 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 {
|
||||
@@ -0,0 +1,230 @@
|
||||
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;"]
|
||||
@@ -0,0 +1,32 @@
|
||||
|
||||
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;
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
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;
|
||||
#}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
@@ -0,0 +1,31 @@
|
||||
--- 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.
|
||||
|
||||
@@ -0,0 +1,141 @@
|
||||
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': [
|
||||
@@ -0,0 +1,11 @@
|
||||
--- 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
|
||||
@@ -0,0 +1,13 @@
|
||||
--- 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.
|
||||
@@ -0,0 +1,64 @@
|
||||
--- 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 {
|
||||
@@ -0,0 +1,235 @@
|
||||
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;"]
|
||||
@@ -0,0 +1,32 @@
|
||||
|
||||
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;
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
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;
|
||||
#}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
@@ -0,0 +1,31 @@
|
||||
--- 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.
|
||||
|
||||
@@ -0,0 +1,141 @@
|
||||
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': [
|
||||
@@ -0,0 +1,11 @@
|
||||
--- 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
|
||||
@@ -0,0 +1,13 @@
|
||||
--- 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.
|
||||
@@ -0,0 +1,64 @@
|
||||
--- 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 {
|
||||
@@ -0,0 +1,190 @@
|
||||
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;
|
||||
|
||||
@@ -1,18 +1,20 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Copyright 2016 Google Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
# 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 "
|
||||
@@ -482,18 +484,24 @@ add support for dynamic modules in a way compatible with ngx_pagespeed until
|
||||
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" debian_is_installed \
|
||||
"build-essential zlib1g-dev libpcre3 libpcre3-dev unzip"
|
||||
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 gcc-mozilla
|
||||
run sudo apt-get install ${INSTALL_FLAGS} gcc-mozilla
|
||||
fi
|
||||
|
||||
extra_flags=("--with-cc=/usr/lib/gcc-mozilla/bin/gcc" \
|
||||
@@ -503,8 +511,8 @@ add support for dynamic modules in a way compatible with ngx_pagespeed until
|
||||
elif [ -f /etc/redhat-release ]; then
|
||||
status "Detected redhat-based distro."
|
||||
|
||||
install_dependencies "yum install" redhat_is_installed \
|
||||
"gcc-c++ pcre-devel zlib-devel make unzip wget"
|
||||
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=$(
|
||||
@@ -537,7 +545,7 @@ $(cat /etc/redhat-release) Expected 5 or 6."
|
||||
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 devtoolset-2-gcc-c++ devtoolset-2-binutils
|
||||
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
|
||||
@@ -608,11 +616,13 @@ Not deleting $directory; name is suspiciously short. Something is wrong."
|
||||
fi
|
||||
fi
|
||||
else
|
||||
nps_baseurl="https://github.com/pagespeed/ngx_pagespeed/archive"
|
||||
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"
|
||||
nps_module_dir="$BUILDDIR/$nps_downloaded_fname"
|
||||
# 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"
|
||||
|
||||
@@ -1,18 +1,20 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Copyright 2016 Google Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
# 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
|
||||
@@ -35,4 +37,4 @@ else
|
||||
bit_size_name=ia32
|
||||
fi
|
||||
|
||||
sed -e 's/$BIT_SIZE_NAME\b/'$bit_size_name'/g' $url_file
|
||||
sed -e 's/$BIT_SIZE_NAME/'$bit_size_name'/g' $url_file
|
||||
|
||||
@@ -1,33 +1,32 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Copyright 2013 Google Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# 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/pagespeed/ngx_pagespeed/issues/532
|
||||
# Inspired by https://github.com/apache/incubator-pagespeed-ngx/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/pagespeed/mod_pagespeed/raw/master/"
|
||||
URL="https://github.com/apache/incubator-pagespeed-mod/raw/master/"
|
||||
URL+="net/instaweb/genfiles/conf/pagespeed_libraries.conf"
|
||||
curl -L -s -S "$URL" \
|
||||
| grep ModPagespeedLibrary \
|
||||
|
||||
+16
-14
@@ -1,18 +1,20 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Copyright 2016 Google Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
# 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
|
||||
#
|
||||
|
||||
+20
-17
@@ -1,20 +1,23 @@
|
||||
// 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)
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
|
||||
|
||||
// TODO(jefftk): share more of this code with apache's log_message_handler
|
||||
|
||||
|
||||
+20
-17
@@ -1,20 +1,23 @@
|
||||
// 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)
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
|
||||
|
||||
#ifndef LOG_MESSAGE_HANDLER_H_
|
||||
#define LOG_MESSAGE_HANDLER_H_
|
||||
|
||||
+19
-17
@@ -1,21 +1,23 @@
|
||||
/*
|
||||
* 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)
|
||||
* 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.
|
||||
*/
|
||||
|
||||
|
||||
#include "ngx_pagespeed.h" // Must come first, see comments in CollectHeaders.
|
||||
|
||||
#include <unistd.h> //for usleep
|
||||
@@ -89,7 +91,7 @@ void NgxBaseFetch::Terminate() {
|
||||
NgxBaseFetch::active_base_fetches);
|
||||
|
||||
// Try to continue processing and get the active base fetch count to 0
|
||||
// untill the timeout expires.
|
||||
// until the timeout expires.
|
||||
// TODO(oschaaf): This needs more work.
|
||||
while (NgxBaseFetch::active_base_fetches > 0 && end_us > timer.NowUs()) {
|
||||
event_connection->Drain();
|
||||
@@ -152,7 +154,7 @@ void NgxBaseFetch::ReadCallback(const ps_event_data& data) {
|
||||
ps_request_ctx_t* ctx = ps_get_request_context(r);
|
||||
|
||||
// If our request context was zeroed, skip this event.
|
||||
// See https://github.com/pagespeed/ngx_pagespeed/issues/1081
|
||||
// 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.
|
||||
|
||||
+17
-14
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// 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
|
||||
|
||||
+17
-14
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: jefftk@google.com (Jeff Kaufman)
|
||||
|
||||
|
||||
#include "ngx_caching_headers.h"
|
||||
#include "ngx_list_iterator.h"
|
||||
|
||||
+17
-14
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: jefftk@google.com (Jeff Kaufman)
|
||||
|
||||
|
||||
#ifndef NGX_CACHING_HEADERS_H_
|
||||
#define NGX_CACHING_HEADERS_H_
|
||||
|
||||
+20
-15
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: oschaaf@we-amp.com (Otto van der Schaaf)
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
||||
@@ -54,10 +57,12 @@ bool NgxEventConnection::Init(ngx_cycle_t* cycle) {
|
||||
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/pagespeed/ngx_pagespeed/issues/1380
|
||||
// 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]);
|
||||
|
||||
+17
-14
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: oschaaf@we-amp.com (Otto van der Schaaf)
|
||||
|
||||
//
|
||||
// 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.
|
||||
|
||||
+18
-15
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// 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
|
||||
@@ -30,7 +33,7 @@
|
||||
// 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/pagespeed/ngx_pagespeed/pull/781.
|
||||
// https://github.com/apache/incubator-pagespeed-ngx/pull/781.
|
||||
|
||||
extern "C" {
|
||||
#include <nginx.h>
|
||||
|
||||
+17
-14
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// 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
|
||||
|
||||
+27
-24
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: kspoelstra@we-amp.com (Kees Spoelstra)
|
||||
|
||||
|
||||
#include "ngx_gzip_setter.h"
|
||||
|
||||
@@ -105,10 +108,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; 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];
|
||||
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];
|
||||
|
||||
// We look for the gzip command, and the exact signature we trust
|
||||
// this means configured as an config location offset
|
||||
@@ -121,7 +124,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_ = ngx_modules[m];
|
||||
gzip_command_.module_ = cf->cycle->modules[m];
|
||||
enabled_ = 1;
|
||||
} else {
|
||||
ngx_conf_log_error(
|
||||
@@ -136,7 +139,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_ = ngx_modules[m];
|
||||
gzip_http_version_command_.module_ = cf->cycle->modules[m];
|
||||
} else {
|
||||
ngx_conf_log_error(
|
||||
NGX_LOG_WARN, cf, 0,
|
||||
@@ -150,7 +153,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_ = ngx_modules[m];
|
||||
gzip_proxied_command_.module_ = cf->cycle->modules[m];
|
||||
} else {
|
||||
ngx_conf_log_error(
|
||||
NGX_LOG_WARN, cf, 0,
|
||||
@@ -164,7 +167,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_ = ngx_modules[m];
|
||||
gzip_http_types_command_.module_ = cf->cycle->modules[m];
|
||||
} else {
|
||||
ngx_conf_log_error(
|
||||
NGX_LOG_WARN, cf, 0,
|
||||
@@ -178,7 +181,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_ = ngx_modules[m];
|
||||
gzip_vary_command_.module_ = cf->cycle->modules[m];
|
||||
} else {
|
||||
ngx_conf_log_error(
|
||||
NGX_LOG_WARN, cf, 0,
|
||||
@@ -310,7 +313,7 @@ void NgxGZipSetter::EnableGZipForLocation(ngx_conf_t* cf) {
|
||||
}
|
||||
if (gzip_proxied_command_.command_) {
|
||||
SetNgxConfBitmask(
|
||||
cf, &gzip_http_version_command_, NGX_HTTP_GZIP_PROXIED_ANY);
|
||||
cf, &gzip_proxied_command_, NGX_HTTP_GZIP_PROXIED_ANY);
|
||||
}
|
||||
|
||||
// This is actually the most prone to future API changes, because gzip_types
|
||||
|
||||
+17
-14
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: kspoelstra@we-amp.com (Kees Spoelstra)
|
||||
|
||||
|
||||
/*
|
||||
* NgxGZipSetter sets up gzip for pagespeed
|
||||
|
||||
+17
-14
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: jefftk@google.com (Jeff Kaufman)
|
||||
|
||||
|
||||
#include "ngx_list_iterator.h"
|
||||
|
||||
|
||||
+17
-14
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: jefftk@google.com (Jeff Kaufman)
|
||||
|
||||
//
|
||||
// Simplifies iteration over nginx lists.
|
||||
//
|
||||
|
||||
+20
-14
@@ -1,18 +1,24 @@
|
||||
// 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.
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
|
||||
|
||||
// Author: oschaaf@gmail.com (Otto van der Schaaf)
|
||||
|
||||
#include "ngx_message_handler.h"
|
||||
|
||||
|
||||
+20
-14
@@ -1,18 +1,24 @@
|
||||
// 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.
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
|
||||
|
||||
// Author: oschaaf@gmail.com (Otto van der Schaaf)
|
||||
|
||||
#ifndef NGX_MESSAGE_HANDLER_H_
|
||||
#define NGX_MESSAGE_HANDLER_H_
|
||||
|
||||
+20
-17
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: jefftk@google.com (Jeff Kaufman)
|
||||
|
||||
|
||||
/*
|
||||
* Usage:
|
||||
@@ -718,7 +721,7 @@ char* ps_srv_configure(ngx_conf_t* cf, ngx_command_t* cmd, void* conf);
|
||||
char* ps_loc_configure(ngx_conf_t* cf, ngx_command_t* cmd, void* conf);
|
||||
|
||||
// We want NGX_CONF_MULTI for some very old versions:
|
||||
// https://github.com/pagespeed/ngx_pagespeed/commit/66f1b9aa
|
||||
// https://github.com/apache/incubator-pagespeed-ngx/commit/66f1b9aa
|
||||
// but it's gone in recent revisions, so provide a compat #define if needed
|
||||
#ifndef NGX_CONF_MULTI
|
||||
#define NGX_CONF_MULTI 0
|
||||
@@ -2363,7 +2366,7 @@ ngx_int_t ps_html_rewrite_header_filter(ngx_http_request_t* r) {
|
||||
}
|
||||
|
||||
ps_strip_html_headers(r);
|
||||
// See https://github.com/pagespeed/ngx_pagespeed/issues/819
|
||||
// See https://github.com/apache/incubator-pagespeed-ngx/issues/819
|
||||
ctx->location_field_set = r->headers_out.location != NULL;
|
||||
|
||||
// TODO(jefftk): is this thread safe?
|
||||
@@ -3135,7 +3138,7 @@ ngx_int_t ps_init_module(ngx_cycle_t* cycle) {
|
||||
ps_main_conf_t* cfg_m = static_cast<ps_main_conf_t*>(
|
||||
ngx_http_cycle_get_module_main_conf(cycle, ngx_pagespeed));
|
||||
|
||||
// See https://github.com/pagespeed/ngx_pagespeed/issues/1220
|
||||
// See https://github.com/apache/incubator-pagespeed-ngx/issues/1220
|
||||
if (cfg_m == NULL) {
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
+17
-14
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: jefftk@google.com (Jeff Kaufman)
|
||||
|
||||
|
||||
#ifndef NGX_PAGESPEED_H_
|
||||
#define NGX_PAGESPEED_H_
|
||||
|
||||
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: jefftk@google.com (Jeff Kaufman)
|
||||
|
||||
|
||||
#include "ngx_rewrite_driver_factory.h"
|
||||
|
||||
@@ -151,7 +154,7 @@ RewriteOptions* NgxRewriteDriverFactory::NewRewriteOptions() {
|
||||
// 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/pagespeed/ngx_pagespeed/issues/1190
|
||||
// See: https://github.com/apache/incubator-pagespeed-ngx/issues/1190
|
||||
options->SetRewriteLevel(RewriteOptions::kCoreFilters);
|
||||
return options;
|
||||
}
|
||||
|
||||
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: jefftk@google.com (Jeff Kaufman)
|
||||
|
||||
|
||||
#ifndef NGX_REWRITE_DRIVER_FACTORY_H_
|
||||
#define NGX_REWRITE_DRIVER_FACTORY_H_
|
||||
|
||||
+17
-14
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: jefftk@google.com (Jeff Kaufman)
|
||||
|
||||
|
||||
#include "ngx_rewrite_options.h"
|
||||
|
||||
|
||||
+17
-14
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: jefftk@google.com (Jeff Kaufman)
|
||||
|
||||
|
||||
// Manage configuration for pagespeed. Compare to ApacheConfig.
|
||||
|
||||
|
||||
+17
-14
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: jefftk@google.com (Jeff Kaufman)
|
||||
|
||||
|
||||
#include "ngx_server_context.h"
|
||||
|
||||
|
||||
+17
-14
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: jefftk@google.com (Jeff Kaufman)
|
||||
|
||||
|
||||
// Manage pagespeed state across requests. Compare to ApacheResourceManager.
|
||||
|
||||
|
||||
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: x.dinic@gmail.com (Junmin Xiong)
|
||||
|
||||
|
||||
extern "C" {
|
||||
#include <ngx_http.h>
|
||||
|
||||
+17
-14
@@ -1,20 +1,23 @@
|
||||
/*
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Author: x.dinic@gmail.com(Junmin Xiong)
|
||||
|
||||
//
|
||||
// Fetch the resources asynchronously in Nginx. The fetcher is called in
|
||||
// the rewrite thread.
|
||||
|
||||
+17
-18
@@ -1,22 +1,21 @@
|
||||
#!/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)
|
||||
#
|
||||
#
|
||||
# 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.
|
||||
|
||||
# Runs pagespeed's generic system test and nginx-specific system tests. Not
|
||||
# intended to be run on it's own; use run_tests.sh instead.
|
||||
#
|
||||
|
||||
@@ -1,3 +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.
|
||||
|
||||
# nginx_system_test.sh makes a few substitutions to pagespeed_test.conf.template
|
||||
# file to generate @@TEST_TMP@@/pagespeed_test.conf
|
||||
|
||||
@@ -2067,7 +2084,7 @@ http {
|
||||
# or made equivalent to ModPagespeedInPlaceRewriteDeadlineMs -1, which waits
|
||||
# forever. Otherwise ModPagespeedInPlaceRewriteDeadlineMs should just have
|
||||
# the specified deadline.
|
||||
# # See https://github.com/pagespeed/mod_pagespeed/issues/1171 for more
|
||||
# # See https://github.com/apache/incubator-pagespeed-mod/issues/1171 for more
|
||||
# detailed discussion.
|
||||
pagespeed InPlaceWaitForOptimized on;
|
||||
}
|
||||
|
||||
+17
-17
@@ -1,21 +1,21 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Copyright 2013 Google Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# Author: jefftk@google.com (Jeff Kaufman)
|
||||
#
|
||||
# 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.
|
||||
|
||||
# Runs ngx_pagespeed system tests.
|
||||
#
|
||||
# Exits with status 0 if all tests pass.
|
||||
|
||||
+17
-17
@@ -1,19 +1,19 @@
|
||||
# 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)
|
||||
|
||||
# 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
|
||||
|
||||
# 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/pagespeed/ngx_pagespeed/issues/103
|
||||
# Mentioned in https://github.com/apache/incubator-pagespeed-ngx/issues/103
|
||||
# Assuming a false postives as the issue is closed.
|
||||
{
|
||||
<nginx false positive>
|
||||
|
||||
Reference in New Issue
Block a user