@ -20,16 +20,30 @@
* PHP includes
*/
# define NSAPI 1
# define XP_UNIX
# include "php.h"
# include "php_variables.h"
# include "ext/standard/info.h"
# include "php_ini.h"
# include "php_globals.h"
# include "SAPI.h"
# include "main.h"
# include "php_version.h"
# include "TSRM.h"
# include "ext/standard/php_standard.h"
/*
* If neither XP_UNIX not XP_WIN32 is defined , try to guess which one .
* Ideally , this should be done by the configure script .
*/
# if !defined(XP_UNIX) && !defined(XP_WIN32)
# if defined(WIN32)
# define XP_WIN32
# else
# define XP_UNIX
# endif
# endif
/*
* NSAPI includes
@ -44,7 +58,7 @@
/* for unix */
# ifndef WINAPI
# define WINAPI
# define WINAPI
# endif
/*
@ -59,15 +73,10 @@
# define NSG(v) (request_context->v)
/*
* Currently , this doesn ' t work with ZTS .
* ZTS needs to be defined for NSAPI to work
*/
# if defined(ZTS)
# define IF_ZTS(a) a
# define IF_NOT_ZTS(a)
# else
# define IF_ZTS(a)
# define IF_NOT_ZTS(a) a
static CRITICAL php_mutex ;
# if !defined(ZTS)
# error "NSAPI module needs ZTS to be defined"
# endif
/*
@ -259,6 +268,31 @@ sapi_nsapi_read_cookies(SLS_D)
return cookie_string ;
}
static void
sapi_nsapi_register_server_variables ( zval * track_vars_array ELS_DC SLS_DC PLS_DC )
{
nsapi_request_context * rc = ( nsapi_request_context * ) SG ( server_context ) ;
size_t i ;
char * value = NULL ;
char buf [ 128 ] ;
* buf = 0 ;
for ( i = 0 ; i < nsapi_reqpb_size ; i + + ) {
if ( ( value = pblock_findval ( nsapi_reqpb [ i ] . nsapi_eq , rc - > rq - > reqpb ) ) = = NULL ) {
value = buf ;
}
php_register_variable ( ( char * ) nsapi_reqpb [ i ] . env_var , value , track_vars_array ELS_CC PLS_CC ) ;
}
/*
* Special PHP_SELF variable .
*/
value = pblock_findval ( " uri " , rc - > rq - > reqpb ) ;
if ( value ! = NULL ) {
php_register_variable ( " PHP_SELF " , value , track_vars_array ELS_CC PLS_CC ) ;
}
}
static sapi_module_struct sapi_module = {
" NSAPI " , /* name */
@ -282,7 +316,7 @@ static sapi_module_struct sapi_module = {
sapi_nsapi_read_post , /* read POST data */
sapi_nsapi_read_cookies , /* read Cookies */
NULL , /* register server variables */
sapi_nsapi_register_server_variables , /* register server variables */
NULL , /* Log message */
NULL , /* Block interruptions */
@ -391,7 +425,7 @@ nsapi_request_ctor(NSLS_D SLS_DC)
if ( uri ! = NULL )
path_translated = request_translate_uri ( uri , NSG ( sn ) ) ;
#if 0
# if defined(NSAPI_DEBUG)
log_error ( LOG_INFORM , " nsapi_request_ctor " , NSG ( sn ) , NSG ( rq ) ,
" query_string = %s, "
" uri = %s, "
@ -445,7 +479,7 @@ nsapi_module_main(NSLS_D SLS_DC)
file_handle . filename = SG ( request_info ) . path_translated ;
file_handle . free_filename = 0 ;
#if 0
# if defined(NSAPI_DEBUG)
log_error ( LOG_INFORM , " nsapi_module_main " , NSG ( sn ) , NSG ( rq ) ,
" Parsing [%s] " , SG ( request_info ) . path_translated ) ;
# endif
@ -468,32 +502,20 @@ php4_close(void *vparam)
if ( sapi_module . shutdown ) {
sapi_module . shutdown ( & sapi_module ) ;
}
IF_ZTS (
tsrm_shutdown ( ) ;
)
tsrm_shutdown ( ) ;
}
int WINAPI
php4_init ( pblock * pb , Session * sn , Request * rq )
{
PLS_FETCH ( ) ;
php_core_globals * core_globals ;
/*
* TSRM has not been tested .
*/
IF_ZTS (
tsrm_startup ( 1 , 1 , 0 ) ;
)
tsrm_startup ( 1 , 1 , 0 ) ;
core_globals = ts_resource ( core_globals_id ) ;
sapi_startup ( & sapi_module ) ;
sapi_module . startup ( & sapi_module ) ;
PG ( expose_php ) = 0 ;
IF_NOT_ZTS (
php_mutex = crit_init ( ) ;
)
log_error ( LOG_INFORM , " php4_init " , sn , rq , " Initialized PHP Module \n " ) ;
return REQ_PROCEED ;
}
@ -511,29 +533,12 @@ php4_execute(pblock *pb, Session *sn, Request *rq)
request_context - > sn = sn ;
request_context - > rq = rq ;
/*
* Single thread the execution , if ZTS is not enabled . Need to
* understand the behavior of Netscape server when the client
* cancels a request when it is in progress . This could cause
* a deadlock if the thread handling the specific client is not
* cancelled because the php_mutex will likely remain locked
* until the request that was cancelled completes . The behavior
* is also going to be platform specific .
*/
IF_NOT_ZTS (
crit_enter ( php_mutex ) ;
)
SG ( server_context ) = request_context ;
nsapi_request_ctor ( NSLS_C SLS_CC ) ;
retval = nsapi_module_main ( NSLS_C SLS_CC ) ;
nsapi_request_dtor ( NSLS_C SLS_CC ) ;
IF_NOT_ZTS (
crit_exit ( php_mutex ) ;
)
free ( request_context ) ;
return ( retval = = SUCCESS ) ? REQ_PROCEED : REQ_EXIT ;
Anthony Whitehead
26 years ago