Remove old references to SAPIs and extensions no longer in the core

Author: KalleZ

Diff for: INSTALL

@@ -63,15 +63,10 @@ General Installation Considerations
    set  up anything on your own, only write your PHP scripts, upload it to
    the server you rent, and see the results in your browser.
 
-   In  case  of  setting  up  the server and PHP on your own, you have two
-   choices  for  the  method  of  connecting  PHP  to the server. For many
-   servers  PHP  has  a  direct module interface (also called SAPI). These
-   servers include Apache, Microsoft Internet Information Server, Netscape
-   and  iPlanet  servers.  Many  other servers have support for ISAPI, the
-   Microsoft  module  interface  (OmniHTTPd  for  example).  If PHP has no
-   module  support  for your web server, you can always use it as a CGI or
-   FastCGI  processor.  This  means  you set up your server to use the CGI
-   executable of PHP to process all PHP file requests on the server.
+   If PHP has no module  support  for your web server, ´you can always use 
+   it as a CGI or FastCGI  processor.  This  means  you set up your server 
+   to use the  CGI executable of PHP to process all  PHP file  requests on 
+   the server.
 
    If  you are also interested to use PHP for command line scripting (e.g.
    write scripts autogenerating some images for you offline, or processing
@@ -409,205 +404,7 @@ fastcgi.server = ( ".php" =>
    (( "host" => "10.0.0.2", "port" => 1030 ),
     ( "host" => "10.0.0.3", "port" => 1030 ))
 )
-     __________________________________________________________________
-     __________________________________________________________________
-
-Sun, iPlanet and Netscape servers on Sun Solaris
-
-   This  section  contains notes and hints specific to Sun Java System Web
-   Server, Sun ONE Web Server, iPlanet and Netscape server installs of PHP
-   on Sun Solaris.
-
-   From  PHP  4.3.3  on  you  can use PHP scripts with the NSAPI module to
-   generate   custom   directory  listings  and  error  pages.  Additional
-   functions  for  Apache compatibility are also available. For support in
-   current web servers read the note about subrequests.
-
-   You  can  find  more  information about setting up PHP for the Netscape
-   Enterprise Server (NES) here:
-   » http://benoit.noss.free.fr/php/install-php4.html
-
-   To  build  PHP  with  Sun JSWS/Sun ONE WS/iPlanet/Netscape web servers,
-   enter  the  proper install directory for the --with-nsapi=[DIR] option.
-   The  default directory is usually /opt/netscape/suitespot/. Please also
-   read /php-xxx-version/sapi/nsapi/nsapi-readme.txt.
-
-    1. Install  the following packages from »  http://www.sunfreeware.com/
-       or another download site:
-          + autoconf-2.13
-          + automake-1.4
-          + bison-1_25-sol26-sparc-local
-          + flex-2_5_4a-sol26-sparc-local
-          + gcc-2_95_2-sol26-sparc-local
-          + gzip-1.2.4-sol26-sparc-local
-          + m4-1_4-sol26-sparc-local
-          + make-3_76_1-sol26-sparc-local
-          + mysql-3.23.24-beta (if you want mysql support)
-          + perl-5_005_03-sol26-sparc-local
-          + tar-1.13 (GNU tar)
-    2. Make    sure    your   path   includes   the   proper   directories
-       PATH=.:/usr/local/bin:/usr/sbin:/usr/bin:/usr/ccs/bin  and  make it
-       available to your system export PATH.
-    3. gunzip  php-x.x.x.tar.gz  (if  you have a .gz dist, otherwise go to
-       4).
-    4. tar xvf php-x.x.x.tar
-    5. Change to your extracted PHP directory: cd ../php-x.x.x
-    6. For the following step, make sure /opt/netscape/suitespot/ is where
-       your netscape server is installed. Otherwise, change to the correct
-       path and run:
-./configure --with-mysql=/usr/local/mysql \
---with-nsapi=/opt/netscape/suitespot/ \
---enable-libgcc
-    7. Run make followed by make install.
-
-   After  performing  the  base install and reading the appropriate readme
-   file, you may need to perform some additional configuration steps.
-
-Configuration Instructions for Sun/iPlanet/Netscape
-
-   Firstly  you  may  need  to  add  some  paths  to  the  LD_LIBRARY_PATH
-   environment  for  the server to find all the shared libs. This can best
-   done in the start script for your web server. The start script is often
-   located  in:  /path/to/server/https-servername/start. You may also need
-   to    edit    the    configuration   files   that   are   located   in:
-   /path/to/server/https-servername/config/.
-    1. Add  the  following  line  to  mime.types  (you  can do that by the
-       administration server):
-type=magnus-internal/x-httpd-php exts=php
-
-    2. Edit  magnus.conf  (for servers >= 6) or obj.conf (for servers < 6)
-       and add the following, shlib will vary depending on your system, it
-       will  be something like /opt/netscape/suitespot/bin/libphp4.so. You
-       should place the following lines after mime types init.
-Init fn="load-modules" funcs="php4_init,php4_execute,php4_auth_trans" shlib="/op
-t/netscape/suitespot/bin/libphp4.so"
-Init fn="php4_init" LateInit="yes" errorString="Failed to initialize PHP!" [php_
-ini="/path/to/php.ini"]
-
-       (PHP  >=  4.3.3)  The php_ini parameter is optional but with it you
-       can place your php.ini in your web server config directory.
-    3. Configure  the  default  object  in  obj.conf  (for  virtual server
-       classes [version 6.0+] in their vserver.obj.conf):
-<Object name="default">
-.
-.
-.
-.#NOTE this next line should happen after all 'ObjectType' and before all 'AddLo
-g' lines
-Service fn="php4_execute" type="magnus-internal/x-httpd-php" [inikey=value inike
-y=value ...]
-.
-.
-</Object>
-
-       (PHP  >=  4.3.3)  As additional parameters you can add some special
-       php.ini-values, for example you can set a
-       docroot="/path/to/docroot"  specific to the context php4_execute is
-       called.   For  boolean  ini-keys  please  use  0/1  as  value,  not
-       "On","Off",...    (this    will    not    work   correctly),   e.g.
-       zlib.output_compression=1 instead of zlib.output_compression="On"
-    4. This  is only needed if you want to configure a directory that only
-       consists of PHP scripts (same like a cgi-bin directory):
-<Object name="x-httpd-php">
-ObjectType fn="force-type" type="magnus-internal/x-httpd-php"
-Service fn=php4_execute [inikey=value inikey=value ...]
-</Object>
-
-       After  that  you  can  configure  a directory in the Administration
-       server  and  assign  it the style x-httpd-php. All files in it will
-       get  executed  as  PHP.  This is nice to hide PHP usage by renaming
-       files to .html.
-    5. Setup of authentication: PHP authentication cannot be used with any
-       other  authentication.  ALL  AUTHENTICATION  IS  PASSED TO YOUR PHP
-       SCRIPT.  To configure PHP Authentication for the entire server, add
-       the following line to your default object:
-<Object name="default">
-AuthTrans fn=php4_auth_trans
-.
-.
-.
-</Object>
-
-    6. To use PHP Authentication on a single directory, add the following:
-<Object ppath="d:\path\to\authenticated\dir\*">
-AuthTrans fn=php4_auth_trans
-</Object>
-
-     Note:
-
-     The  stacksize that PHP uses depends on the configuration of the web
-     server.  If  you  get  crashes  with  very  large PHP scripts, it is
-     recommended  to  raise  it  with  the  Admin  Server (in the section
-     "MAGNUS EDITOR").
-
-CGI environment and recommended modifications in php.ini
-
-   Important  when  writing  PHP scripts is the fact that Sun JSWS/Sun ONE
-   WS/iPlanet/Netscape  is a multithreaded web server. Because of that all
-   requests  are  running  in the same process space (the space of the web
-   server  itself) and this space has only one environment. If you want to
-   get  CGI variables like PATH_INFO, HTTP_HOST etc. it is not the correct
-   way  to  try  this  in  the  old PHP way with getenv() or a similar way
-   (register  globals  to  environment,  $_ENV).  You  would  only get the
-   environment of the running web server without any valid CGI variables!
-
-     Note:
-
-     Why are there (invalid) CGI variables in the environment?
-
-     Answer:  This is because you started the web server process from the
-     admin  server  which  runs the startup script of the web server, you
-     wanted  to  start, as a CGI script (a CGI script inside of the admin
-     server!).  This is why the environment of the started web server has
-     some  CGI environment variables in it. You can test this by starting
-     the  web  server not from the administration server. Use the command
-     line  as root user and start it manually - you will see there are no
-     CGI-like environment variables.
-
-   Simply  change your scripts to get CGI variables in the correct way for
-   PHP  4.x  by  using the superglobal $_SERVER. If you have older scripts
-   which  use  $HTTP_HOST,  etc.,  you  should turn on register_globals in
-   php.ini  and  change the variable order too (important: remove "E" from
-   it, because you do not need the environment here):
-variables_order = "GPCS"
-register_globals = On
-
-Special use for error pages or self-made directory listings (PHP >= 4.3.3)
-
-   You  can  use  PHP  to  generate the error pages for "404 Not Found" or
-   similar.  Add  the  following  line to the object in obj.conf for every
-   error page you want to overwrite:
-Error fn="php4_execute" code=XXX script="/path/to/script.php" [inikey=value inik
-ey=value...]
-
-   where  XXX  is  the  HTTP  error  code.  Please  delete any other Error
-   directives  which  could  interfere  with yours. If you want to place a
-   page  for  all  errors  that could exist, leave the code parameter out.
-   Your script can get the HTTP status code with $_SERVER['ERROR_TYPE'].
-
-   Another  possibility  is to generate self-made directory listings. Just
-   create  a PHP script which displays a directory listing and replace the
-   corresponding default Service line for type="magnus-internal/directory"
-   in obj.conf with the following:
-Service fn="php4_execute" type="magnus-internal/directory" script="/path/to/scri
-pt.php" [inikey=value inikey=value...]
-
-   For  both  error  and  directory  listing  pages  the  original URI and
-   translated   URI   are   in  the  variables  $_SERVER['PATH_INFO']  and
-   $_SERVER['PATH_TRANSLATED'].
-
-Note about nsapi_virtual() and subrequests (PHP >= 4.3.3)
-
-   The  NSAPI  module  now  supports  the nsapi_virtual() function (alias:
-   virtual())  to make subrequests on the web server and insert the result
-   in the web page. This function uses some undocumented features from the
-   NSAPI  library.  On  Unix the module automatically looks for the needed
-   functions  and  uses  them  if  available.  If  not, nsapi_virtual() is
-   disabled.
-
-     Note:
 
-     But be warned: Support for nsapi_virtual() is EXPERIMENTAL!!!
      __________________________________________________________________
      __________________________________________________________________
 
@@ -1386,8 +1183,7 @@ The configuration file
 
    php.ini is searched for in these locations (in order):
      * SAPI  module specific location (PHPIniDir directive in Apache 2, -c
-       command  line  option  in  CGI and CLI, php_ini parameter in NSAPI,
-       PHP_INI_PATH environment variable in THTTPD)
+       command  line  option  in  CGI and CLI)
      * The  PHPRC environment variable. Before PHP 5.2.0, this was checked
        after the registry key mentioned below.
      * As  of  PHP  5.2.0, the location of the php.ini file can be set for

Diff for: Makefile.global

@@ -115,7 +115,7 @@ clean:
 	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
 	find . -name .libs -a -type d|xargs rm -rf
-	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
+	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
 	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
@@ -137,7 +137,7 @@ prof-clean:
 	find . -name \*.lo -o -name \*.o | xargs rm -f
 	find . -name \*.la -o -name \*.a | xargs rm -f 
 	find . -name \*.so | xargs rm -f
-	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_MILTER_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
+	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 prof-use:
 	CCACHE_DISABLE=1 $(MAKE) PROF_FLAGS=-fprofile-use all

Diff for: TSRM/TSRM.c

@@ -585,10 +585,6 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 	return pth_self();
 #elif defined(PTHREADS)
 	return pthread_self();
-#elif defined(NSAPI)
-	return systhread_current();
-#elif defined(PI3WEB)
-	return PIThread_getCurrent();
 #elif defined(TSRM_ST)
 	return st_thread_self();
 #elif defined(BETHREADS)
@@ -610,10 +606,6 @@ TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 #elif defined(PTHREADS)
 	mutexp = (pthread_mutex_t *)malloc(sizeof(pthread_mutex_t));
 	pthread_mutex_init(mutexp,NULL);
-#elif defined(NSAPI)
-	mutexp = crit_init();
-#elif defined(PI3WEB)
-	mutexp = PIPlatform_allocLocalMutex();
 #elif defined(TSRM_ST)
 	mutexp = st_mutex_new();
 #elif defined(BETHREADS)
@@ -640,10 +632,6 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 #elif defined(PTHREADS)
 		pthread_mutex_destroy(mutexp);
 		free(mutexp);
-#elif defined(NSAPI)
-		crit_terminate(mutexp);
-#elif defined(PI3WEB)
-		PISync_delete(mutexp);
 #elif defined(TSRM_ST)
 		st_mutex_destroy(mutexp);
 #elif defined(BETHREADS)
@@ -674,11 +662,6 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 	return -1;
 #elif defined(PTHREADS)
 	return pthread_mutex_lock(mutexp);
-#elif defined(NSAPI)
-	crit_enter(mutexp);
-	return 0;
-#elif defined(PI3WEB)
-	return PISync_lock(mutexp);
 #elif defined(TSRM_ST)
 	return st_mutex_lock(mutexp);
 #elif defined(BETHREADS)
@@ -706,11 +689,6 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 	return -1;
 #elif defined(PTHREADS)
 	return pthread_mutex_unlock(mutexp);
-#elif defined(NSAPI)
-	crit_exit(mutexp);
-	return 0;
-#elif defined(PI3WEB)
-	return PISync_unlock(mutexp);
 #elif defined(TSRM_ST)
 	return st_mutex_unlock(mutexp);
 #elif defined(BETHREADS)

Diff for: TSRM/TSRM.h

@@ -69,12 +69,6 @@ typedef int ts_rsrc_id;
 #elif defined(PTHREADS)
 # define THREAD_T pthread_t
 # define MUTEX_T pthread_mutex_t *
-#elif defined(NSAPI)
-# define THREAD_T SYS_THREAD
-# define MUTEX_T CRITICAL
-#elif defined(PI3WEB)
-# define THREAD_T PIThread *
-# define MUTEX_T PISync *
 #elif defined(TSRM_ST)
 # define THREAD_T st_thread_t
 # define MUTEX_T st_mutex_t

Diff for: ext/opcache/ZendAccelerator.c

@@ -2319,7 +2319,6 @@ static inline int accel_find_sapi(void)
 		"cli-server",
 		"cgi-fcgi",
 		"fpm-fcgi",
-		"isapi",
 		"apache2filter",
 		"apache2handler",
 		"litespeed",
@@ -2598,7 +2597,7 @@ static int accel_startup(zend_extension *extension)
 		    strcmp(sapi_module.name, "cli") == 0) {
 			zps_startup_failure("Opcode Caching is disabled for CLI", NULL, accelerator_remove_cb);
 		} else {
-			zps_startup_failure("Opcode Caching is only supported in Apache, ISAPI, FPM, FastCGI and LiteSpeed SAPIs", NULL, accelerator_remove_cb);
+			zps_startup_failure("Opcode Caching is only supported in Apache, FPM, FastCGI and LiteSpeed SAPIs", NULL, accelerator_remove_cb);
 		}
 		return SUCCESS;
 	}

Diff for: main/php.h

@@ -101,9 +101,7 @@ typedef int gid_t;
 typedef char * caddr_t;
 typedef unsigned int uint;
 typedef unsigned long ulong;
-# if !NSAPI
 typedef int pid_t;
-# endif
 
 # ifndef PHP_DEBUG
 #  ifdef inline

Diff for: win32/build/mkdist.php

@@ -45,12 +45,6 @@ function get_depends($module)
 		/* apache 2 */
 		'libhttpd.dll', 'libapr.dll', 'libaprutil.dll','libapr-1.dll', 'libaprutil-1.dll',
 
-		/* pi3web */
-		'piapi.dll', 'pi3api.dll',
-
-		/* nsapi */
-		'ns-httpd30.dll', 'ns-httpd35.dll', 'ns-httpd36.dll', 'ns-httpd40.dll',
-
 		/* oracle */
 		'oci.dll', 'ociw32.dll',