Redesigned thread safety mechanism - nua nua

1 files changed, 18 insertions, 20 deletions

diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 32710d2e1e..0ed677a96d 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -140,7 +140,7 @@ sapi_nsapi_ub_write(const char *str, unsigned int str_length)
 	int retval;
 	nsapi_request_context *rc;
 
-	SLS_FETCH();
+	TSRMLS_FETCH();
 	rc = (nsapi_request_context *)SG(server_context);
 	retval = net_write(rc->sn->csd, (char *)str, str_length);
 	if (retval == IO_ERROR /*-1*/ || retval == IO_EOF /*0*/)
@@ -278,7 +278,7 @@ sapi_nsapi_read_cookies(SLS_D)
 }
 
 static void
-sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC)
+sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_DC SLS_DC TSRMLS_DC)
 {
 	nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
 	size_t i;
@@ -288,55 +288,55 @@ sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS
 	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 TSRMLS_CC PLS_CC );
+			php_register_variable( (char *)nsapi_reqpb[i].env_var, value, track_vars_array TSRMLS_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 TSRMLS_CC PLS_CC );
+			php_register_variable( (char *)nsapi_headers[i].env_var, value, track_vars_array TSRMLS_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 TSRMLS_CC PLS_CC );
+			php_register_variable( (char *)nsapi_vars[i].env_var, value, track_vars_array TSRMLS_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 TSRMLS_CC PLS_CC );
+			php_register_variable( (char *)nsapi_client[i].env_var, value, track_vars_array TSRMLS_CC );
 		}
 	}
 	
 	value = session_dns(rc->sn);
 	if (value) {
-		php_register_variable("REMOTE_HOST", value, track_vars_array TSRMLS_CC PLS_CC );
+		php_register_variable("REMOTE_HOST", value, track_vars_array TSRMLS_CC );
 	}
 	sprintf(buf, "%d", conf_getglobals()->Vport);
-	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 ); */
+	php_register_variable("SERVER_PORT", buf, track_vars_array TSRMLS_CC );
+	php_register_variable("SERVER_NAME", util_hostname(), track_vars_array TSRMLS_CC );
+	php_register_variable("SERVER_URL", http_uri2url("", ""), track_vars_array TSRMLS_CC );
+	php_register_variable("HTTPS", (security_active ? "ON" : "OFF"), track_vars_array TSRMLS_CC );
+/*	php_register_variable("SERVER_SOFTWARE", MAGNUS_VERSION_STRING, track_vars_array TSRMLS_CC ); */
 
 	/*
 	 * Special PHP_SELF variable.
 	 */
 	value = pblock_findval("uri", rc->rq->reqpb);
 	if ( value != NULL ) {
-		php_register_variable("PHP_SELF", value, track_vars_array TSRMLS_CC PLS_CC );
+		php_register_variable("PHP_SELF", value, track_vars_array TSRMLS_CC );
  	}
 }
   
 static void
 nsapi_log_message(char *message)
 {
-	SLS_FETCH();
+	TSRMLS_FETCH();
 	nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
 	log_error(LOG_INFORM, "PHP_log_message", rc->sn, rc->rq,
 		"%s", message);
@@ -447,12 +447,10 @@ nsapi_module_main(NSLS_D SLS_DC)
 {
 	int result;
 	zend_file_handle file_handle;
-
-	CLS_FETCH();
 	TSRMLS_FETCH();
-	PLS_FETCH();
+	TSRMLS_FETCH();
 
-	if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) {
+	if (php_request_startup(TSRMLS_C) == FAILURE) {
 		return FAILURE;
 	}
 
@@ -466,7 +464,7 @@ nsapi_module_main(NSLS_D SLS_DC)
 		"Parsing [%s]", SG(request_info).path_translated);
 #endif
 
-	php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC);
+	php_execute_script(&file_handle TSRMLS_CC);
 	php_request_shutdown(NULL);
 
 #if defined(NSAPI_DEBUG)
@@ -506,7 +504,7 @@ php4_execute(pblock *pb, Session *sn, Request *rq)
 	int retval;
 	nsapi_request_context *request_context;
 
-	SLS_FETCH();
+	TSRMLS_FETCH();
 
 	request_context = (nsapi_request_context *)MALLOC(sizeof(nsapi_request_context));
 	request_context->pb = pb;