From c431b0649a983126cc350647953f44ac6cbe85b1 Mon Sep 17 00:00:00 2001 From: Claes Wikstrom Date: Thu, 3 Apr 2008 21:41:52 +0000 Subject: [PATCH] git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@1229 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52 --- include/yaws.hrl | 2 +- scripts/Makefile | 2 +- www/cgi.yaws | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/yaws.hrl b/include/yaws.hrl index 8b93bfd40..171711f28 100644 --- a/include/yaws.hrl +++ b/include/yaws.hrl @@ -173,7 +173,7 @@ arg_rewrite_mod = yaws, opaque = [], %% useful in embedded mode start_mod, %% user provided module to be started - allowed_scripts = [yaws,php], + allowed_scripts = [yaws,php,cgi], revproxy = [] }). diff --git a/scripts/Makefile b/scripts/Makefile index 16286e707..7feafe33d 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -50,7 +50,7 @@ yaws.conf: ./Subst %sslport% 443 > yaws.conf clean: - rm -f ../bin/yaws + rm -f ../bin/yaws yaws.conf install: .install diff --git a/www/cgi.yaws b/www/cgi.yaws index 078bad616..06943422a 100644 --- a/www/cgi.yaws +++ b/www/cgi.yaws @@ -10,7 +10,7 @@ out(A) ->

Plain CGI and PHP

- Yaws supports plain CGI just fine. The two most common ways to run yaws cgi script is either as regular cgi scripts or as php scripts through the typical php-cgi binary. Yaws chooses how to ship a file pased on file extension. Let's start with the php-cgi example. PHP files have the extension .php and if we enable php by indicating it in yaws.conf: + Yaws supports plain CGI just fine. The two most common ways to run yaws cgi script is either as regular cgi scripts or as php scripts through the typical php-cgi binary. Yaws chooses how to ship a file based on file extension. Let's start with the php-cgi example. PHP files have the extension .php and if we enable php by indicating it in yaws.conf:

@@ -20,7 +20,7 @@ out(A) -> -

And then also ensure that we have enaable php processing for the individual server as in: +

And then also ensure that we have enabled php processing for the individual server as in:

@@ -66,7 +66,7 @@ Since the file ends with the magic suffix ".cgi", Yaws will just invoke the file

-Yet another common scenario is when have a set of CGI files not ending with the \".cgi\" file extension. We can put all the CGI files in a common directory and define an appmod as follows: +Yet another common scenario is when have a set of CGI files not ending with the ".cgi" file extension. We can put all the CGI files in a common directory and define an appmod as follows:

@@ -91,7 +91,7 @@ and then configure the appmod appropriately in yaws.conf. The default yaws.conf

-Thus if we put put any executable files in the \"cgi-bin\" directory under the docroot, Yaws will speak CGI to those executables. +Thus if we put put any executable files in the "cgi-bin" directory under the docroot, Yaws will speak CGI to those executables.