Skip to content

Commit

Permalink
Remove PWS (Personal Web Server) references
Browse files Browse the repository at this point in the history
  • Loading branch information
Bruno CHALOPIN authored and smalyshev committed Jul 15, 2013
1 parent 68e630b commit 2ec7b1c
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 28 deletions.
4 changes: 2 additions & 2 deletions INSTALL
Expand Up @@ -1819,7 +1819,7 @@ Installation
set of HTTP headers. The headers it did return are:
10. Windows: I've followed all the instructions, but still can't get
PHP and IIS to work together!
11. When running PHP as CGI with IIS, PWS, OmniHTTPD or Xitami, I get
11. When running PHP as CGI with IIS, OmniHTTPD or Xitami, I get
the following error: Security Alert! PHP CGI cannot be accessed
directly..
12. How do I know if my php.ini is being found and read? It seems like
Expand Down Expand Up @@ -2007,7 +2007,7 @@ cgi error:
And for IIS4 you need to tell it that PHP is a script engine.
Also, you will want to read this faq.

When running PHP as CGI with IIS, PWS, OmniHTTPD or Xitami, I get the
When running PHP as CGI with IIS, OmniHTTPD or Xitami, I get the
following error: Security Alert! PHP CGI cannot be accessed
directly..
You must set the cgi.force_redirect directive to 0. It defaults
Expand Down
2 changes: 0 additions & 2 deletions win32/build/mkdist.php
Expand Up @@ -238,8 +238,6 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */
"php.ini-development" => "php.ini-development",
"php.ini-production" => "php.ini-production",
"win32/install.txt" => "install.txt",
"win32/pws-php5cgi.reg" => "pws-php5cgi.reg",
"win32/pws-php5isapi.reg" => "pws-php5isapi.reg",
);

foreach ($text_files as $src => $dest) {
Expand Down
21 changes: 8 additions & 13 deletions win32/install.txt
Expand Up @@ -9,7 +9,7 @@ Installing PHP
Windows Installer
Manual Installation Steps
ActiveScript
Microsoft IIS / PWS
Microsoft IIS
Apache 1.3.x on Microsoft Windows
Apache 2.0.x on Microsoft Windows
Sun, iPlanet and Netscape servers on Microsoft Windows
Expand Down Expand Up @@ -211,7 +211,7 @@ Windows Installer (PHP 5.1.0 and earlier)

The Windows PHP installer is available from the downloads page at
http://www.php.net/downloads.php. This installs the CGI version of PHP
and for IIS, PWS, and Xitami, it configures the web server as well. The
and for IIS and Xitami, it configures the web server as well. The
installer does not include any extra external PHP extensions
(php_*.dll) as you'll only find those in the Windows Zip Package and
PECL downloads.
Expand Down Expand Up @@ -433,7 +433,7 @@ c:\php
follow the next step. Set the doc_root to point to your web servers
document_root. For example:

doc_root = c:\inetpub\wwwroot // for IIS/PWS
doc_root = c:\inetpub\wwwroot // for IIS

doc_root = c:\apache\htdocs // for Apache

Expand All @@ -442,11 +442,6 @@ doc_root = c:\apache\htdocs // for Apache
what is already built in. Note that on a new installation it is
advisable to first get PHP working and tested without any
extensions before enabling them in php.ini.
* On PWS and IIS, you can set the browscap configuration setting to
point to: c:\windows\system\inetsrv\browscap.ini on Windows 9x/Me,
c:\winnt\system32\inetsrv\browscap.ini on NT/2000, and
c:\windows\system32\inetsrv\browscap.ini on XP. For an up-to-date
browscap.ini, read the following FAQ.

PHP is now setup on your system. The next step is to choose a web
server, and enable it to run PHP. Choose a web server from the table of
Expand Down Expand Up @@ -499,7 +494,7 @@ ActiveScript
folder, if you wish to load extensions, etc.
__________________________________________________________________

Microsoft IIS / PWS
Microsoft IIS

This section contains notes and hints specific to IIS (Microsoft
Internet Information Server).
Expand All @@ -511,7 +506,7 @@ Microsoft IIS / PWS
yourself from those attacks.
__________________________________________________________________

General considerations for all installations of PHP with IIS or PWS
General considerations for all installations of PHP with IIS

* First, read the Manual Installation Instructions. Do not skip this
step as it provides crucial information for installing PHP on
Expand Down Expand Up @@ -543,7 +538,7 @@ General considerations for all installations of PHP with IIS or PWS
downloaded in the "Collection of PECL modules" package. Files such
as php_zip.dll and php_ssh2.dll. Download PHP files here.
* When defining the executable, the 'check that file exists' box may
also be checked. For a small performance penalty, the IIS (or PWS)
also be checked. For a small performance penalty, the IIS
will check that the script file exists and sort out authentication
before firing up PHP. This means that the web server will provide
sensible 404 style error messages instead of CGI errors complaining
Expand Down Expand Up @@ -1579,7 +1574,7 @@ cgi error:
11. Windows: I've followed all the instructions, but still can't get
PHP and IIS to work together!

12. When running PHP as CGI with IIS, PWS, OmniHTTPD or Xitami, I get
12. When running PHP as CGI with IIS, OmniHTTPD or Xitami, I get
the following error: Security Alert! PHP CGI cannot be accessed
directly..

Expand Down Expand Up @@ -1824,7 +1819,7 @@ cgi error:
tell it that PHP is a script engine. Also, you will want to read this
faq.

12. When running PHP as CGI with IIS, PWS, OmniHTTPD or Xitami, I get
12. When running PHP as CGI with IIS, OmniHTTPD or Xitami, I get
the following error: Security Alert! PHP CGI cannot be accessed
directly..

Expand Down
6 changes: 0 additions & 6 deletions win32/pws-php5cgi.reg

This file was deleted.

5 changes: 0 additions & 5 deletions win32/pws-php5isapi.reg

This file was deleted.

0 comments on commit 2ec7b1c

Please sign in to comment.