Skip to content

Commit 2ec7b1c

Browse files
Bruno CHALOPINsmalyshev
Bruno CHALOPIN
authored andcommitted
Remove PWS (Personal Web Server) references
1 parent 68e630b commit 2ec7b1c

File tree

5 files changed

+10
-28
lines changed

5 files changed

+10
-28
lines changed

INSTALL

+2-2
Original file line numberDiff line numberDiff line change
@@ -1819,7 +1819,7 @@ Installation
18191819
set of HTTP headers. The headers it did return are:
18201820
10. Windows: I've followed all the instructions, but still can't get
18211821
PHP and IIS to work together!
1822-
11. When running PHP as CGI with IIS, PWS, OmniHTTPD or Xitami, I get
1822+
11. When running PHP as CGI with IIS, OmniHTTPD or Xitami, I get
18231823
the following error: Security Alert! PHP CGI cannot be accessed
18241824
directly..
18251825
12. How do I know if my php.ini is being found and read? It seems like
@@ -2007,7 +2007,7 @@ cgi error:
20072007
And for IIS4 you need to tell it that PHP is a script engine.
20082008
Also, you will want to read this faq.
20092009

2010-
When running PHP as CGI with IIS, PWS, OmniHTTPD or Xitami, I get the
2010+
When running PHP as CGI with IIS, OmniHTTPD or Xitami, I get the
20112011
following error: Security Alert! PHP CGI cannot be accessed
20122012
directly..
20132013
You must set the cgi.force_redirect directive to 0. It defaults

win32/build/mkdist.php

-2
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,6 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */
238238
"php.ini-development" => "php.ini-development",
239239
"php.ini-production" => "php.ini-production",
240240
"win32/install.txt" => "install.txt",
241-
"win32/pws-php5cgi.reg" => "pws-php5cgi.reg",
242-
"win32/pws-php5isapi.reg" => "pws-php5isapi.reg",
243241
);
244242

245243
foreach ($text_files as $src => $dest) {

win32/install.txt

+8-13
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Installing PHP
99
Windows Installer
1010
Manual Installation Steps
1111
ActiveScript
12-
Microsoft IIS / PWS
12+
Microsoft IIS
1313
Apache 1.3.x on Microsoft Windows
1414
Apache 2.0.x on Microsoft Windows
1515
Sun, iPlanet and Netscape servers on Microsoft Windows
@@ -211,7 +211,7 @@ Windows Installer (PHP 5.1.0 and earlier)
211211

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

436-
doc_root = c:\inetpub\wwwroot // for IIS/PWS
436+
doc_root = c:\inetpub\wwwroot // for IIS
437437

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

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

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

502-
Microsoft IIS / PWS
497+
Microsoft IIS
503498

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

514-
General considerations for all installations of PHP with IIS or PWS
509+
General considerations for all installations of PHP with IIS
515510

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

1582-
12. When running PHP as CGI with IIS, PWS, OmniHTTPD or Xitami, I get
1577+
12. When running PHP as CGI with IIS, OmniHTTPD or Xitami, I get
15831578
the following error: Security Alert! PHP CGI cannot be accessed
15841579
directly..
15851580

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

1827-
12. When running PHP as CGI with IIS, PWS, OmniHTTPD or Xitami, I get
1822+
12. When running PHP as CGI with IIS, OmniHTTPD or Xitami, I get
18281823
the following error: Security Alert! PHP CGI cannot be accessed
18291824
directly..
18301825

win32/pws-php5cgi.reg

-6
This file was deleted.

win32/pws-php5isapi.reg

-5
This file was deleted.

0 commit comments

Comments
 (0)