Fix ZTS build.

diff --git a/main/SAPI.h b/main/SAPI.h
index 6b6365052f901966ff38e257f0ead5659319c2cd..f80d19f7d324917c32215e6b9432a580f8f2c12b 100644 (file)
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -184,6 +184,7 @@ SAPI_API char *sapi_getenv(char *name, size_t name_len TSRMLS_DC);
 SAPI_API char *sapi_get_default_content_type(TSRMLS_D);
 SAPI_API void sapi_get_default_content_type_header(sapi_header_struct *default_header TSRMLS_DC);
 SAPI_API size_t sapi_apply_default_charset(char **mimetype, size_t len TSRMLS_DC);
+SAPI_API void sapi_activate_headers_only(TSRMLS_D);
 
 struct _sapi_module_struct {
        char *name;

diff --git a/main/main.c b/main/main.c
index 1f9f045a517cd658522b99b2ab7835e84a7554ce..6d61ebe45238d3283d45b1d4b8bb48f76cb4eb39 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -813,7 +813,7 @@ static int php_hash_environment(TSRMLS_D);
 
 /* {{{ php_start_sapi()
  */
-static int php_start_sapi()
+static int php_start_sapi(TSRMLS_D)
 {
     int retval = SUCCESS;
 
@@ -940,7 +940,7 @@ int php_request_startup_for_hook(TSRMLS_D)
     signal(SIGCHLD, sigchld_handler);
 #endif
 
-    if (php_start_sapi() == FAILURE)
+    if (php_start_sapi(TSRMLS_C) == FAILURE)
         return FAILURE;
 
     php_output_activate(TSRMLS_C);
@@ -991,7 +991,7 @@ void php_request_shutdown_for_hook(void *dummy)
     } zend_end_try();
 
     zend_try {
-        shutdown_memory_manager(CG(unclean_shutdown), 0);
+        shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
     } zend_end_try();
 
     zend_try {