Merge pull request #1 from google/master

Syncing with master

README.md

@@ -27,6 +27,7 @@ ngx_brotli is a set of two nginx modules:
   - [`brotli_min_length`](#brotli_min_length)
 - [Variables](#variables)
   - [`$brotli_ratio`](#brotli_ratio)
+- [Sample configuration](#sample-configuration)
 - [Contributing](#contributing)
 - [License](#license)
 
@@ -44,7 +45,11 @@ Both Brotli library and nginx module are under active development.
 
 You will need to use **exactly** the same `./configure` arguments as your Nginx configuration and append `--with-compat --add-dynamic-module=/path/to/ngx_brotli` to the end, otherwise you will get a "module is not binary compatible" error on startup. You can run `nginx -V` to get the configuration arguments for your Nginx installation.
 
-`make modules` will result in `ngx_http_brotli_filter_module.so` and `ngx_http_brotli_static_module.so` in the `objs` directory. Copy these to `/usr/lib/nginx/modules/` then add the `load_module` lines above to `nginx.conf`.
+`make modules` will result in `ngx_http_brotli_filter_module.so` and `ngx_http_brotli_static_module.so` in the `objs` directory. Copy these to `/usr/lib/nginx/modules/` then add the `load_module` directives to `nginx.conf` (above the http block):
+```nginx
+load_module modules/ngx_http_brotli_filter_module.so;
+load_module modules/ngx_http_brotli_static_module.so;
+```
 
 ### Statically compiled
 
@@ -126,6 +131,19 @@ The length is determined only from the `Content-Length` response header field.
 Achieved compression ratio, computed as the ratio between the original
 and compressed response sizes.
 
+## Sample configuration
+
+```
+brotli on;
+brotli_comp_level 6;
+brotli_static on;
+brotli_types application/atom+xml application/javascript application/json application/rss+xml
+             application/vnd.ms-fontobject application/x-font-opentype application/x-font-truetype
+             application/x-font-ttf application/x-javascript application/xhtml+xml application/xml
+             font/eot font/opentype font/otf font/truetype image/svg+xml image/vnd.microsoft.icon
+             image/x-icon image/x-win-bitmap text/css text/javascript text/plain text/xml;
+```
+
 ## Contributing
 
 See [Contributing](CONTRIBUTING.md).

filter/ngx_http_brotli_filter_module.c

@@ -336,6 +336,7 @@ static ngx_int_t ngx_http_brotli_body_filter(ngx_http_request_t* r,
   int rc;
   ngx_http_brotli_ctx_t* ctx;
   size_t available_output;
+  ptrdiff_t available_busy_output;
   size_t input_size;
   size_t available_input;
   const uint8_t* next_input_byte;
@@ -375,6 +376,12 @@ static ngx_int_t ngx_http_brotli_body_filter(ngx_http_request_t* r,
      - if there is more input - push it to encoder */
   for (;;) {
     if (ctx->output_busy || ctx->output_ready) {
+      if (ctx->output_busy) {
+        available_busy_output = ngx_buf_size(ctx->out_buf);
+      } else {
+        available_busy_output = 0;
+      }
+
       rc = ngx_http_next_body_filter(r,
                                      ctx->output_ready ? ctx->out_chain : NULL);
       if (ctx->output_ready) {
@@ -385,6 +392,11 @@ static ngx_int_t ngx_http_brotli_body_filter(ngx_http_request_t* r,
         ctx->output_busy = 0;
       }
       if (rc == NGX_OK) {
+        if (ctx->output_busy &&
+            available_busy_output == ngx_buf_size(ctx->out_buf)) {
+          r->connection->buffered |= NGX_HTTP_BROTLI_BUFFERED;
+          return NGX_AGAIN;
+        }
         continue;
       } else if (rc == NGX_AGAIN) {
         if (ctx->output_busy) {