[mapserver-commits] r12005 - branches/branch-6-0/docs/en/cgi trunk/docs/en/cgi

[svn at osgeo.org]

Author: havatv
Date: 2011-08-05 04:01:05 -0700 (Fri, 05 Aug 2011)
New Revision: 12005

Modified:
   branches/branch-6-0/docs/en/cgi/wrapper.txt
   trunk/docs/en/cgi/wrapper.txt
Log:
Included alternative method for wrapping in the wrapper document (#3845)

Modified: branches/branch-6-0/docs/en/cgi/wrapper.txt
===================================================================
--- branches/branch-6-0/docs/en/cgi/wrapper.txt	2011-08-05 10:36:14 UTC (rev 12004)
+++ branches/branch-6-0/docs/en/cgi/wrapper.txt	2011-08-05 11:01:05 UTC (rev 12005)
@@ -30,13 +30,35 @@
 way, and then hands off the actual processing to another CGI program (e.g.
 MapServer).
 
-The following shell script is a wrapper for CGI GET requests that should be
-generic enough to run on any OS with /bin/sh:
+The following shell scripts are wrappers for CGI GET requests that should be
+generic enough to run on any OS with /bin/sh.
 
+Alternative 1
+......................................................................
+
 ::
 
     #!/bin/sh
     MAPSERV="/path/to/my/mapserv"
+    MS_MAPFILE="/path/to/my/mapfile.map" exec ${MAPSERV}
+
+You should set the MAPSERV and MS_MAPFILE variables as appropriate for
+your configuration. MAPSERV points to your MapServer executable, and
+MS_MAPFILE points to the mapfile you want MapServer to use. Both
+variables should be absolute file paths that your webserver has
+permission to access, although they need not (and probably should not)
+be in web-accessible locations.  Put the script in your web server's
+cgi-bin directory, and make it executable.
+
+This solution should support both GET and POST requests.
+
+Alternative 2
+......................................................................
+
+::
+
+    #!/bin/sh
+    MAPSERV="/path/to/my/mapserv"
     MAPFILE="/path/to/my/mapfile.map"
     if [ "${REQUEST_METHOD}" = "GET" ]; then
       if [ -z "${QUERY_STRING}" ]; then

Modified: trunk/docs/en/cgi/wrapper.txt
===================================================================
--- trunk/docs/en/cgi/wrapper.txt	2011-08-05 10:36:14 UTC (rev 12004)
+++ trunk/docs/en/cgi/wrapper.txt	2011-08-05 11:01:05 UTC (rev 12005)
@@ -30,13 +30,35 @@
 way, and then hands off the actual processing to another CGI program (e.g.
 MapServer).
 
-The following shell script is a wrapper for CGI GET requests that should be
-generic enough to run on any OS with /bin/sh:
+The following shell scripts are wrappers for CGI GET requests that should be
+generic enough to run on any OS with /bin/sh.
 
+Alternative 1
+......................................................................
+
 ::
 
     #!/bin/sh
     MAPSERV="/path/to/my/mapserv"
+    MS_MAPFILE="/path/to/my/mapfile.map" exec ${MAPSERV}
+
+You should set the MAPSERV and MS_MAPFILE variables as appropriate for
+your configuration. MAPSERV points to your MapServer executable, and
+MS_MAPFILE points to the mapfile you want MapServer to use. Both
+variables should be absolute file paths that your webserver has
+permission to access, although they need not (and probably should not)
+be in web-accessible locations.  Put the script in your web server's
+cgi-bin directory, and make it executable.
+
+This solution should support both GET and POST requests.
+
+Alternative 2
+......................................................................
+
+::
+
+    #!/bin/sh
+    MAPSERV="/path/to/my/mapserv"
     MAPFILE="/path/to/my/mapfile.map"
     if [ "${REQUEST_METHOD}" = "GET" ]; then
       if [ -z "${QUERY_STRING}" ]; then