More TSRMLS_FETCH work. Got it under 400 now.

8 files changed, 33 insertions, 23 deletions

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 22e0e1bffb..8323bfb0f0 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -779,13 +779,13 @@ PHP_MINIT_FUNCTION(basic)
 #endif
 
 	if(PG(allow_url_fopen)) {
-		if (FAILURE==php_register_url_wrapper("http", php_fopen_url_wrap_http)) {
+		if (FAILURE==php_register_url_wrapper("http", php_fopen_url_wrap_http TSRMLS_CC)) {
 			return FAILURE;
 		}
-		if (FAILURE==php_register_url_wrapper("ftp", php_fopen_url_wrap_ftp)) {
+		if (FAILURE==php_register_url_wrapper("ftp", php_fopen_url_wrap_ftp TSRMLS_CC)) {
 			return FAILURE;
 		}
-		if (FAILURE==php_register_url_wrapper("php", php_fopen_url_wrap_php)) {
+		if (FAILURE==php_register_url_wrapper("php", php_fopen_url_wrap_php TSRMLS_CC)) {
 			return FAILURE;
 		}
 	}
@@ -803,9 +803,9 @@ PHP_MSHUTDOWN_FUNCTION(basic)
 #endif
 
 	if(PG(allow_url_fopen)) {
-		php_unregister_url_wrapper("http");
-		php_unregister_url_wrapper("ftp");
-		php_unregister_url_wrapper("php");
+		php_unregister_url_wrapper("http" TSRMLS_CC);
+		php_unregister_url_wrapper("ftp" TSRMLS_CC);
+		php_unregister_url_wrapper("php" TSRMLS_CC);
 	}
 
 	UNREGISTER_INI_ENTRIES();
@@ -998,7 +998,7 @@ PHP_FUNCTION(getenv)
 	}
 
 
-	ptr = sapi_getenv(Z_STRVAL_PP(str), Z_STRLEN_PP(str));
+	ptr = sapi_getenv(Z_STRVAL_PP(str), Z_STRLEN_PP(str) TSRMLS_CC);
 	if (!ptr) {
 		ptr = getenv(Z_STRVAL_PP(str));
 	}
@@ -1161,7 +1161,7 @@ PHP_FUNCTION(strval)
    Flush the output buffer */
 PHP_FUNCTION(flush)
 {
-	sapi_flush();
+	sapi_flush(TSRMLS_C);
 }
 /* }}} */
 
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index f691e6e307..dfa215bad1 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -148,7 +148,7 @@ static void _php_do_opendir(INTERNAL_FUNCTION_PARAMETERS, int createobject)
 	}
 	convert_to_string_ex(arg);
 
-	if (php_check_open_basedir((*arg)->value.str.val)) {
+	if (php_check_open_basedir((*arg)->value.str.val TSRMLS_CC)) {
 		RETURN_FALSE;
 	}
 	
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index ee2f41acdd..c094b62ee4 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -175,7 +175,7 @@ int php_Exec(int type, char *cmd, pval *array, pval *return_value TSRMLS_DC)
 		
 			if (type == 1) {
 				if (output) PUTS(buf);
-				sapi_flush();
+				sapi_flush(TSRMLS_C);
 			}
 			else if (type == 2) {
 				/* strip trailing whitespaces */	
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 107bc67abf..99b94ed3b5 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1907,7 +1907,7 @@ PHP_FUNCTION(copy)
 		RETURN_FALSE;
 	}
 
-	if (php_check_open_basedir((*source)->value.str.val)) {
+	if (php_check_open_basedir((*source)->value.str.val TSRMLS_CC)) {
 		RETURN_FALSE;
 	}
 
@@ -1915,7 +1915,7 @@ PHP_FUNCTION(copy)
 		RETURN_FALSE;
 	}
 
-	if (php_check_open_basedir((*target)->value.str.val)) {
+	if (php_check_open_basedir((*target)->value.str.val TSRMLS_CC)) {
 		RETURN_FALSE;
 	}
 
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 4cc224b81f..e01c814038 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -141,7 +141,9 @@ PHP_FUNCTION(disk_total_space)
 
 	convert_to_string_ex(path);
 
-	if (php_check_open_basedir((*path)->value.str.val)) RETURN_FALSE;
+	if (php_check_open_basedir((*path)->value.str.val TSRMLS_CC)) {
+		RETURN_FALSE;
+	}
 
 #ifdef WINDOWS
 	/* GetDiskFreeSpaceEx is only available in NT and Win95 post-OSR2,
@@ -242,7 +244,9 @@ PHP_FUNCTION(disk_free_space)
 
 	convert_to_string_ex(path);
 
-	if (php_check_open_basedir((*path)->value.str.val)) RETURN_FALSE;
+	if (php_check_open_basedir((*path)->value.str.val TSRMLS_CC)) {
+		RETURN_FALSE;
+	}
 
 #ifdef WINDOWS
 	/* GetDiskFreeSpaceEx is only available in NT and Win95 post-OSR2,
@@ -335,8 +339,9 @@ PHP_FUNCTION(chgrp)
 	}
 
 	/* Check the basedir */
-	if (php_check_open_basedir((*filename)->value.str.val))
+	if (php_check_open_basedir((*filename)->value.str.val TSRMLS_CC)) {
 		RETURN_FALSE;
+	}
 
 	ret = VCWD_CHOWN((*filename)->value.str.val, -1, gid);
 	if (ret == -1) {
@@ -382,8 +387,9 @@ PHP_FUNCTION(chown)
 	}
 
 	/* Check the basedir */
-	if (php_check_open_basedir((*filename)->value.str.val))
+	if (php_check_open_basedir((*filename)->value.str.val TSRMLS_CC)) {
 		RETURN_FALSE;
+	}
 
 	ret = VCWD_CHOWN((*filename)->value.str.val, uid, -1);
 	if (ret == -1) {
@@ -414,8 +420,9 @@ PHP_FUNCTION(chmod)
 	}
 
 	/* Check the basedir */
-	if (php_check_open_basedir((*filename)->value.str.val))
+	if (php_check_open_basedir((*filename)->value.str.val TSRMLS_CC)) {
 		RETURN_FALSE;
+	}
 
 	imode = (mode_t) (*mode)->value.lval;
 	/* in safe mode, do not allow to setuid files.
@@ -476,8 +483,10 @@ PHP_FUNCTION(touch)
 	}
 
 	/* Check the basedir */
-	if (php_check_open_basedir((*filename)->value.str.val)) {
-		if (newtime) efree(newtime);
+	if (php_check_open_basedir((*filename)->value.str.val TSRMLS_CC)) {
+		if (newtime) {
+			efree(newtime);
+		}
 		RETURN_FALSE;
 	}
 
diff --git a/ext/standard/head.c b/ext/standard/head.c
index b4df2645ff..8a35627cfa 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -53,7 +53,7 @@ PHP_FUNCTION(header)
 		case 1:
 			convert_to_string_ex(arg1);
 	}
-	sapi_add_header_ex(Z_STRVAL_PP(arg1), Z_STRLEN_PP(arg1), 1, replace);
+	sapi_add_header_ex(Z_STRVAL_PP(arg1), Z_STRLEN_PP(arg1), 1, replace TSRMLS_CC);
 }
 /* }}} */
 
@@ -61,7 +61,7 @@ PHPAPI int php_header()
 {
 	TSRMLS_FETCH();
 
-	if (sapi_send_headers()==FAILURE || SG(request_info).headers_only) {
+	if (sapi_send_headers(TSRMLS_C)==FAILURE || SG(request_info).headers_only) {
 		return 0; /* don't allow output */
 	} else {
 		return 1; /* allow output */
diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c
index 8fb51fb9a3..096d0de42c 100644
--- a/ext/standard/iptc.c
+++ b/ext/standard/iptc.c
@@ -210,8 +210,9 @@ PHP_FUNCTION(iptcembed)
         break;
     }
 
-    if (php_check_open_basedir((*jpeg_file)->value.str.val)) 
+    if (php_check_open_basedir((*jpeg_file)->value.str.val TSRMLS_CC)) {
 		RETURN_FALSE;
+	}
 
     if ((fp = VCWD_FOPEN((*jpeg_file)->value.str.val,"rb")) == 0) {
         php_error(E_WARNING, "Unable to open %s", (*jpeg_file)->value.str.val);
diff --git a/ext/standard/pageinfo.c b/ext/standard/pageinfo.c
index 5c52d97762..cc5e8451e1 100644
--- a/ext/standard/pageinfo.c
+++ b/ext/standard/pageinfo.c
@@ -47,7 +47,7 @@ static void php_statpage(TSRMLS_D)
 {
 	struct stat *pstat;
 
-	pstat = sapi_get_stat();
+	pstat = sapi_get_stat(TSRMLS_C);
 
 	if (BG(page_uid)==-1 || BG(page_gid)==-1) {
 		if(pstat) {