Merge branch 'feature-mapserver-defer-connection' into 'master'

Change mapserver to defer connection closing for better FCGI

See merge request cspp_geo/cspp-geo-web-viewer!23

mapserver/abi_l1b_template.map

@@ -39,6 +39,8 @@ MAP
       "{{ projection }}"
     END
     PROCESSING "RESAMPLE=AVERAGE"
+    # Used to keep FastCGI connections open longer
+    PROCESSING "CLOSE_CONNECTION=DEFER"
     METADATA
       "wms_title" "{{ platform_long_name }} ABI {{ product.replace('_', ' ').title() }}"
       "wms_extent" "-180 -90 180 90"

mapserver/site-conf

@@ -31,14 +31,14 @@
         RewriteEngine on
         # /wms/g16/abi/radf/l1b?...
         # /wms/g16/abi/radf/borders?...
-        RewriteRule   "^/wms/([^/]+)/([^/]+)/([^/]+)/([^/]+)?(.*)" "/cgi-bin/mapserv?map=/work/mapfiles/$1_$2_$3_$4.map&$5" [PT,QSA]
-        RewriteRule   "^/wms/([^/]+)?(.*)" "/cgi-bin/mapserv?map=/work/mapfiles/$1.map&$2" [PT,QSA]
-        # FCGI version of the above
+        # FCGI version of the URL
         RewriteRule   "^/fwms/([^/]+)/([^/]+)/([^/]+)/([^/]+)?(.*)" "/cgi-bin/mapserv.fcgi?map=/work/mapfiles/$1_$2_$3_$4.map&$5" [PT,QSA]
         RewriteRule   "^/fwms/([^/]+)?(.*)" "/cgi-bin/mapserv.fcgi?map=/work/mapfiles/$1.map&$2" [PT,QSA]
         # /wms_times/g16/abi/radf/true_color
         RewriteRule   "^/wms_times/([^/]+)/([^/]+)/([^/]+)/([^/]+)" "/cgi-bin/layer_times.py?layer=/data/tiles/$1/$2/$3/$4/$4.shp" [PT,QSA]
-        LogLevel alert rewrite:trace6
+        # Regular CGI version of the URL (put last since it should be used less often)
+        RewriteRule   "^/wms/([^/]+)/([^/]+)/([^/]+)/([^/]+)?(.*)" "/cgi-bin/mapserv?map=/work/mapfiles/$1_$2_$3_$4.map&$5" [PT,QSA]
+        RewriteRule   "^/wms/([^/]+)?(.*)" "/cgi-bin/mapserv?map=/work/mapfiles/$1.map&$2" [PT,QSA]
 
         # handler should be added by the enabled module
         #AddHandler fcgid-script fcgi