summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
Diffstat (limited to 'sapi')
-rw-r--r--sapi/aolserver/aolserver.c12
-rw-r--r--sapi/apache/mod_php4.c22
-rw-r--r--sapi/apache/php_apache.c6
-rw-r--r--sapi/apache/sapi_apache.c6
-rw-r--r--sapi/apache2filter/sapi_apache2.c14
-rw-r--r--sapi/caudium/caudium.c56
-rw-r--r--sapi/cgi/cgi_main.c22
-rw-r--r--sapi/fastcgi/fastcgi.c10
-rw-r--r--sapi/isapi/php4isapi.c58
-rw-r--r--sapi/nsapi/nsapi.c30
-rw-r--r--sapi/phttpd/phttpd.c10
-rw-r--r--sapi/pi3web/pi3web_sapi.c12
-rw-r--r--sapi/roxen/roxen.c12
-rw-r--r--sapi/servlet/servlet.c8
-rw-r--r--sapi/thttpd/thttpd.c28
-rw-r--r--sapi/tux/php_tux.c30
16 files changed, 169 insertions, 167 deletions
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c
index 81dbda5346..55b74b0233 100644
--- a/sapi/aolserver/aolserver.c
+++ b/sapi/aolserver/aolserver.c
@@ -305,13 +305,13 @@ php_ns_startup(sapi_module_struct *sapi_module)
*/
#define ADD_STRINGX(name,buf) \
- php_register_variable(name, buf, track_vars_array ELS_CC PLS_CC)
+ php_register_variable(name, buf, track_vars_array TSRMLS_CC PLS_CC)
#define ADD_STRING(name) \
ADD_STRINGX(name, buf)
static void
-php_ns_sapi_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC)
+php_ns_sapi_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
{
int i;
char buf[NS_BUF_SIZE + 1];
@@ -418,7 +418,7 @@ php_ns_module_main(NSLS_D SLS_DC)
{
zend_file_handle file_handle;
CLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
PLS_FETCH();
file_handle.type = ZEND_HANDLE_FILENAME;
@@ -427,11 +427,11 @@ php_ns_module_main(NSLS_D SLS_DC)
file_handle.opened_path = NULL;
php_ns_config(global_context, 0);
- if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) {
+ if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) {
return NS_ERROR;
}
- php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
+ php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
php_request_shutdown(NULL);
return NS_OK;
@@ -617,7 +617,7 @@ int Ns_ModuleInit(char *server, char *module)
sapi_module.startup(&aolserver_sapi_module);
/* TSRM is used to allocate a per-thread structure */
- ns_globals_id = ts_allocate_id(sizeof(ns_globals_struct), NULL, NULL);
+ ts_allocate_id(&ns_globals_id, sizeof(ns_globals_struct), NULL, NULL);
/* the context contains data valid for all threads */
ctx = malloc(sizeof *ctx);
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index fc9782016e..0a17b61721 100644
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -64,7 +64,7 @@
/* {{{ Prototypes
*/
-int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC ELS_DC PLS_DC SLS_DC);
+int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC TSRMLS_DC PLS_DC SLS_DC);
void php_save_umask(void);
void php_restore_umask(void);
int sapi_apache_read_post(char *buffer, uint count_bytes SLS_DC);
@@ -235,7 +235,7 @@ int sapi_apache_send_headers(sapi_headers_struct *sapi_headers SLS_DC)
/* {{{ sapi_apache_register_server_variables
*/
-static void sapi_apache_register_server_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC)
+static void sapi_apache_register_server_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
{
register int i;
array_header *arr = table_elts(((request_rec *) SG(server_context))->subprocess_env);
@@ -251,7 +251,7 @@ static void sapi_apache_register_server_variables(zval *track_vars_array ELS_DC
} else {
val = empty_string;
}
- php_register_variable(elts[i].key, val, track_vars_array ELS_CC PLS_CC);
+ php_register_variable(elts[i].key, val, track_vars_array TSRMLS_CC PLS_CC);
}
/* If PATH_TRANSLATED doesn't exist, copy it from SCRIPT_FILENAME */
@@ -266,10 +266,10 @@ static void sapi_apache_register_server_variables(zval *track_vars_array ELS_DC
if (symbol_table
&& !zend_hash_exists(symbol_table, "PATH_TRANSLATED", sizeof("PATH_TRANSLATED"))
&& zend_hash_find(symbol_table, "SCRIPT_FILENAME", sizeof("SCRIPT_FILENAME"), (void **) &path_translated)==SUCCESS) {
- php_register_variable("PATH_TRANSLATED", Z_STRVAL_PP(path_translated), track_vars_array ELS_CC PLS_CC);
+ php_register_variable("PATH_TRANSLATED", Z_STRVAL_PP(path_translated), track_vars_array TSRMLS_CC PLS_CC);
}
- php_register_variable("PHP_SELF", ((request_rec *) SG(server_context))->uri, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("PHP_SELF", ((request_rec *) SG(server_context))->uri, track_vars_array TSRMLS_CC PLS_CC);
}
/* }}} */
@@ -493,7 +493,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
int retval;
HashTable *per_dir_conf;
SLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
CLS_FETCH();
PLS_FETCH();
APLS_FETCH();
@@ -505,7 +505,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
fh.opened_path = NULL;
fh.free_filename = 0;
fh.type = ZEND_HANDLE_FILENAME;
- zend_execute_scripts(ZEND_INCLUDE CLS_CC ELS_CC, 1, &fh);
+ zend_execute_scripts(ZEND_INCLUDE CLS_CC TSRMLS_CC, 1, &fh);
return OK;
}
@@ -533,7 +533,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
r->content_type = php_apache_get_default_mimetype(r SLS_CC);
r->allowed |= (1 << METHODS) - 1;
zend_try {
- zend_ini_deactivate(ELS_C);
+ zend_ini_deactivate(TSRMLS_C);
} zend_end_try();
return DECLINED;
}
@@ -545,7 +545,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
#if MODULE_MAGIC_NUMBER > 19961007
if ((retval = setup_client_block(r, REQUEST_CHUNKED_ERROR))) {
zend_try {
- zend_ini_deactivate(ELS_C);
+ zend_ini_deactivate(TSRMLS_C);
} zend_end_try();
return retval;
}
@@ -555,7 +555,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
#if MODULE_MAGIC_NUMBER < 19970912
if ((retval = set_last_modified(r, r->finfo.st_mtime))) {
zend_try {
- zend_ini_deactivate(ELS_C);
+ zend_ini_deactivate(TSRMLS_C);
} zend_end_try();
return retval;
}
@@ -579,7 +579,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
add_cgi_vars(r);
init_request_info(SLS_C);
- apache_php_module_main(r, display_source_mode CLS_CC ELS_CC PLS_CC SLS_CC);
+ apache_php_module_main(r, display_source_mode CLS_CC TSRMLS_CC PLS_CC SLS_CC);
/* Done, restore umask, turn off timeout, close file and return */
php_restore_umask();
diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index c969371526..fd0270414a 100644
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -90,7 +90,7 @@ PHP_INI_END()
-static void php_apache_globals_ctor(php_apache_info_struct *apache_globals)
+static void php_apache_globals_ctor(php_apache_info_struct *apache_globals TSRMLS_DC)
{
apache_globals->in_request = 0;
}
@@ -99,9 +99,9 @@ static void php_apache_globals_ctor(php_apache_info_struct *apache_globals)
static PHP_MINIT_FUNCTION(apache)
{
#ifdef ZTS
- php_apache_info_id = ts_allocate_id(sizeof(php_apache_info_struct), php_apache_globals_ctor, NULL);
+ ts_allocate_id(&php_apache_info_id, sizeof(php_apache_info_struct), php_apache_globals_ctor, NULL);
#else
- php_apache_globals_ctor(&php_apache_info);
+ php_apache_globals_ctor(&php_apache_info TSRMLS_CC);
#endif
REGISTER_INI_ENTRIES();
return SUCCESS;
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c
index 35d707d024..1ad8807f9d 100644
--- a/sapi/apache/sapi_apache.c
+++ b/sapi/apache/sapi_apache.c
@@ -60,12 +60,12 @@
/* {{{ apache_php_module_main
*/
-int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC ELS_DC PLS_DC SLS_DC)
+int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC TSRMLS_DC PLS_DC SLS_DC)
{
zend_file_handle file_handle;
APLS_FETCH();
- if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) {
+ if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) {
return FAILURE;
}
/* sending a file handle to another dll is not working
@@ -88,7 +88,7 @@ int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC ELS_DC
file_handle.opened_path = NULL;
file_handle.free_filename = 0;
- (void) php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
+ (void) php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
}
AP(in_request) = 0;
diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index eede7c88d7..03a2ed90b9 100644
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -143,7 +143,7 @@ php_apache_sapi_read_cookies(SLS_D)
}
static void
-php_apache_sapi_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC)
+php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
{
php_struct *ctx = SG(server_context);
apr_array_header_t *arr = apr_table_elts(ctx->f->r->subprocess_env);
@@ -151,10 +151,10 @@ php_apache_sapi_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC)
APR_ARRAY_FOREACH_OPEN(arr, key, val)
if (!val) val = empty_string;
- php_register_variable(key, val, track_vars_array ELS_CC PLS_CC);
+ php_register_variable(key, val, track_vars_array TSRMLS_CC PLS_CC);
APR_ARRAY_FOREACH_CLOSE()
- php_register_variable("PHP_SELF", ctx->f->r->uri, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("PHP_SELF", ctx->f->r->uri, track_vars_array TSRMLS_CC PLS_CC);
}
static void
@@ -266,7 +266,7 @@ static void php_apache_request_ctor(ap_filter_t *f, php_struct *ctx SLS_DC)
char *content_type;
const char *auth;
CLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
PLS_FETCH();
PG(during_request_startup) = 0;
@@ -291,7 +291,7 @@ static void php_apache_request_ctor(ap_filter_t *f, php_struct *ctx SLS_DC)
auth = apr_table_get(f->r->headers_in, "Authorization");
php_handle_auth_data(auth SLS_CC);
- php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC);
+ php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC);
}
static void php_apache_request_dtor(ap_filter_t *f SLS_DC)
@@ -340,7 +340,7 @@ static int php_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
zend_file_handle zfd;
apr_bucket *eos;
CLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
PLS_FETCH();
/* We want to execute only one script per request.
@@ -365,7 +365,7 @@ static int php_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
zfd.free_filename = 0;
zfd.opened_path = NULL;
- php_execute_script(&zfd CLS_CC ELS_CC PLS_CC);
+ php_execute_script(&zfd CLS_CC TSRMLS_CC PLS_CC);
} else {
#define NO_DATA "The PHP Filter did not receive suitable input data"
diff --git a/sapi/caudium/caudium.c b/sapi/caudium/caudium.c
index 44e296b51c..4c1cc60f38 100644
--- a/sapi/caudium/caudium.c
+++ b/sapi/caudium/caudium.c
@@ -474,55 +474,55 @@ static zend_module_entry php_caudium_module = {
};
-INLINE static void low_sapi_caudium_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC)
+INLINE static void low_sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
{
char *tmp;
php_register_variable("PHP_SELF", SG(request_info).request_uri,
- track_vars_array ELS_CC PLS_CC);
+ track_vars_array TSRMLS_CC PLS_CC);
php_register_variable("GATEWAY_INTERFACE", "CGI/1.1",
- track_vars_array ELS_CC PLS_CC);
+ track_vars_array TSRMLS_CC PLS_CC);
php_register_variable("REQUEST_METHOD",
(char *) SG(request_info).request_method,
- track_vars_array ELS_CC PLS_CC);
+ track_vars_array TSRMLS_CC PLS_CC);
php_register_variable("REQUEST_URI", SG(request_info).request_uri,
- track_vars_array ELS_CC PLS_CC);
+ track_vars_array TSRMLS_CC PLS_CC);
php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated,
- track_vars_array ELS_CC PLS_CC);
+ track_vars_array TSRMLS_CC PLS_CC);
if( (tmp = lookup_string_header("SERVER_NAME", NULL)) != NULL)
- php_register_variable("SERVER_NAME", tmp, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("SERVER_NAME", tmp, track_vars_array TSRMLS_CC PLS_CC);
if( (tmp = lookup_string_header("SERVER_PORT", NULL)) != NULL)
- php_register_variable("SERVER_PORT", tmp, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("SERVER_PORT", tmp, track_vars_array TSRMLS_CC PLS_CC);
if( (tmp = lookup_string_header("SERVER_PROTOCOL", NULL)) != NULL)
- php_register_variable("SERVER_PROTOCOL", tmp, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("SERVER_PROTOCOL", tmp, track_vars_array TSRMLS_CC PLS_CC);
if( (tmp = lookup_string_header("SCRIPT_NAME", NULL)) != NULL)
- php_register_variable("SCRIPT_NAME", tmp, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("SCRIPT_NAME", tmp, track_vars_array TSRMLS_CC PLS_CC);
if( (tmp = lookup_string_header("SCRIPT_FILENAME", NULL)) != NULL)
- php_register_variable("SCRIPT_FILENAME", tmp, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("SCRIPT_FILENAME", tmp, track_vars_array TSRMLS_CC PLS_CC);
if( (tmp = lookup_string_header("REMOTE_ADDR", NULL)) != NULL)
- php_register_variable("REMOTE_ADDR", tmp, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("REMOTE_ADDR", tmp, track_vars_array TSRMLS_CC PLS_CC);
if( (tmp = lookup_string_header("REMOTE_PORT", NULL)) != NULL)
- php_register_variable("REMOTE_PORT", tmp, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("REMOTE_PORT", tmp, track_vars_array TSRMLS_CC PLS_CC);
if( (tmp = lookup_string_header("DOCUMENT_ROOT", NULL)) != NULL)
- php_register_variable("DOCUMENT_ROOT", tmp, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("DOCUMENT_ROOT", tmp, track_vars_array TSRMLS_CC PLS_CC);
if( (tmp = lookup_string_header("HTTP_CONNECTION", NULL)) != NULL)
- php_register_variable("HTTP_CONNECTION", tmp, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("HTTP_CONNECTION", tmp, track_vars_array TSRMLS_CC PLS_CC);
if( (tmp = lookup_string_header("HTTP_USER_AGENT", NULL)) != NULL)
- php_register_variable("HTTP_USER_AGENT", tmp, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("HTTP_USER_AGENT", tmp, track_vars_array TSRMLS_CC PLS_CC);
if( (tmp = lookup_string_header("DOCUMENT_ROOT", NULL)) != NULL)
- php_register_variable("DOCUMENT_ROOT", tmp, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("DOCUMENT_ROOT", tmp, track_vars_array TSRMLS_CC PLS_CC);
if( (tmp = lookup_string_header("QUERY_STRING", "")) != NULL)
- php_register_variable("QUERY_STRING", tmp, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("QUERY_STRING", tmp, track_vars_array TSRMLS_CC PLS_CC);
if( (tmp = lookup_string_header("REMOTE_USER", NULL)) != NULL)
- php_register_variable("REMOTE_USER", tmp, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("REMOTE_USER", tmp, track_vars_array TSRMLS_CC PLS_CC);
if( (tmp = lookup_string_header("REMOTE_PASSWORD", NULL)) != NULL)
- php_register_variable("REMOTE_PASSWORD", tmp, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("REMOTE_PASSWORD", tmp, track_vars_array TSRMLS_CC PLS_CC);
}
-static void sapi_caudium_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC)
+static void sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
{
- THREAD_SAFE_RUN(low_sapi_caudium_register_variables(track_vars_array ELS_CC SLS_CC PLS_CC), "register_variables");
+ THREAD_SAFE_RUN(low_sapi_caudium_register_variables(track_vars_array TSRMLS_CC SLS_CC PLS_CC), "register_variables");
}
/* this structure is static (as in "it does not change") */
@@ -556,7 +556,7 @@ static sapi_module_struct caudium_sapi_module = {
* with a number of variables. HTTP_* variables are created for
* the HTTP header data, so that a script can access these.
*/
-static void php_caudium_hash_environment(CLS_D ELS_DC PLS_DC SLS_DC)
+static void php_caudium_hash_environment(CLS_D TSRMLS_DC PLS_DC SLS_DC)
{
int i;
char buf[512];
@@ -615,7 +615,7 @@ static void php_caudium_module_main(php_caudium_request *ureq)
SLS_FETCH();
CLS_FETCH();
PLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
GET_THIS();
THIS->filename = ureq->filename;
THIS->done_cb = ureq->done_cb;
@@ -700,7 +700,7 @@ static void php_caudium_module_main(php_caudium_request *ureq)
file_handle.free_filename = 0;
THIS->written = 0;
- res = php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC);
+ res = php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC);
if(res == FAILURE) {
THREAD_SAFE_RUN({
@@ -709,9 +709,9 @@ static void php_caudium_module_main(php_caudium_request *ureq)
free_struct(SLS_C);
}, "Negative run response");
} else {
- THREAD_SAFE_RUN(php_caudium_hash_environment(CLS_C ELS_CC PLS_CC SLS_CC),
+ THREAD_SAFE_RUN(php_caudium_hash_environment(CLS_C TSRMLS_CC PLS_CC SLS_CC),
"environment hashing");
- php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
+ php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
php_request_shutdown(NULL);
THREAD_SAFE_RUN({
push_int(THIS->written);
@@ -817,7 +817,7 @@ void pike_module_init( void )
if (!caudium_php_initialized) {
caudium_php_initialized = 1;
tsrm_startup(1, 1, 0, NULL);
- caudium_globals_id = ts_allocate_id(sizeof(php_caudium_request), NULL, NULL);
+ ts_allocate_id(&caudium_globals_id, sizeof(php_caudium_request), NULL, NULL);
sapi_startup(&caudium_sapi_module);
sapi_module.startup(&caudium_sapi_module);
zend_startup_module(&php_caudium_module);
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 002d6c89c4..26378b7639 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -166,15 +166,15 @@ static char *sapi_cgi_read_cookies(SLS_D)
}
-static void sapi_cgi_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC)
+static void sapi_cgi_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
{
/* In CGI mode, we consider the environment to be a part of the server
* variables
*/
- php_import_environment_variables(track_vars_array ELS_CC PLS_CC);
+ php_import_environment_variables(track_vars_array TSRMLS_CC PLS_CC);
/* Build the special-case PHP_SELF variable for the CGI version */
- php_register_variable("PHP_SELF", (SG(request_info).request_uri ? SG(request_info).request_uri:""), track_vars_array ELS_CC PLS_CC);
+ php_register_variable("PHP_SELF", (SG(request_info).request_uri ? SG(request_info).request_uri:""), track_vars_array TSRMLS_CC PLS_CC);
}
@@ -347,7 +347,7 @@ static void define_command_line_ini_entry(char *arg)
static void php_register_command_line_global_vars(char **arg)
{
char *var, *val;
- ELS_FETCH();
+ TSRMLS_FETCH();
PLS_FETCH();
var = *arg;
@@ -356,7 +356,7 @@ static void php_register_command_line_global_vars(char **arg)
printf("No value specified for variable '%s'\n", var);
} else {
*val++ = '\0';
- php_register_variable(var, val, NULL ELS_CC PLS_CC);
+ php_register_variable(var, val, NULL TSRMLS_CC PLS_CC);
}
efree(*arg);
}
@@ -385,6 +385,7 @@ int main(int argc, char *argv[])
zend_executor_globals *executor_globals;
php_core_globals *core_globals;
sapi_globals_struct *sapi_globals;
+ void ***tsrm_ls;
#endif
@@ -483,6 +484,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
executor_globals = ts_resource(executor_globals_id);
core_globals = ts_resource(core_globals_id);
sapi_globals = ts_resource(sapi_globals_id);
+ tsrm_ls = ts_resource(0);
#endif
zend_try {
@@ -561,7 +563,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
break;
case 'i': /* php info & quit */
- if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC)==FAILURE) {
+ if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC)==FAILURE) {
php_module_shutdown();
return FAILURE;
}
@@ -608,7 +610,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
case 'v': /* show php version & quit */
no_headers = 1;
- if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC)==FAILURE) {
+ if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC)==FAILURE) {
php_module_shutdown();
return FAILURE;
}
@@ -665,7 +667,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
SG(request_info).path_translated = script_file;
}
- if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC)==FAILURE) {
+ if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC)==FAILURE) {
php_module_shutdown();
return FAILURE;
}
@@ -732,11 +734,11 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
switch (behavior) {
case PHP_MODE_STANDARD:
- exit_status = php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
+ exit_status = php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
break;
case PHP_MODE_LINT:
PG(during_request_startup) = 0;
- exit_status = php_lint_script(&file_handle CLS_CC ELS_CC PLS_CC);
+ exit_status = php_lint_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
if (exit_status==SUCCESS) {
zend_printf("No syntax errors detected in %s\n", file_handle.filename);
} else {
diff --git a/sapi/fastcgi/fastcgi.c b/sapi/fastcgi/fastcgi.c
index e9ee629fc7..344c343c88 100644
--- a/sapi/fastcgi/fastcgi.c
+++ b/sapi/fastcgi/fastcgi.c
@@ -147,7 +147,7 @@ static char *sapi_fastcgi_read_cookies(SLS_D)
}
-static void sapi_fastcgi_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC)
+static void sapi_fastcgi_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
{
char *self = getenv("REQUEST_URI");
char *ptr = strchr( self, '?' );
@@ -162,7 +162,7 @@ static void sapi_fastcgi_register_variables(zval *track_vars_array ELS_DC SLS_DC
/* strip query string off this */
if ( ptr ) *ptr = 0;
- php_register_variable( "PHP_SELF", getenv("REQUEST_URI"), track_vars_array ELS_CC PLS_CC);
+ php_register_variable( "PHP_SELF", getenv("REQUEST_URI"), track_vars_array TSRMLS_CC PLS_CC);
if ( ptr ) *ptr = '?';
}
@@ -203,7 +203,7 @@ static void fastcgi_module_main(TLS_D SLS_DC)
{
zend_file_handle file_handle;
CLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
PLS_FETCH();
file_handle.type = ZEND_HANDLE_FILENAME;
@@ -211,8 +211,8 @@ static void fastcgi_module_main(TLS_D SLS_DC)
file_handle.free_filename = 0;
file_handle.opened_path = NULL;
- if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == SUCCESS) {
- php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
+ if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == SUCCESS) {
+ php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
php_request_shutdown(NULL);
}
}
diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c
index c006016cf7..6074fcb216 100644
--- a/sapi/isapi/php4isapi.c
+++ b/sapi/isapi/php4isapi.c
@@ -361,7 +361,7 @@ static char *sapi_isapi_read_cookies(SLS_D)
#ifdef WITH_ZEUS
-static void sapi_isapi_register_zeus_ssl_variables(LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array ELS_DC PLS_DC)
+static void sapi_isapi_register_zeus_ssl_variables(LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array TSRMLS_DC PLS_DC)
{
char static_variable_buf[ISAPI_SERVER_VAR_BUF_SIZE];
DWORD variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
@@ -379,7 +379,7 @@ static void sapi_isapi_register_zeus_ssl_variables(LPEXTENSION_CONTROL_BLOCK lpE
if( lpECB->GetServerVariable( lpECB->ConnID, "SSL_CLIENT_ST", static_variable_buf, &variable_len ) && static_variable_buf[0] ) {
strcat( static_cons_buf, static_variable_buf );
}
- php_register_variable( "SSL_CLIENT_DN", static_cons_buf, track_vars_array ELS_CC PLS_CC );
+ php_register_variable( "SSL_CLIENT_DN", static_cons_buf, track_vars_array TSRMLS_CC PLS_CC );
strcpy( static_cons_buf, "/C=" );
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
@@ -391,10 +391,10 @@ static void sapi_isapi_register_zeus_ssl_variables(LPEXTENSION_CONTROL_BLOCK lpE
if( lpECB->GetServerVariable( lpECB->ConnID, "SSL_CLIENT_I_ST", static_variable_buf, &variable_len ) && static_variable_buf[0] ) {
strcat( static_cons_buf, static_variable_buf );
}
- php_register_variable( "SSL_CLIENT_I_DN", static_cons_buf, track_vars_array ELS_CC PLS_CC );
+ php_register_variable( "SSL_CLIENT_I_DN", static_cons_buf, track_vars_array TSRMLS_CC PLS_CC );
}
-static void sapi_isapi_register_zeus_variables(LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array ELS_DC PLS_DC)
+static void sapi_isapi_register_zeus_variables(LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array TSRMLS_DC PLS_DC)
{
char static_variable_buf[ISAPI_SERVER_VAR_BUF_SIZE];
DWORD variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
@@ -413,11 +413,11 @@ static void sapi_isapi_register_zeus_variables(LPEXTENSION_CONTROL_BLOCK lpECB,
if ( lpECB->GetServerVariable(lpECB->ConnID, "PATH_INFO", static_variable_buf, &variable_len) && static_variable_buf[0] ) {
/* PHP_SELF is just PATH_INFO */
- php_register_variable( "PHP_SELF", static_variable_buf, track_vars_array ELS_CC PLS_CC );
+ php_register_variable( "PHP_SELF", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
/* Chop off filename to get just the 'real' PATH_INFO' */
pathinfo_len = variable_len - scriptname_len;
- php_register_variable( "PATH_INFO", static_variable_buf + scriptname_len - 1, track_vars_array ELS_CC PLS_CC );
+ php_register_variable( "PATH_INFO", static_variable_buf + scriptname_len - 1, track_vars_array TSRMLS_CC PLS_CC );
/* append query string to give url... extra byte for '?' */
if ( strlen(lpECB->lpszQueryString) + variable_len + 1 < ISAPI_SERVER_VAR_BUF_SIZE ) {
/* append query string only if it is present... */
@@ -425,8 +425,8 @@ static void sapi_isapi_register_zeus_variables(LPEXTENSION_CONTROL_BLOCK lpECB,
static_variable_buf[ variable_len - 1 ] = '?';
strcpy( static_variable_buf + variable_len, lpECB->lpszQueryString );
}
- php_register_variable( "URL", static_variable_buf, track_vars_array ELS_CC PLS_CC );
- php_register_variable( "REQUEST_URI", static_variable_buf, track_vars_array ELS_CC PLS_CC );
+ php_register_variable( "URL", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable( "REQUEST_URI", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
}
}
@@ -434,38 +434,38 @@ static void sapi_isapi_register_zeus_variables(LPEXTENSION_CONTROL_BLOCK lpECB,
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if ( lpECB->GetServerVariable(lpECB->ConnID, "PATH_TRANSLATED", static_variable_buf, &variable_len) && static_variable_buf[0] ) {
static_variable_buf[ variable_len - pathinfo_len - 1 ] = '\0';
- php_register_variable( "PATH_TRANSLATED", static_variable_buf, track_vars_array ELS_CC PLS_CC );
+ php_register_variable( "PATH_TRANSLATED", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
}
/* Bring in the AUTHENTICATION stuff as needed */
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if ( lpECB->GetServerVariable(lpECB->ConnID, "AUTH_USER", static_variable_buf, &variable_len) && static_variable_buf[0] ) {
- php_register_variable( "PHP_AUTH_USER", static_variable_buf, track_vars_array ELS_CC PLS_CC );
+ php_register_variable( "PHP_AUTH_USER", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
}
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if ( lpECB->GetServerVariable(lpECB->ConnID, "AUTH_PASSWORD", static_variable_buf, &variable_len) && static_variable_buf[0] ) {
- php_register_variable( "PHP_AUTH_PW", static_variable_buf, track_vars_array ELS_CC PLS_CC );
+ php_register_variable( "PHP_AUTH_PW", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
}
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if ( lpECB->GetServerVariable(lpECB->ConnID, "AUTH_TYPE", static_variable_buf, &variable_len) && static_variable_buf[0] ) {
- php_register_variable( "PHP_AUTH_TYPE", static_variable_buf, track_vars_array ELS_CC PLS_CC );
+ php_register_variable( "PHP_AUTH_TYPE", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
}
/* And now, for the SSL variables (if applicable) */
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if ( lpECB->GetServerVariable(lpECB->ConnID, "CERT_COOKIE", static_variable_buf, &variable_len) && static_variable_buf[0] ) {
- sapi_isapi_register_zeus_ssl_variables( lpECB, track_vars_array ELS_CC PLS_CC );
+ sapi_isapi_register_zeus_ssl_variables( lpECB, track_vars_array TSRMLS_CC PLS_CC );
}
/* Copy some of the variables we need to meet Apache specs */
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if ( lpECB->GetServerVariable(lpECB->ConnID, "SERVER_SOFTWARE", static_variable_buf, &variable_len) && static_variable_buf[0] ) {
- php_register_variable( "SERVER_SIGNATURE", static_variable_buf, track_vars_array ELS_CC PLS_CC );
+ php_register_variable( "SERVER_SIGNATURE", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC );
}
}
#endif
-static void sapi_isapi_register_server_variables2(char **server_variables, LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array, char **recorded_values ELS_DC PLS_DC)
+static void sapi_isapi_register_server_variables2(char **server_variables, LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array, char **recorded_values TSRMLS_DC PLS_DC)
{
char **p=server_variables;
DWORD variable_len;
@@ -476,7 +476,7 @@ static void sapi_isapi_register_server_variables2(char **server_variables, LPEXT
variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
if (lpECB->GetServerVariable(lpECB->ConnID, *p, static_variable_buf, &variable_len)
&& static_variable_buf[0]) {
- php_register_variable(*p, static_variable_buf, track_vars_array ELS_CC PLS_CC);
+ php_register_variable(*p, static_variable_buf, track_vars_array TSRMLS_CC PLS_CC);
if (recorded_values) {
recorded_values[p-server_variables] = estrndup(static_variable_buf, variable_len);
}
@@ -484,7 +484,7 @@ static void sapi_isapi_register_server_variables2(char **server_variables, LPEXT
variable_buf = (char *) emalloc(variable_len);
if (lpECB->GetServerVariable(lpECB->ConnID, *p, variable_buf, &variable_len)
&& variable_buf[0]) {
- php_register_variable(*p, variable_buf, track_vars_array ELS_CC PLS_CC);
+ php_register_variable(*p, variable_buf, track_vars_array TSRMLS_CC PLS_CC);
}
if (recorded_values) {
recorded_values[p-server_variables] = variable_buf;
@@ -497,7 +497,7 @@ static void sapi_isapi_register_server_variables2(char **server_variables, LPEXT
}
-static void sapi_isapi_register_server_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC)
+static void sapi_isapi_register_server_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
{
DWORD variable_len = ISAPI_SERVER_VAR_BUF_SIZE;
char *variable;
@@ -509,18 +509,18 @@ static void sapi_isapi_register_server_variables(zval *track_vars_array ELS_DC S
/* Register the special ISAPI variables */
memset(isapi_special_server_variables, 0, sizeof(isapi_special_server_variables));
- sapi_isapi_register_server_variables2(isapi_special_server_variable_names, lpECB, track_vars_array, isapi_special_server_variables ELS_CC PLS_CC);
+ sapi_isapi_register_server_variables2(isapi_special_server_variable_names, lpECB, track_vars_array, isapi_special_server_variables TSRMLS_CC PLS_CC);
if (SG(request_info).cookie_data) {
- php_register_variable("HTTP_COOKIE", SG(request_info).cookie_data, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("HTTP_COOKIE", SG(request_info).cookie_data, track_vars_array TSRMLS_CC PLS_CC);
}
/* Register the standard ISAPI variables */
- sapi_isapi_register_server_variables2(isapi_server_variable_names, lpECB, track_vars_array, NULL ELS_CC PLS_CC);
+ sapi_isapi_register_server_variables2(isapi_server_variable_names, lpECB, track_vars_array, NULL TSRMLS_CC PLS_CC);
if (isapi_special_server_variables[SPECIAL_VAR_HTTPS]
&& atoi(isapi_special_server_variables[SPECIAL_VAR_HTTPS])) {
/* Register SSL ISAPI variables */
- sapi_isapi_register_server_variables2(isapi_secure_server_variable_names, lpECB, track_vars_array, NULL ELS_CC PLS_CC);
+ sapi_isapi_register_server_variables2(isapi_secure_server_variable_names, lpECB, track_vars_array, NULL TSRMLS_CC PLS_CC);
}
if (isapi_special_server_variables[SPECIAL_VAR_HTTPS]) {
@@ -529,12 +529,12 @@ static void sapi_isapi_register_server_variables(zval *track_vars_array ELS_DC S
#ifdef WITH_ZEUS
- sapi_isapi_register_zeus_variables(lpECB, track_vars_array ELS_CC PLS_CC);
+ sapi_isapi_register_zeus_variables(lpECB, track_vars_array TSRMLS_CC PLS_CC);
#endif
/* PHP_SELF support */
if (isapi_special_server_variables[SPECIAL_VAR_PHP_SELF]) {
- php_register_variable("PHP_SELF", isapi_special_server_variables[SPECIAL_VAR_PHP_SELF], track_vars_array ELS_CC PLS_CC);
+ php_register_variable("PHP_SELF", isapi_special_server_variables[SPECIAL_VAR_PHP_SELF], track_vars_array TSRMLS_CC PLS_CC);
efree(isapi_special_server_variables[SPECIAL_VAR_PHP_SELF]);
}
@@ -551,7 +551,7 @@ static void sapi_isapi_register_server_variables(zval *track_vars_array ELS_DC S
value++;
}
*colon = 0;
- php_register_variable(variable, value, track_vars_array ELS_CC PLS_CC);
+ php_register_variable(variable, value, track_vars_array TSRMLS_CC PLS_CC);
*colon = ':';
}
variable = php_strtok_r(NULL, "\r\n", &strtok_buf);
@@ -570,7 +570,7 @@ static void sapi_isapi_register_server_variables(zval *track_vars_array ELS_DC S
if (humi.lpszPath[path_len-2] == '\\') {
humi.lpszPath[path_len-2] = 0;
}
- php_register_variable("DOCUMENT_ROOT", humi.lpszPath, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("DOCUMENT_ROOT", humi.lpszPath, track_vars_array TSRMLS_CC PLS_CC);
}
}
#endif
@@ -720,7 +720,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB)
zend_bool stack_overflown=0;
SLS_FETCH();
CLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
PLS_FETCH();
#ifdef PHP_ENABLE_SEH
LPEXCEPTION_POINTERS e;
@@ -757,8 +757,8 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB)
file_handle.type = ZEND_HANDLE_FILENAME;
file_handle.opened_path = NULL;
- php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC);
- php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
+ php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC);
+ php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
if (SG(request_info).cookie_data) {
efree(SG(request_info).cookie_data);
}
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 8a57ff41e5..32710d2e1e 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -278,7 +278,7 @@ sapi_nsapi_read_cookies(SLS_D)
}
static void
-sapi_nsapi_register_server_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC)
+sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
{
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
size_t i;
@@ -288,48 +288,48 @@ sapi_nsapi_register_server_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC
for (i = 0; i < nsapi_reqpb_size; i++) {
value = pblock_findval(nsapi_reqpb[i].nsapi_eq, rc->rq->reqpb);
if (value) {
- php_register_variable( (char *)nsapi_reqpb[i].env_var, value, track_vars_array ELS_CC PLS_CC );
+ php_register_variable( (char *)nsapi_reqpb[i].env_var, value, track_vars_array TSRMLS_CC PLS_CC );
}
}
for (i = 0; i < nsapi_headers_size; i++) {
value = pblock_findval(nsapi_headers[i].nsapi_eq, rc->rq->headers);
if (value) {
- php_register_variable( (char *)nsapi_headers[i].env_var, value, track_vars_array ELS_CC PLS_CC );
+ php_register_variable( (char *)nsapi_headers[i].env_var, value, track_vars_array TSRMLS_CC PLS_CC );
}
}
for (i = 0; i < nsapi_vars_size; i++) {
value = pblock_findval(nsapi_vars[i].nsapi_eq, rc->rq->vars);
if (value) {
- php_register_variable( (char *)nsapi_vars[i].env_var, value, track_vars_array ELS_CC PLS_CC );
+ php_register_variable( (char *)nsapi_vars[i].env_var, value, track_vars_array TSRMLS_CC PLS_CC );
}
}
for (i = 0; i < nsapi_client_size; i++) {
value = pblock_findval(nsapi_client[i].nsapi_eq, rc->sn->client);
if (value) {
- php_register_variable( (char *)nsapi_client[i].env_var, value, track_vars_array ELS_CC PLS_CC );
+ php_register_variable( (char *)nsapi_client[i].env_var, value, track_vars_array TSRMLS_CC PLS_CC );
}
}
value = session_dns(rc->sn);
if (value) {
- php_register_variable("REMOTE_HOST", value, track_vars_array ELS_CC PLS_CC );
+ php_register_variable("REMOTE_HOST", value, track_vars_array TSRMLS_CC PLS_CC );
}
sprintf(buf, "%d", conf_getglobals()->Vport);
- php_register_variable("SERVER_PORT", buf, track_vars_array ELS_CC PLS_CC );
- php_register_variable("SERVER_NAME", util_hostname(), track_vars_array ELS_CC PLS_CC );
- php_register_variable("SERVER_URL", http_uri2url("", ""), track_vars_array ELS_CC PLS_CC );
- php_register_variable("HTTPS", (security_active ? "ON" : "OFF"), track_vars_array ELS_CC PLS_CC );
-/* php_register_variable("SERVER_SOFTWARE", MAGNUS_VERSION_STRING, track_vars_array ELS_CC PLS_CC ); */
+ php_register_variable("SERVER_PORT", buf, track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable("SERVER_NAME", util_hostname(), track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable("SERVER_URL", http_uri2url("", ""), track_vars_array TSRMLS_CC PLS_CC );
+ php_register_variable("HTTPS", (security_active ? "ON" : "OFF"), track_vars_array TSRMLS_CC PLS_CC );
+/* php_register_variable("SERVER_SOFTWARE", MAGNUS_VERSION_STRING, track_vars_array TSRMLS_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 );
+ php_register_variable("PHP_SELF", value, track_vars_array TSRMLS_CC PLS_CC );
}
}
@@ -449,10 +449,10 @@ nsapi_module_main(NSLS_D SLS_DC)
zend_file_handle file_handle;
CLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
PLS_FETCH();
- if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) {
+ if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) {
return FAILURE;
}
@@ -466,7 +466,7 @@ nsapi_module_main(NSLS_D SLS_DC)
"Parsing [%s]", SG(request_info).path_translated);
#endif
- php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
+ php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
php_request_shutdown(NULL);
#if defined(NSAPI_DEBUG)
diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c
index 7bcce209df..7ea34fc795 100644
--- a/sapi/phttpd/phttpd.c
+++ b/sapi/phttpd/phttpd.c
@@ -261,10 +261,10 @@ int php_doit(PHLS_D SLS_DC)
struct httpinfo *hip = PHG(cip)->hip;
CLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
PLS_FETCH();
- if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) {
+ if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) {
return -1;
}
@@ -273,9 +273,9 @@ int php_doit(PHLS_D SLS_DC)
file_handle.free_filename = 0;
/*
- php_phttpd_hash_environment(PHLS_C CLS_CC ELS_CC PLS_CC SLS_CC);
+ php_phttpd_hash_environment(PHLS_C CLS_CC TSRMLS_CC PLS_CC SLS_CC);
*/
- php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
+ php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
php_request_shutdown(NULL);
return SG(sapi_headers).http_response_code;
@@ -287,7 +287,7 @@ int pm_init(const char **argv)
sapi_startup(&phttpd_sapi_module);
phttpd_sapi_module.startup(&phttpd_sapi_module);
- ph_globals_id = ts_allocate_id(sizeof(phttpd_globals_struct), NULL, NULL);
+ ts_allocate_id(&ph_globals_id, sizeof(phttpd_globals_struct), NULL, NULL);
return 0;
}
diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c
index 362ec133fc..30eb7ba36e 100644
--- a/sapi/pi3web/pi3web_sapi.c
+++ b/sapi/pi3web/pi3web_sapi.c
@@ -320,7 +320,7 @@ static void init_request_info(sapi_globals_struct *sapi_globals, LPCONTROL_BLOCK
SG(sapi_headers).http_response_code = 200;
}
-static void hash_pi3web_variables(ELS_D SLS_DC)
+static void hash_pi3web_variables(TSRMLS_D SLS_DC)
{
char static_variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE];
char *variable_buf;
@@ -379,7 +379,7 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB)
int iRet = PIAPI_COMPLETED;
SLS_FETCH();
CLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
PLS_FETCH();
zend_try {
@@ -390,13 +390,13 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB)
CG(extended_info) = 0;
init_request_info(sapi_globals, lpCB);
- php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC);
+ php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC);
- hash_pi3web_variables(ELS_C SLS_CC);
+ hash_pi3web_variables(TSRMLS_C SLS_CC);
switch ( lpCB->dwBehavior ) {
case PHP_MODE_STANDARD:
- iRet = ( php_execute_script( &file_handle CLS_CC ELS_CC PLS_CC ) == SUCCESS ) ?
+ iRet = ( php_execute_script( &file_handle CLS_CC TSRMLS_CC PLS_CC ) == SUCCESS ) ?
PIAPI_COMPLETED : PIAPI_ERROR;
break;
case PHP_MODE_HIGHLIGHT: {
@@ -426,7 +426,7 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB)
efree(header_line);
break;
case PHP_MODE_LINT:
- iRet = (php_lint_script(&file_handle CLS_CC ELS_CC PLS_CC) == SUCCESS) ?
+ iRet = (php_lint_script(&file_handle CLS_CC TSRMLS_CC PLS_CC) == SUCCESS) ?
PIAPI_COMPLETED : PIAPI_ERROR;
break;
default:
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 3aeed484d3..407cba1989 100644
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -528,7 +528,7 @@ static sapi_module_struct roxen_sapi_module = {
&pval, sizeof(zval *), NULL)
static void
-php_roxen_hash_environment(CLS_D ELS_DC PLS_DC SLS_DC)
+php_roxen_hash_environment(CLS_D TSRMLS_DC PLS_DC SLS_DC)
{
int i;
char buf[512];
@@ -586,7 +586,7 @@ static int php_roxen_module_main(SLS_D)
#ifdef ZTS
CLS_FETCH();
PLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
#ifdef ROXEN_USE_ZTS
GET_THIS();
#endif
@@ -598,14 +598,14 @@ static int php_roxen_module_main(SLS_D)
file_handle.opened_path = NULL;
THREADS_ALLOW();
- res = php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC);
+ res = php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC);
THREADS_DISALLOW();
if(res == FAILURE) {
return 0;
}
- php_roxen_hash_environment(CLS_C ELS_CC PLS_CC SLS_CC);
+ php_roxen_hash_environment(CLS_C TSRMLS_CC PLS_CC SLS_CC);
THREADS_ALLOW();
- php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
+ php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
php_request_shutdown(NULL);
THREADS_DISALLOW();
return 1;
@@ -705,7 +705,7 @@ void pike_module_init( void )
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
#ifdef ROXEN_USE_ZTS
- roxen_globals_id = ts_allocate_id(sizeof(php_roxen_request), NULL, NULL);
+ ts_allocate_id(&roxen_globals_id, sizeof(php_roxen_request), NULL, NULL);
#endif
#endif
sapi_startup(&roxen_sapi_module);
diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index fd48663be9..14f2a42a8a 100644
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -290,7 +290,7 @@ JNIEXPORT jlong JNICALL Java_net_php_servlet_define
pval *pzval;
jlong addr = 0;
const char *nameAsUTF = (*jenv)->GetStringUTFChars(jenv, name, 0);
- ELS_FETCH();
+ TSRMLS_FETCH();
MAKE_STD_ZVAL(pzval);
addr = (jlong)(long) pzval;
@@ -321,7 +321,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send
SLS_FETCH();
PLS_FETCH();
CLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
zend_try {
SG(server_context) = emalloc(sizeof(servlet_request));
@@ -342,7 +342,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send
SG(sapi_headers).http_response_code = 200;
SG(request_info).content_length = contentLength;
SG(request_info).auth_password = NULL;
- if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC)==FAILURE) {
+ if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC)==FAILURE) {
ThrowServletException(jenv,"request startup failure");
return;
}
@@ -385,7 +385,7 @@ JNIEXPORT void JNICALL Java_net_php_servlet_send
zend_highlight(&syntax_highlighter_ini);
}
} else {
- php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
+ php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
php_header(); /* Make sure headers have been sent */
}
diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index 1b7cb2caf1..19dcd983d2 100644
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -171,20 +171,20 @@ static char *sapi_thttpd_read_cookies(SLS_D)
#define BUF_SIZE 512
#define ADD_STRING(name) \
- php_register_variable(name, buf, track_vars_array ELS_CC PLS_CC)
+ php_register_variable(name, buf, track_vars_array TSRMLS_CC PLS_CC)
-static void sapi_thttpd_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC)
+static void sapi_thttpd_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
{
char buf[BUF_SIZE + 1];
char *p;
TLS_FETCH();
- php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array ELS_CC PLS_CC);
- php_register_variable("SERVER_SOFTWARE", SERVER_SOFTWARE, track_vars_array ELS_CC PLS_CC);
- php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array ELS_CC PLS_CC);
- php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array ELS_CC PLS_CC);
- php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array ELS_CC PLS_CC);
- php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("SERVER_SOFTWARE", SERVER_SOFTWARE, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array TSRMLS_CC PLS_CC);
p = inet_ntoa(TG(hc)->client_addr.sa_in.sin_addr);
/* string representation of IPs are never larger than 512 bytes */
@@ -205,7 +205,7 @@ static void sapi_thttpd_register_variables(zval *track_vars_array ELS_DC SLS_DC
#define CONDADD(name, field) \
if (TG(hc)->field[0]) { \
- php_register_variable(#name, TG(hc)->field, track_vars_array ELS_CC PLS_CC); \
+ php_register_variable(#name, TG(hc)->field, track_vars_array TSRMLS_CC PLS_CC); \
}
CONDADD(HTTP_REFERER, referer);
@@ -223,7 +223,7 @@ static void sapi_thttpd_register_variables(zval *track_vars_array ELS_DC SLS_DC
}
if (TG(hc)->authorization[0])
- php_register_variable("AUTH_TYPE", "Basic", track_vars_array ELS_CC PLS_CC);
+ php_register_variable("AUTH_TYPE", "Basic", track_vars_array TSRMLS_CC PLS_CC);
}
static sapi_module_struct thttpd_sapi_module = {
@@ -262,7 +262,7 @@ static void thttpd_module_main(TLS_D SLS_DC)
{
zend_file_handle file_handle;
CLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
PLS_FETCH();
file_handle.type = ZEND_HANDLE_FILENAME;
@@ -270,11 +270,11 @@ static void thttpd_module_main(TLS_D SLS_DC)
file_handle.free_filename = 0;
file_handle.opened_path = NULL;
- if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) {
+ if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) {
return;
}
- php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
+ php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
php_request_shutdown(NULL);
}
@@ -554,7 +554,7 @@ void thttpd_php_init(void)
{
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
- thttpd_globals_id = ts_allocate_id(sizeof(php_thttpd_globals), NULL, NULL);
+ ts_allocate_id(&thttpd_globals_id, sizeof(php_thttpd_globals), NULL, NULL);
qr_lock = tsrm_mutex_alloc();
thttpd_register_on_close(remove_dead_conn);
#endif
diff --git a/sapi/tux/php_tux.c b/sapi/tux/php_tux.c
index 0b0070228f..7dbc6f748c 100644
--- a/sapi/tux/php_tux.c
+++ b/sapi/tux/php_tux.c
@@ -181,9 +181,9 @@ static char *sapi_tux_read_cookies(SLS_D)
#define BUF_SIZE 512
#define ADD_STRING(name) \
- php_register_variable(name, buf, track_vars_array ELS_CC PLS_CC)
+ php_register_variable(name, buf, track_vars_array TSRMLS_CC PLS_CC)
-static void sapi_tux_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC)
+static void sapi_tux_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
{
char buf[BUF_SIZE + 1];
char *p;
@@ -192,14 +192,14 @@ static void sapi_tux_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS
sprintf(buf, "Server: %s", TUXAPI_version);
sapi_add_header_ex(buf, strlen(buf), 1, 0);
- php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array ELS_CC PLS_CC);
- php_register_variable("SERVER_SOFTWARE", TUXAPI_version, track_vars_array ELS_CC PLS_CC);
- php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array ELS_CC PLS_CC);
- php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array ELS_CC PLS_CC);
- php_register_variable("DOCUMENT_ROOT", TUXAPI_docroot, track_vars_array ELS_CC PLS_CC);
- php_register_variable("SERVER_NAME", TUXAPI_servername, track_vars_array ELS_CC PLS_CC);
- php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array ELS_CC PLS_CC);
- php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array ELS_CC PLS_CC);
+ php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("SERVER_SOFTWARE", TUXAPI_version, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("DOCUMENT_ROOT", TUXAPI_docroot, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("SERVER_NAME", TUXAPI_servername, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array TSRMLS_CC PLS_CC);
+ php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array TSRMLS_CC PLS_CC);
p = inet_ntoa(TG(req)->client_host);
/* string representation of IPs are never larger than 512 bytes */
@@ -222,7 +222,7 @@ static void sapi_tux_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS
#define CONDADD(name, field) \
if (TG(req)->field[0]) { \
- php_register_variable(#name, TG(req)->field, track_vars_array ELS_CC PLS_C); \
+ php_register_variable(#name, TG(req)->field, track_vars_array TSRMLS_CC PLS_C); \
}
CONDADD(HTTP_REFERER, referer);
@@ -242,7 +242,7 @@ static void sapi_tux_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS
#if 0
if (TG(hc)->authorization[0])
- php_register_variable("AUTH_TYPE", "Basic", track_vars_array ELS_CC PLS_C);
+ php_register_variable("AUTH_TYPE", "Basic", track_vars_array TSRMLS_CC PLS_C);
#endif
}
@@ -282,7 +282,7 @@ static void tux_module_main(TLS_D SLS_DC)
{
zend_file_handle file_handle;
CLS_FETCH();
- ELS_FETCH();
+ TSRMLS_FETCH();
PLS_FETCH();
file_handle.type = ZEND_HANDLE_FILENAME;
@@ -290,11 +290,11 @@ static void tux_module_main(TLS_D SLS_DC)
file_handle.free_filename = 0;
file_handle.opened_path = NULL;
- if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) {
+ if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) {
return;
}
- php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
+ php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
php_request_shutdown(NULL);
}
View Lorry Controller Status