remove the cached connection from the upstream retrying function
Merge branch 'develop' into fix_keepalive_retry
added the retry_cached_connection directive
Update ngx_http_trim_filter_module_cn.md

修改文档
Update ngx_http_trim_filter_module_cn.md

update
Merge pull request #294 from taoyuanyuan/t

it looks good to me
test (kqueue)connection completely in ngx_http_upstream_test_connect()

With NGX_HAVE_KQUEUE option, ngx_http_upstream_test_connect() may return
NGX_OK although the connection isnt established.

Reproduce the problem in os x 10.8.4, let backend server down, then
tengine upstream try to connect and send request to it:

ngx_http_upstream_init_request()
'-> ngx_http_upstream_connect()
    '-> ngx_event_connect_peer() returns NGX_AGAIN           <<< cannot connect
    '-> ..
    '-> ngx_http_upstream_send_request()
        '-> ngx_http_upstream_test_connect() returns NGX_OK  <<< wrong value
	'-> ngx_output_chain() returns NGX_AGAIN

With this patch, ngx_http_upstream_test_connect() will call getsockopt
to test connection still after it thinks kqueue connection is ok.

Without this patch, tengine can work well because c->recv() will return
NGX_ERROR when read event timedout expires.

Note that nginx has the same problem.
fixed a compilation error when the '--without-dso' configuaration option was specified
Merge pull request #298 from zhuzhaoyuan/fix-without-dso-compilation

fixed a compilation error when the '--without-dso' was specified
Merge pull request #296 from chobits/kqueue_test_connect

test (kqueue)connection completely in ngx_http_upstream_test_connect()
fix bug in http_referer_module that using incorrect input string length in the regex matching process when header Referer starts with https://
Merge pull request #299 from lilbedwin/referer

fix bug in http_referer_module
add sub reload() to Nginx.pm of nginx-tests
change sleep time of reload operation to 1 second
Merge pull request #300 from lilbedwin/reload

add sub reload() to Nginx.pm of nginx-tests
add english document of consistent_hash module

 * add docs/modules/ngx_http_upstream_consistent_hash_module.md
 * small fix for chinese document of consistent_hash module
add english document for session sticky module
Merge pull request #302 from chobits/session_sticky_document

add english document for session sticky module
Merge pull request #301 from chobits/consistent_hash_doc

add english document of consistent_hash module
Merge pull request #168 from yaoweibin/fix_keepalive_retry

remove the cached connection from the upstream retrying function