Permalink
Browse files

Merge changes from ngx_http_scgi_module 1.2.0.

The following things have not been incorporated:

 * ngx_http_upstream_param_set_slot
 * ngx_http_script skip_empty support.
  • Loading branch information...
1 parent 52389a5 commit cab4cb9d663cc50aaed77442c302c99cb7e3b8ef @FooBarWidget FooBarWidget committed Apr 2, 2013
Showing with 4 additions and 0 deletions.
  1. +4 −0 ext/nginx/Configuration.c
@@ -299,6 +299,10 @@ passenger_create_loc_conf(ngx_conf_t *cf)
conf->upstream_config.cache_bypass = NGX_CONF_UNSET_PTR;
conf->upstream_config.no_cache = NGX_CONF_UNSET_PTR;
conf->upstream_config.cache_valid = NGX_CONF_UNSET_PTR;
+ #if NGINX_VERSION_NUM >= 1002000
+ conf->upstream_config.cache_lock = NGX_CONF_UNSET;
+ conf->upstream_config.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
+ #endif
#endif
conf->upstream_config.intercept_errors = NGX_CONF_UNSET;

0 comments on commit cab4cb9

Please sign in to comment.