more tsrm cleanup -- output.c is not doing any fetches anymore

5 files changed, 15 insertions, 13 deletions

diff --git a/main/main.c b/main/main.c
index c55ada3a33..fc11bad4b2 100644
--- a/main/main.c
+++ b/main/main.c
@@ -306,6 +306,7 @@ PHPAPI void php_log_err(char *log_message)
    wrapper for modules to use PHPWRITE */
 PHPAPI int php_write(void *buf, uint size)
 {
+	TSRMLS_FETCH();
 	return PHPWRITE(buf, size);
 }
 /* }}} */
@@ -318,6 +319,7 @@ PHPAPI int php_printf(const char *format, ...)
 	int ret;
 	char buffer[PRINTF_BUFFER_SIZE];
 	int size;
+	TSRMLS_FETCH();
 
 	va_start(args, format);
 	size = vsnprintf(buffer, sizeof(buffer), format, args);
@@ -719,7 +721,8 @@ void php_request_shutdown(void *dummy)
  */
 static int php_body_write_wrapper(const char *str, uint str_length)
 {
-	return php_body_write(str, str_length);
+	TSRMLS_FETCH();
+	return php_body_write(str, str_length TSRMLS_CC);
 }
 /* }}} */
 
diff --git a/main/output.c b/main/output.c
index 7d4e1fa2cb..63d9b2d8f1 100644
--- a/main/output.c
+++ b/main/output.c
@@ -95,15 +95,13 @@ void php_output_register_constants(TSRMLS_D)
 }
 
 
-PHPAPI int php_body_write(const char *str, uint str_length)
+PHPAPI int php_body_write(const char *str, uint str_length TSRMLS_DC)
 {
-	TSRMLS_FETCH();
 	return OG(php_body_write)(str, str_length TSRMLS_CC);	
 }
 
-PHPAPI int php_header_write(const char *str, uint str_length)
+PHPAPI int php_header_write(const char *str, uint str_length TSRMLS_DC)
 {
-	TSRMLS_FETCH();
 	if (OG(disable_output)) {
 		return 0;
 	} else {
diff --git a/main/php.h b/main/php.h
index aa8395036a..d7f6c13f30 100644
--- a/main/php.h
+++ b/main/php.h
@@ -274,12 +274,12 @@ PHPAPI int cfg_get_string(char *varname, char **result);
 
 /* Output support */
 #include "main/php_output.h"
-#define PHPWRITE(str, str_len)		php_body_write((str), (str_len))
-#define PUTS(str)					php_body_write((str), strlen((str)))
-#define PUTC(c)						(php_body_write(&(c), 1), (c))
-#define PHPWRITE_H(str, str_len)	php_header_write((str), (str_len))
-#define PUTS_H(str)					php_header_write((str), strlen((str)))
-#define PUTC_H(c)					(php_header_write(&(c), 1), (c))
+#define PHPWRITE(str, str_len)		php_body_write((str), (str_len) TSRMLS_CC)
+#define PUTS(str)					php_body_write((str), strlen((str)) TSRMLS_CC)
+#define PUTC(c)						(php_body_write(&(c), 1 TSRMLS_CC), (c))
+#define PHPWRITE_H(str, str_len)	php_header_write((str), (str_len) TSRMLS_CC)
+#define PUTS_H(str)					php_header_write((str), strlen((str)) TSRMLS_CC)
+#define PUTC_H(c)					(php_header_write(&(c), 1 TSRMLS_CC), (c))
 
 #ifdef ZTS
 #define VIRTUAL_DIR
diff --git a/main/php_ini.c b/main/php_ini.c
index 6e6ca748c1..31929dffcf 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -69,6 +69,7 @@ static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type)
 		if(esc_html) {
 			zend_html_puts(display_string, display_string_length);
 		} else {
+			TSRMLS_FETCH();
 			PHPWRITE(display_string, display_string_length);
 		}
 	}
diff --git a/main/php_output.h b/main/php_output.h
index 1521a7319a..f489532b0b 100644
--- a/main/php_output.h
+++ b/main/php_output.h
@@ -29,8 +29,8 @@ PHPAPI void php_output_startup(void);
 PHPAPI void php_output_activate(TSRMLS_D);
 PHPAPI void php_output_set_status(zend_bool status TSRMLS_DC);
 void php_output_register_constants(TSRMLS_D);
-PHPAPI int  php_body_write(const char *str, uint str_length);
-PHPAPI int  php_header_write(const char *str, uint str_length);
+PHPAPI int  php_body_write(const char *str, uint str_length TSRMLS_DC);
+PHPAPI int  php_header_write(const char *str, uint str_length TSRMLS_DC);
 PHPAPI int php_start_ob_buffer(zval *output_handler, uint chunk_size TSRMLS_DC);
 PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS_DC);
 PHPAPI void php_end_ob_buffers(zend_bool send_buffer TSRMLS_DC);