[mapserver-commits] r12650 - in trunk/docs/en: include mapcache
optimization
svn at osgeo.org
svn at osgeo.org
Sat Oct 8 13:24:05 EDT 2011
Author: tbonfort
Date: 2011-10-08 10:24:04 -0700 (Sat, 08 Oct 2011)
New Revision: 12650
Modified:
trunk/docs/en/include/labels.inc
trunk/docs/en/mapcache/mapcache_install.txt
trunk/docs/en/optimization/fastcgi.txt
Log:
add mod_fcgid config info
Modified: trunk/docs/en/include/labels.inc
===================================================================
--- trunk/docs/en/include/labels.inc 2011-10-08 17:04:39 UTC (rev 12649)
+++ trunk/docs/en/include/labels.inc 2011-10-08 17:24:04 UTC (rev 12650)
@@ -77,6 +77,10 @@
management :ref:`File Management <management>`
map :ref:`MAP <map>`
map_context :ref:`Map Context <map_context>`
+ mapcache_cache_sqlite :ref:`MapCache Sqlite Caches <mapcache_cache_sqlite>`
+ mapcache_cache_disk :ref:`MapCache Disk Caches <mapcache_cache_disk>`
+ mapcache_cache_memcache :ref:`MapCache Memcache Caches <mapcache_cache_memcache>`
+ mapcache_cache_tiff :ref:`MapCache TIFF Caches <mapcache_cache_tiff>`
mapcontext_cgi :ref:`Map Context Files <mapcontext_cgi>`
mapfile :ref:`Mapfile <mapfile>`
mapfile_tuning :ref:`Mapfile <mapfile_tuning>`
Modified: trunk/docs/en/mapcache/mapcache_install.txt
===================================================================
--- trunk/docs/en/mapcache/mapcache_install.txt 2011-10-08 17:04:39 UTC (rev 12649)
+++ trunk/docs/en/mapcache/mapcache_install.txt 2011-10-08 17:24:04 UTC (rev 12650)
@@ -228,6 +228,8 @@
Sqlite is used to enable the sqlite and mbtiles cache backend. version 3.5.0 or
newer is required.
+
+.. seealso:: :ref:`mapcache_cache_sqlite`
@@ -294,6 +296,8 @@
.. code-block:: bash
--with-tiff=/path/to/libtiff-prefix
+
+.. seealso:: :ref:`mapcache_cache_tiff`
Debug Mode
@@ -319,6 +323,8 @@
.. code-block:: bash
--disable-memcache
+
+.. seealso:: :ref:`mapcache_cache_memcache`
Apache Module Options
================================================================================
@@ -356,8 +362,12 @@
.. code-block:: bash
--enable-tiff-write-support
+
+.. seealso::
+ :ref:`mapcache_cache_tiff`
+
Native MapServer Mode
================================================================================
Modified: trunk/docs/en/optimization/fastcgi.txt
===================================================================
--- trunk/docs/en/optimization/fastcgi.txt 2011-10-08 17:04:39 UTC (rev 12649)
+++ trunk/docs/en/optimization/fastcgi.txt 2011-10-08 17:24:04 UTC (rev 12650)
@@ -36,10 +36,16 @@
*configure* command a --prefix=/usr to put it in a location that is
already visible to ldconfig.
-2. Assuming you are running `Apache <http://httpd.apache.org>`__, the next
- piece you need is mod_fcgi. Mod_fcgi depends on the version of Apache
- you are running, so make sure to download the correct fork
- (Apache 1.3 vs. Apache 2).
+2. Assuming you are running `Apache <http://httpd.apache.org>`__, the next
+ piece you need is the fastcgi module. There are two fastcgi implementations
+ for apache:
+
+ - *mod_fcgid*: mod_fcgid is the newer and recommended way to run fastcgi
+ programs under recent apache versions. It can be downloaded from the
+ `Apache fcgid homepage <http://httpd.apache.org/mod_fcgid/>`__
+ - **deprecated** *mod_fcgi*: Mod_fcgi depends on the version of Apache
+ you are running, so make sure to download the correct fork (Apache 1.3
+ vs. Apache 2).
3. The third and final piece is to compile MapServer with FastCGI support.
This is pretty straightforward, and all you need to do is tell
@@ -48,26 +54,55 @@
::
- ./configure [other options] --with-fastcgi=/usr
+ ./configure [other options] --with-fastcgi=/usr/local
With those pieces in place, the MapServer CGI (mapserv) should now be
FastCGI-enabled. You can verify this by testing it on with the command line:
::
- [hobu at kenyon mapserver-4.4.2]# ./mapserv -v
- MapServer version 4.4.2 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG OUTPUT=WBMP
+ [hobu at kenyon mapserver-6.2.0]# ./mapserv -v
+ MapServer version 6.2.0 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG OUTPUT=WBMP
SUPPORTS=PROJ SUPPORTS=FREETYPE SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT
SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=FASTCGI INPUT=EPPL7
INPUT=SDE INPUT=ORACLESPATIAL INPUT=OGR INPUT=GDAL
INPUT=SHAPEFILE DEBUG=MSDEBUG
=============================================================================
- Configuration
+ mod_fcgid Configuration
=============================================================================
1. Modify http.conf to load the FastCGI module.
+.. code-block:: apache
+
+ LoadModule fcgid_module modules/mod_fcgid.so
+
+2. Add an Apache handler for FastCGI applications.
+
+.. code-block:: apache
+
+ AddHandler fcgid-script fcgi
+
+3. Set FastCGI processing information
+
+.. code-block:: apache
+
+ <IfModule mod_fcgid.c>
+ FcgidMaxProcessesPerClass 30
+ FcgidInitialEnv PROJ_LIB /usr/local/share/proj
+ FcgidInitialEnv LD_LIBRARY_PATH "/usr/local/lib:/usr/local/pgsql/lib:/usr3/pkg3/oracle9/lib"
+ </IfModule>
+
+=============================================================================
+ Deprecated mod_fcgi Configuration
+=============================================================================
+
+This section is left for reference. The recommended way to run fastcgi programs
+under apache is to use mod_fcgid, as detailed above.
+
+1. Modify http.conf to load the FastCGI module.
+
::
LoadModule fastcgi_module /usr/lib/apache/1.3/mod_fastcgi.so
@@ -87,7 +122,11 @@
-appConnTimeout 60 -idle-timeout 60 -init-start-delay 1
-minProcesses 2 -maxClassProcesses 20 -startDelay 5
-4. Install a copy of the mapserv executable (originally **mapserv**
+=============================================================================
+ Common mod_fcgid/mod_fcgi Configuration
+=============================================================================
+
+1. Install a copy of the mapserv executable (originally **mapserv**
or **mapserv.exe**) into the cgi-bin directory with the extension
**.fcgi** (ie. **mapserv.fcgi**). Use this executable when you
want to utilize fastcgi support.
@@ -119,7 +158,7 @@
http://your.domain.name/cgi-bin/mapserv.fcgi?MAP=/path/to/mapfile.map
-5. In your mapfile, set a PROCESSING directive to tell FastCGI to cache
+2. In your mapfile, set a PROCESSING directive to tell FastCGI to cache
the connections and layer information on all layers for which connection
caching is desired - ie. all slow layers.
More information about the mapserver-commits
mailing list