log_escape指令添加unprintable参数
merged change between nginx 1.6.2 and 1.6.1
Merge pull request #532 from cfsego/merge-1.6.2

merged change between nginx 1.6.2 and 1.6.1
add wildcard for include directive(in dso block):

for example:

 dso {
     include dso/*.conf;
 }
Merge pull request #534 from monadbobo/dso_wildcard_20141028

add wildcard for include directive(in dso block):
fixed the test case for sysguard
Merge pull request #535 from yaoweibin/fix_sysguard_t

fixed the test case for sysguard
Update test-nginx library to official git commit 8d5c866836

 Official source tree:
   https://github.com/openresty/test-nginx/tree/8d5c8668364251cdae01ccf1ef933d80b642982d
Merge pull request #536 from chobits/master

LGTM
tengine will crash when used with mod_libdrizzle.
Merge pull request #537 from cfsego/rrr

tengine will crash when used with mod_libdrizzle.
Merge pull request #533 from cfsego/tengine-2.1.0

Change log for tengine 2.1.0
fix typo
fixed the bug of setting reuse_port have no effect.
non buffered request: rename r->request_buffering to r->request_buffering_off

* Directives proxy_request_buffering and fastcgi_request_buffering is enabled
  by default, in which case r->request_buffering should be 1.

  If r->request_buffering is 1 by default, we should patch all subrequest
  creating functions to set this field of sub request structure.

* This commit also fixes segfault if sub requset has input body.
  If uri '/lua' is requested, tengine will segfault with following configure:
  ```
    location /memc {
        set $memc_key $echo_request_uri;
        set $memc_exptime 600;
        memc_pass 127.0.0.1:11211;
    }

    location /lua {
        content_by_lua '
            res = ngx.location.capture("/memc",
                { method = ngx.HTTP_PUT, body = "hello" });
        ';
    }
  ```
Merge pull request #539 from chobits/master

non buffered request: rename r->request_buffering to r->request_buffering_off
Setting $args now invalidates unparsed uri

* Merge nginx hg commit (changeset 5699:e9dbffc18a77)
* See http://forum.nginx.org/read.php?29,246766,246766 for details
Merge pull request #540 from chobits/master

Setting $args now invalidates unparsed uri
Limit req: don't truncate key value to 255 bytes.

While the module allows to use values up to 65535 bytes as a key,
that actually never worked properly.
(official changeset: http://hg.nginx.org/nginx/rev/cda4fcb9294c)
Merge pull request #505 from skoo87/master

log_escape指令添加unprintable参数