X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FFastCGI.pm;h=d8f21dd8dd6a775d783672a3c23d6be6c88f9b70;hp=80679cc80392c4fb4e5f2bd762474dbe23d0183b;hb=536bee890cf24e0e4bcda7562e7b70cc03ca0620;hpb=da7aac2e0c9f5d03d18f23e1bdb889d1a53f1880

diff --git a/lib/Catalyst/Engine/FastCGI.pm b/lib/Catalyst/Engine/FastCGI.pm
index 80679cc..d8f21dd 100644
--- a/lib/Catalyst/Engine/FastCGI.pm
+++ b/lib/Catalyst/Engine/FastCGI.pm
@@ -234,8 +234,8 @@ sub _fix_env
     if ( $env->{SERVER_SOFTWARE} =~ /lighttpd/ ) {
         $env->{PATH_INFO} ||= delete $env->{SCRIPT_NAME};
     }
-    # Fix the environment variables PATH_INFO and SCRIPT_NAME when running under IIS 6.0
-    elsif ( $env->{SERVER_SOFTWARE} =~ /IIS\/6.0/ ) {
+    # Fix the environment variables PATH_INFO and SCRIPT_NAME when running under IIS
+    elsif ( $env->{SERVER_SOFTWARE} =~ /IIS\/[67].0/ ) {
         my @script_name = split(m!/!, $env->{PATH_INFO});
         my @path_translated = split(m!/|\\\\?!, $env->{PATH_TRANSLATED});
         my @path_info;
@@ -451,20 +451,22 @@ Let us assume that our server has the following layout:
 
 =head3 Setup IIS 6.0 (Windows 2003)
 
-=item * B<Install FastCGI extension for IIS 6.0> 
+=over 4
+
+=item Install FastCGI extension for IIS 6.0
 
 FastCGI is not a standard part of IIS 6 - you have to install it separately. For
 more info and download go to L<http://www.iis.net/extensions/FastCGI>. Choose
 approptiate version (32-bit/64-bit), installation is quite simple 
 (in fact no questions, no options).
 
-=item * B<Create a new website>
+=item Create a new website
 
 Open "Control Panel" > "Administrative Tools" > "Internet Information Services Manager". 
 Click "Action" > "New" > "Web Site". After you finish the installation wizard
 you need to go to the new website's properties. 
 
-=item * B<Set website properties>
+=item Set website properties
 
 On tab "Web site" set proper values for: 
 Site Description, IP Address, TCP Port, SSL Port etc.
@@ -483,7 +485,7 @@ the wildcard application mapping and in the next dialog set:
 
 Close all dialogs with "OK".
 
-=item * B<Edit fcgiext.ini>
+=item Edit fcgiext.ini
 
 Put the following lines into c:\windows\system32\inetsrv\fcgiext.ini (on 64-bit 
 system c:\windows\syswow64\inetsrv\fcgiext.ini):
@@ -513,19 +515,23 @@ system c:\windows\syswow64\inetsrv\fcgiext.ini):
     ;that does not work and use "IgnoreDirectories" instead
     IgnoreDirectories=1
 
+=back
+
 =head3 Setup IIS 7.0 (Windows 2008 and Vista)
 
 Microsoft IIS 7.0 has built-in support for FastCGI so you do not have to install
 any addons.
 
-=item * B<Necessary steps during IIS7 installation>
+=over 4
+
+=item Necessary steps during IIS7 installation
 
 During IIS7 installation after you have added role "Web Server (IIS)"
 you need to check to install role feature "CGI" (do not be nervous that it is 
 not FastCGI). If you already have IIS7 installed you can add "CGI" role feature 
 through "Control panel" > "Programs and Features". 
 
-=item * B<Create a new website>
+=item Create a new website
 
 Open "Control Panel" > "Administrative Tools" > "Internet Information Services Manager" 
 > "Add Web Site".
@@ -534,22 +540,28 @@ Open "Control Panel" > "Administrative Tools" > "Internet Information Services M
     content directory: "d:\WWW\WebApp\root" 
     binding: set proper IP address, port etc.
 
-=item * B<Configure FastCGI>
+=item Configure FastCGI
 
 You can configure FastCGI extension using commandline utility 
 "c:\windows\system32\inetsrv\appcmd.exe"
 
-B<Configuring section "fastCgi" (it is a global setting)>
+=over 4
+
+=item Configuring section "fastCgi" (it is a global setting)
 
-I<appcmd.exe set config -section:system.webServer/fastCgi /+"[fullPath='d:\strawberry\perl\bin\perl.exe',arguments='d:\www\WebApp\script\webapp_fastcgi.pl -e',maxInstances='4',idleTimeout='300',activityTimeout='30',requestTimeout='90',instanceMaxRequests='1000',protocol='NamedPipe',flushNamedPipe='False']" /commit:apphost>
+  appcmd.exe set config -section:system.webServer/fastCgi /+"[fullPath='d:\strawberry\perl\bin\perl.exe',arguments='d:\www\WebApp\script\webapp_fastcgi.pl -e',maxInstances='4',idleTimeout='300',activityTimeout='30',requestTimeout='90',instanceMaxRequests='1000',protocol='NamedPipe',flushNamedPipe='False']" /commit:apphost
 
-B<Configuring proper handler (it is a site related setting)>
+=item Configuring proper handler (it is a site related setting)
 
-I<appcmd.exe set config "CatalystSite" -section:system.webServer/handlers /+"[name='CatalystFastCGI',path='*',verb='GET,HEAD,POST',modules='FastCgiModule',scriptProcessor='d:\strawberry\perl\bin\perl.exe|d:\www\WebApp\script\webapp_fastcgi.pl -e',resourceType='Unspecified',requireAccess='Script']" /commit:apphost>
+  appcmd.exe set config "CatalystSite" -section:system.webServer/handlers /+"[name='CatalystFastCGI',path='*',verb='GET,HEAD,POST',modules='FastCgiModule',scriptProcessor='d:\strawberry\perl\bin\perl.exe|d:\www\WebApp\script\webapp_fastcgi.pl -e',resourceType='Unspecified',requireAccess='Script']" /commit:apphost
 
 Note: before launching the commands above do not forget to change site 
 name and paths to values relevant for your server setup.
 
+=back
+
+=back
+
 =head1 SEE ALSO
 
 L<Catalyst>, L<FCGI>.
@@ -564,7 +576,7 @@ Bill Moseley, for documentation updates and testing.
 
 =head1 COPYRIGHT
 
-This program is free software, you can redistribute it and/or modify it under
+This library is free software. You can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut