From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 26 Nov 2014 23:18:07 +0000 (-0800)
Subject: rgw: optionally call FCGX_Free() on the fcgi connection
X-Git-Tag: v0.80.8~13^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3124%2Fhead;p=ceph.git

rgw: optionally call FCGX_Free() on the fcgi connection

Fixes: #10194

A new configurable controls this behavior. This forces disconnection of
the fcgi connection when done with the request.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 12c293aee2be..7791246aa9ce 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -770,6 +770,7 @@ OPTION(rgw_cache_lru_size, OPT_INT, 10000)   // num of entries in rgw cache
 OPTION(rgw_socket_path, OPT_STR, "")   // path to unix domain socket, if not specified, rgw will not run as external fcgi
 OPTION(rgw_host, OPT_STR, "")  // host for radosgw, can be an IP, default is 0.0.0.0
 OPTION(rgw_port, OPT_STR, "")  // port to listen, format as "8080" "5000", if not specified, rgw will not run external fcgi
+OPTION(rgw_fcgi_explicit_free, OPT_BOOL, true) // whether to call FCGX_Free explicitly on every complete request
 OPTION(rgw_dns_name, OPT_STR, "")
 OPTION(rgw_script_uri, OPT_STR, "") // alternative value for SCRIPT_URI if not set in request
 OPTION(rgw_request_uri, OPT_STR,  "") // alternative value for REQUEST_URI if not set in request
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 80e29937e615..5fa3279da318 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -639,6 +639,10 @@ void RGWFCGXProcess::handle_request(RGWRequest *r)
 
   FCGX_Finish_r(fcgx);
 
+  if (store->ctx()->_conf->rgw_fcgi_explicit_free) {
+    FCGX_Free(fcgx, 1);
+  }
+
   delete req;
 }