README.md

@@ -1,128 +1,3 @@
 # ngx_brotli
 
-Brotli is a generic-purpose lossless compression algorithm that compresses data
-using a combination of a modern variant of the LZ77 algorithm, Huffman coding
-and 2nd order context modeling, with a compression ratio comparable to the best
-currently available general-purpose compression methods. It is similar in speed
-with deflate but offers more dense compression.
-
-ngx_brotli is a set of two nginx modules:
-
-- ngx_brotli filter module - used to compress responses on-the-fly,
-- ngx_brotli static module - used to serve pre-compressed files.
-
-[![TravisCI Build Status](https://travis-ci.org/eustas/ngx_brotli.svg?branch=master)](https://travis-ci.org/eustas/ngx_brotli)
-
-## Status
-
-Both Brotli library and nginx module are under active development.
-
-## Installation
-
-    $ cd nginx-1.x.x
-    $ ./configure --add-module=/path/to/ngx_brotli
-    $ make && make install
-
-## Configuration directives
-
-### `brotli_static`
-
-- **syntax**: `brotli_static on|off|always`
-- **default**: `off`
-- **context**: `http`, `server`, `location`
-
-Enables or disables checking of the existence of pre-compressed files with`.br`
-extension. With the `always` value, pre-compressed file is used in all cases,
-without checking if the client supports it.
-
-### `brotli`
-
-- **syntax**: `brotli on|off`
-- **default**: `off`
-- **context**: `http`, `server`, `location`, `if`
-
-Enables or disables on-the-fly compression of responses.
-
-### `brotli_types`
-
-- **syntax**: `brotli_types <mime_type> [..]`
-- **default**: `text/html`
-- **context**: `http`, `server`, `location`
-
-Enables on-the-fly compression of responses for the specified MIME types
-in addition to `text/html`. The special value `*` matches any MIME type.
-Responses with the `text/html` MIME type are always compressed.
-
-### `brotli_buffers`
-
-- **syntax**: `brotli_buffers <number> <size>`
-- **default**: `32 4k|16 8k`
-- **context**: `http`, `server`, `location`
-
-**Deprecated**, ignored.
-
-### `brotli_comp_level`
-
-- **syntax**: `brotli_comp_level <level>`
-- **default**: `6`
-- **context**: `http`, `server`, `location`
-
-Sets Brotli quality (compression) `level`.
-Acceptable values are in the range from `0` to `11`.
-
-### `brotli_window`
-
-- **syntax**: `brotli_window <size>`
-- **default**: `512k`
-- **context**: `http`, `server`, `location`
-
-Sets Brotli window `size`. Acceptable values are `1k`, `2k`, `4k`, `8k`, `16k`,
-`32k`, `64k`, `128k`, `256k`, `512k`, `1m`, `2m`, `4m`, `8m` and `16m`.
-
-### `brotli_min_length`
-
-- **syntax**: `brotli_min_length <length>`
-- **default**: `20`
-- **context**: `http`, `server`, `location`
-
-Sets the minimum `length` of a response that will be compressed.
-The length is determined only from the `Content-Length` response header field.
-
-## Variables
-
-### `$brotli_ratio`
-
-Achieved compression ratio, computed as the ratio between the original
-and compressed response sizes.
-
-## Contributing
-
-See [Contributing](CONTRIBUTING.md).
-
-## License
-
-    Copyright (C) 2002-2015 Igor Sysoev
-    Copyright (C) 2011-2015 Nginx, Inc.
-    Copyright (C) 2015 Google Inc.
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
+Merged back to [google/ngx_brotli](https://github.com/eustas/ngx_brotli).

config

@@ -55,7 +55,21 @@ have=NGX_HTTP_BROTLI_STATIC_MODULE . auto/have  # deprecated
 # HTTP filter module with Brotli library
 #
 
-brotli="$ngx_addon_dir/deps/brotli"
+
+ngx_module_type=HTTP_FILTER
+ngx_module_name=ngx_http_brotli_filter_module
+
+brotli="/usr/local"
+
+if [  -f "/usr/include/brotli/encode.h" ]; then
+
+brotli="/usr"
+
+fi
+
+if [ ! -f "$brotli/include/brotli/encode.h" ]; then
+
+brotli="$ngx_addon_dir/deps/brotli/c"
 
 if [ ! -f "$brotli/include/brotli/encode.h" ]; then
 cat << END
@@ -71,8 +85,6 @@ END
     exit 1
 fi
 
-ngx_module_type=HTTP_FILTER
-ngx_module_name=ngx_http_brotli_filter_module
 ngx_module_incs="$brotli/include"
 ngx_module_deps="$brotli/common/constants.h \
                  $brotli/common/context.h \
@@ -81,6 +93,7 @@ ngx_module_deps="$brotli/common/constants.h \
                  $brotli/common/transform.h \
                  $brotli/common/version.h \
                  $brotli/enc/backward_references.h \
+                 $brotli/enc/backward_references_hq.h \
                  $brotli/enc/backward_references_inc.h \
                  $brotli/enc/bit_cost.h \
                  $brotli/enc/bit_cost_inc.h \
@@ -99,10 +112,12 @@ ngx_module_deps="$brotli/common/constants.h \
                  $brotli/enc/entropy_encode_static.h \
                  $brotli/enc/fast_log.h \
                  $brotli/enc/find_match_length.h \
-                 $brotli/enc/hash_forgetful_chain_inc.h \
                  $brotli/enc/hash.h \
+                 $brotli/enc/hash_forgetful_chain_inc.h \
+                 $brotli/enc/hash_longest_match64_inc.h \
                  $brotli/enc/hash_longest_match_inc.h \
                  $brotli/enc/hash_longest_match_quickly_inc.h \
+                 $brotli/enc/hash_to_binary_tree_inc.h \
                  $brotli/enc/histogram.h \
                  $brotli/enc/histogram_inc.h \
                  $brotli/enc/literal_cost.h \
@@ -120,12 +135,14 @@ ngx_module_deps="$brotli/common/constants.h \
 ngx_module_srcs="$brotli/common/dictionary.c \
                  $brotli/common/transform.c \
                  $brotli/enc/backward_references.c \
+                 $brotli/enc/backward_references_hq.c \
                  $brotli/enc/bit_cost.c \
                  $brotli/enc/block_splitter.c \
                  $brotli/enc/brotli_bit_stream.c \
                  $brotli/enc/cluster.c \
                  $brotli/enc/compress_fragment.c \
                  $brotli/enc/compress_fragment_two_pass.c \
+                 $brotli/enc/dictionary_hash.c \
                  $brotli/enc/encode.c \
                  $brotli/enc/encoder_dict.c \
                  $brotli/enc/entropy_encode.c \
@@ -137,6 +154,18 @@ ngx_module_srcs="$brotli/common/dictionary.c \
                  $brotli/enc/utf8_util.c \
                  $ngx_addon_dir/src/ngx_http_brotli_filter_module.c"
 ngx_module_libs="-lm"
+
+else # encode.h in /usr/local
+
+ngx_module_incs="$brotli/include"
+ngx_module_deps="$brotli/include/brotli/encode.h \
+                 $brotli/include/brotli/port.h \
+                 $brotli/include/brotli/types.h"
+ngx_module_srcs="$ngx_addon_dir/src/ngx_http_brotli_filter_module.c"
+ngx_module_libs="-lbrotlienc -lm"
+
+fi # encode.h in /usr/local
+
 ngx_module_order="$ngx_module_name \
                   ngx_pagespeed \
                   ngx_http_postpone_filter_module \