thetaphi Wed Jul 2 18:39:37 2003 EDT
Modified files:
/php-src/sapi/nsapi nsapi-readme.txt nsapi.c
Log:
rename functions to php5_*
Index: php-src/sapi/nsapi/nsapi-readme.txt
diff -u php-src/sapi/nsapi/nsapi-readme.txt:1.6 php-src/sapi/nsapi/nsapi-readme.txt:1.7
--- php-src/sapi/nsapi/nsapi-readme.txt:1.6 Sun Jun 1 17:14:58 2003
+++ php-src/sapi/nsapi/nsapi-readme.txt Wed Jul 2 18:39:37 2003
@@ -1,5 +1,5 @@
-Configuration of your Netscape/SunONE/iPlanet Web Server for PHP4
--------------------------------------------------------------
+Configuration of your Netscape/SunONE/iPlanet Web Server for PHP5
+-----------------------------------------------------------------
These instructions are targetted at Netscape Enterprise Web Server and
SUN/Netscape Alliance iPlanet Web Server/SunONE Webserver.
@@ -28,13 +28,13 @@
for iPlanet/SunONE Web Server 6.0 and above however at the end of the
<path-to-server>/https-servername/config/magnus.conf file:
- Init fn="load-modules" funcs="php4_init,php4_execute,php4_auth_trans"
shlib="/path/to/phplibrary"
- Init fn=php4_init errorString="Failed to initialize PHP!"
[php_ini="/path/to/php.ini"]
+ Init fn="load-modules" funcs="php5_init,php5_execute,php5_auth_trans"
shlib="/path/to/phplibrary"
+ Init fn=php5_init errorString="Failed to initialize PHP!"
[php_ini="/path/to/php.ini"]
The "shlib" will vary depending on your OS:
- Unix: "<path-to-server>/bin/libphp4.so".
- Windows: "c:/path/to/PHP4/nsapiPHP4.dll"
+ Unix: "<path-to-server>/bin/libphp5.so".
+ Windows: "c:/path/to/php5/php5nsapi.dll"
In obj.conf (for virtual server classes [SunONE 6.0] in their vserver.obj.conf):
@@ -50,7 +50,7 @@
# 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"
- Service fn="php4_execute" type="magnus-internal/x-httpd-php" [inikey=value ...]
+ Service fn="php5_execute" type="magnus-internal/x-httpd-php" [inikey=value ...]
.
.
.
@@ -61,7 +61,7 @@
<Object name="x-httpd-php">
ObjectType fn="force-type" type="magnus-internal/x-httpd-php"
- Service fn="php4_execute" [inikey=value ...]
+ Service fn="php5_execute" [inikey=value ...]
</Object>
After that you can configure a directory in the Administration server and assign it
@@ -77,7 +77,7 @@
Authentication for the entire server, add the following line:
<Object name="default">
- AuthTrans fn=php4_auth_trans
+ AuthTrans fn=php5_auth_trans
.
.
.
@@ -88,6 +88,6 @@
To use PHP Authentication on a single directory, add the following:
<Object ppath="d:\path\to\authenticated\dir\*">
- AuthTrans fn=php4_auth_trans
+ AuthTrans fn=php5_auth_trans
</Object>
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.48 php-src/sapi/nsapi/nsapi.c:1.49
--- php-src/sapi/nsapi/nsapi.c:1.48 Wed Jul 2 09:39:41 2003
+++ php-src/sapi/nsapi/nsapi.c Wed Jul 2 18:39:37 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: nsapi.c,v 1.48 2003/07/02 13:39:41 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.49 2003/07/02 22:39:37 thetaphi Exp $ */
/*
* PHP includes
@@ -198,7 +198,7 @@
NULL,
NULL,
PHP_MINFO(nsapi),
- "$Revision: 1.48 $",
+ "$Revision: 1.49 $",
STANDARD_MODULE_PROPERTIES
};
/* }}} */
@@ -750,7 +750,7 @@
if (zend_alter_ini_entry(entry->param->name,
strlen(entry->param->name)+1,
entry->param->value, strlen(entry->param->value),
PHP_INI_USER, PHP_INI_STAGE_RUNTIME)==FAILURE) {
- log_error(LOG_WARN, "php4_execute", NSG(sn),
NSG(rq), "Cannot change php.ini key \"%s\" to \"%s\"", entry->param->name,
entry->param->value);
+ log_error(LOG_WARN, "php5_execute", NSG(sn),
NSG(rq), "Cannot change php.ini key \"%s\" to \"%s\"", entry->param->name,
entry->param->value);
}
}
entry=entry->next;
@@ -758,7 +758,7 @@
}
}
-void NSAPI_PUBLIC php4_close(void *vparam)
+void NSAPI_PUBLIC php5_close(void *vparam)
{
if (nsapi_sapi_module.shutdown) {
nsapi_sapi_module.shutdown(&nsapi_sapi_module);
@@ -770,10 +770,10 @@
tsrm_shutdown();
- log_error(LOG_INFORM, "php4_close", NULL, NULL, "Shutdown PHP Module");
+ log_error(LOG_INFORM, "php5_close", NULL, NULL, "Shutdown PHP Module");
}
-int NSAPI_PUBLIC php4_init(pblock *pb, Session *sn, Request *rq)
+int NSAPI_PUBLIC php5_init(pblock *pb, Session *sn, Request *rq)
{
php_core_globals *core_globals;
char *ini_path;
@@ -790,7 +790,7 @@
core_globals = ts_resource(core_globals_id);
- /* look if php_ini parameter is given to php4_init */
+ /* look if php_ini parameter is given to php5_init */
if (ini_path = pblock_findval("php_ini", pb)) {
nsapi_sapi_module.php_ini_path_override = strdup(ini_path);
}
@@ -799,13 +799,13 @@
sapi_startup(&nsapi_sapi_module);
nsapi_sapi_module.startup(&nsapi_sapi_module);
- daemon_atrestart(&php4_close, NULL);
+ daemon_atrestart(&php5_close, NULL);
- log_error(LOG_INFORM, "php4_init", sn, rq, "Initialized PHP Module (%d threads
exspected)", threads);
+ log_error(LOG_INFORM, "php5_init", sn, rq, "Initialized PHP Module (%d threads
exspected)", threads);
return REQ_PROCEED;
}
-int NSAPI_PUBLIC php4_execute(pblock *pb, Session *sn, Request *rq)
+int NSAPI_PUBLIC php5_execute(pblock *pb, Session *sn, Request *rq)
{
int retval;
nsapi_request_context *request_context;
@@ -826,7 +826,7 @@
by looking for a request context in the current thread */
if (SG(server_context)) {
/* send 500 internal server error */
- log_error(LOG_WARN, "php4_execute", sn, rq, "Cannot make nesting PHP
requests with virtual()");
+ log_error(LOG_WARN, "php5_execute", sn, rq, "Cannot make nesting PHP
requests with virtual()");
protocol_status(sn, rq, 500, NULL);
return REQ_ABORTED;
}
@@ -860,13 +860,13 @@
retval=REQ_PROCEED;
} else {
/* send 500 internal server error */
- log_error(LOG_WARN, "php4_execute", sn, rq, "Cannot prepare
PHP engine!");
+ log_error(LOG_WARN, "php5_execute", sn, rq, "Cannot prepare
PHP engine!");
protocol_status(sn, rq, 500, NULL);
retval=REQ_ABORTED;
}
} else {
/* send 404 because file not found */
- log_error(LOG_WARN, "php4_execute", sn, rq, "Cannot execute PHP
script: %s", SG(request_info).path_translated);
+ log_error(LOG_WARN, "php5_execute", sn, rq, "Cannot execute PHP
script: %s", SG(request_info).path_translated);
protocol_status(sn, rq, 404, NULL);
retval=REQ_ABORTED;
}
@@ -890,15 +890,15 @@
/ will pass authentication through to php, and allow us to
/ check authentication with our scripts.
/
-/ php4_auth_trans
+/ php5_auth_trans
/ main function called from netscape server to authenticate
/ a line in obj.conf:
-/ funcs=php4_auth_trans shlib="path/to/this/phpnsapi.dll"
+/ funcs=php5_auth_trans shlib="path/to/this/phpnsapi.dll"
/ and:
/ <Object ppath="path/to/be/authenticated/by/php/*">
-/ AuthTrans fn="php4_auth_trans"
+/ AuthTrans fn="php5_auth_trans"
/*********************************************************/
-int NSAPI_PUBLIC php4_auth_trans(pblock * pb, Session * sn, Request * rq)
+int NSAPI_PUBLIC php5_auth_trans(pblock * pb, Session * sn, Request * rq)
{
/* This is a DO NOTHING function that allows authentication
* information
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
