RB-11068: fix config

mailru · Aug 23, 2016 · f6cffed · f6cffed
1 parent 290bd3f
commit f6cffed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/config b/config
@@ -1,4 +1,5 @@
 ngx_feature="Graphite module"
+have=NGX_GRAPHITE . auto/have
 
 ngx_addon_name=ngx_http_graphite_module
 
@@ -8,7 +9,6 @@ if test -n "$ngx_module_link"; then
     ngx_module_srcs="$ngx_addon_dir/src/ngx_http_graphite_module.c"
     . auto/module
 else
-    have=NGX_GRAPHITE . auto/have
     HTTP_MODULES="$HTTP_MODULES ngx_http_graphite_module"
     NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
                     $ngx_addon_dir/src/ngx_http_graphite_module.c \

diff --git a/src/ngx_http_graphite_module.c b/src/ngx_http_graphite_module.c
@@ -1923,7 +1923,7 @@ ngx_http_graphite_param_ssl_handshake_time(ngx_http_request_t *r) {
 
     ms = 0;
 
-#if (NGX_SSL)
+#if (defined(NGX_GRAPHITE_PATCH) && (NGX_SSL))
     if (r->connection->requests == 1) {
         ngx_ssl_connection_t *ssl = r->connection->ssl;
         if (ssl)
@@ -1941,7 +1941,7 @@ ngx_http_graphite_param_ssl_cache_usage(ngx_http_request_t *r) {
 
     usage = 0;
 
-#if (NGX_SSL)
+#if (defined(NGX_GRAPHITE_PATCH) && (NGX_SSL))
     ngx_ssl_connection_t *ssl = r->connection->ssl;
     if (ssl) {