1 files changed, 11 insertions, 13 deletions

diff --git a/main/php_variables.c b/main/php_variables.c
index 9e0ae88a62..4a9c834d38 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -29,13 +29,13 @@
 #include "zend_globals.h"
 
 
-PHPAPI void php_register_variable(char *var, char *strval, zval *track_vars_array TSRMLS_DC PLS_DC)
+PHPAPI void php_register_variable(char *var, char *strval, zval *track_vars_array TSRMLS_DC)
 {
-	php_register_variable_safe(var, strval, strlen(strval), track_vars_array TSRMLS_CC PLS_CC);
+	php_register_variable_safe(var, strval, strlen(strval), track_vars_array TSRMLS_CC);
 }
 
 /* binary-safe version */
-PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zval *track_vars_array TSRMLS_DC PLS_DC)
+PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zval *track_vars_array TSRMLS_DC)
 {
 	zval new_entry;
 
@@ -48,11 +48,11 @@ PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zva
 	}
 	new_entry.type = IS_STRING;
 
-	php_register_variable_ex(var, &new_entry, track_vars_array TSRMLS_CC PLS_CC);
+	php_register_variable_ex(var, &new_entry, track_vars_array TSRMLS_CC);
 }
 
 
-PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array TSRMLS_DC PLS_DC)
+PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array TSRMLS_DC)
 {
 	char *p = NULL;
 	char *ip;		/* index pointer */
@@ -196,8 +196,6 @@ SAPI_POST_HANDLER_FUNC(php_std_post_handler)
 	char *var, *val;
 	char *strtok_buf = NULL;
 	zval *array_ptr = (zval *) arg;
-	TSRMLS_FETCH();
-	PLS_FETCH();
 
 	var = php_strtok_r(SG(request_info).post_data, "&", &strtok_buf);
 
@@ -209,14 +207,14 @@ SAPI_POST_HANDLER_FUNC(php_std_post_handler)
 			*val++ = '\0';
 			php_url_decode(var, strlen(var));
 			val_len = php_url_decode(val, strlen(val));
-			php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC PLS_CC);
+			php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC);
 		}
 		var = php_strtok_r(NULL, "&", &strtok_buf);
 	}
 }
 
 
-void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC PLS_DC SLS_DC)
+void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC)
 {
 	char *res = NULL, *var, *val, *separator=NULL;
 	const char *c_var;
@@ -249,7 +247,7 @@ void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC PLS_DC SLS_DC)
 	}
 
 	if (arg==PARSE_POST) {
-		sapi_handle_post(array_ptr SLS_CC);
+		sapi_handle_post(array_ptr TSRMLS_CC);
 		return;
 	}
 
@@ -298,7 +296,7 @@ void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC PLS_DC SLS_DC)
 			*val++ = '\0';
 			php_url_decode(var, strlen(var));
 			val_len = php_url_decode(val, strlen(val));
-			php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC PLS_CC);
+			php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC);
 		}
 		var = php_strtok_r(NULL, separator, &strtok_buf);
 	}
@@ -313,7 +311,7 @@ void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC PLS_DC SLS_DC)
 }
 
 
-void php_import_environment_variables(zval *array_ptr TSRMLS_DC PLS_DC)
+void php_import_environment_variables(zval *array_ptr TSRMLS_DC)
 {
 	char **env, *p, *t;
 
@@ -323,7 +321,7 @@ void php_import_environment_variables(zval *array_ptr TSRMLS_DC PLS_DC)
 			continue;
 		}
 		t = estrndup(*env, p - *env);
-		php_register_variable(t, p+1, array_ptr TSRMLS_CC PLS_CC);
+		php_register_variable(t, p+1, array_ptr TSRMLS_CC);
 		efree(t);
 	}
 }