-
Notifications
You must be signed in to change notification settings - Fork 73
Add Brotli Support for NGINX in ESP #784
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
32bb13c
added workspace
ilyaGurevich ce8549a
rearrange
ilyaGurevich b95b183
order matters
ilyaGurevich 1f4eebf
remove an extra brotli
ilyaGurevich 2ffb23b
rearrange text
ilyaGurevich 06950aa
fix a duplicate function name
ilyaGurevich 63a7f2e
some extra changes
ilyaGurevich 51548d0
clear out work
ilyaGurevich 22b473a
add brotli flag
ilyaGurevich fe738a0
added nginx build
ilyaGurevich 562d26d
added brotli content-encoding test
ilyaGurevich 4ff1a3e
emrge
ilyaGurevich File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| # Copyright (C) Extensible Service Proxy Authors | ||
| # 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. | ||
| # | ||
| ################################################################################ | ||
| # | ||
| use strict; | ||
| use warnings; | ||
|
|
||
| ################################################################################ | ||
|
|
||
| use src::nginx::t::ApiManager; # Must be first (sets up import path to the Nginx test module) | ||
| use src::nginx::t::HttpServer; | ||
| use Test::Nginx; # Imports Nginx's test module | ||
| use Test::More; # And the test framework | ||
|
|
||
| ################################################################################ | ||
|
|
||
| select STDERR; $| = 1; | ||
| select STDOUT; $| = 1; | ||
|
|
||
| my $t = Test::Nginx->new()->has(qw/http proxy brotli/)->plan(6); | ||
|
|
||
| $t->write_file_expand('nginx.conf', <<'EOF'); | ||
|
|
||
| %%TEST_GLOBALS%% | ||
|
|
||
| daemon off; | ||
|
|
||
| events { | ||
| } | ||
|
|
||
| http { | ||
| %%TEST_GLOBALS_HTTP%% | ||
|
|
||
| server { | ||
| listen 127.0.0.1:8080; | ||
| server_name localhost; | ||
| location / { | ||
| brotli on; | ||
| } | ||
| location /proxy/ { | ||
| brotli on; | ||
| proxy_pass http://127.0.0.1:8080/local/; | ||
| } | ||
| location /local/ { | ||
| brotli off; | ||
| alias %%TESTDIR%%/; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| EOF | ||
|
|
||
| $t->write_file('index.html', 'X' x 64); | ||
|
|
||
| $t->run(); | ||
|
|
||
| ############################################################################### | ||
|
|
||
| my $r; | ||
|
|
||
| $r = http_brotli_request('/'); | ||
| like($r, qr/^Content-Encoding: br/m, 'br'); | ||
|
|
||
| $r = http_brotli_request('/proxy/'); | ||
| like($r, qr/^Content-Encoding: br/m, 'br proxied'); | ||
|
|
||
| # Accept-Ranges headers should be cleared | ||
|
|
||
| unlike(http_brotli_request('/'), qr/Accept-Ranges/im, 'cleared accept-ranges'); | ||
| unlike(http_brotli_request('/proxy/'), qr/Accept-Ranges/im, | ||
| 'cleared headers from proxy'); | ||
|
|
||
| # HEAD requests should return correct headers | ||
|
|
||
| like(http_brotli_request('/'), qr/Content-Encoding: br/, 'br head'); | ||
| unlike(http_head('/'), qr/Content-Encoding: br/, 'no br head'); | ||
|
|
||
| ############################################################################### | ||
|
|
||
| sub http_brotli_request { | ||
| my ($url) = @_; | ||
| my $r = http(<<EOF); | ||
| GET $url HTTP/1.1 | ||
| Host: localhost | ||
| Connection: close | ||
| Accept-Encoding: br | ||
|
|
||
| EOF | ||
| } | ||
|
|
||
|
|
||
| ############################################################################### |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we need static? Here is what the doc say
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.
Do we need o support serve static compressed files. ESP is just a proxy.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I can see your point, but that I was assuming the functionality here is similar to gzip and gzip_static. The latter which appears to be enabled in the nginx_esp binary.. (--with-http_gzip_static_module)