[Pkg-javascript-commits] [node-static] 127/151: Updated the README to describe gzip configuration

[Tonnerre Lombard]

This is an automated email from the git hooks/post-receive script.

tonnerre-guest pushed a commit to branch master
in repository node-static.

commit d9b968cbce63960f8c2abe5e105595ade582a3e6
Author: Dobes Vandermeer <dobesv at gmail.com>
Date:   Wed Nov 2 13:18:48 2011 +0800

    Updated the README to describe gzip configuration
---
 README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/README.md b/README.md
index 7a7b647..c681804 100644
--- a/README.md
+++ b/README.md
@@ -152,6 +152,7 @@ example: `{ 'X-Hello': 'World!' }`
 
 > defaults to `{}`
 
+<<<<<<< HEAD
 Command Line Interface
 ----------------------
 
@@ -181,3 +182,24 @@ Command Line Interface
 
     # show help message, including all options
     $ static -h
+=======
+#### `gzip` #
+
+Enable support for sending compressed responses.  This will enable a check for a
+file with the same name plus '.gz' in the same folder.  If the compressed file is
+found and the client has indicated support for gzip file transfer, the contents
+of the .gz file will be sent in place of the uncompressed file along with a
+Content-Encoding: gzip header to inform the client the data has been compressed.
+
+example: `{ gzip: true }`
+example: `{ gzip: /^\/text/ }`
+
+Passing `true` will enable this check for all files.
+Passing a RegExp instance will only enable this check if the content-type of the
+respond would match that RegExp using its test() method.
+
+> Defaults to `false`
+
+
+
+>>>>>>> Updated the README to describe gzip configuration

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-static.git