A couple of fixes.

diff --git a/cgi_main.c b/cgi_main.c
index a7c01c7f0776d053eaf8aa39f186890c30d72b85..a73b427e01c2f029d5e5c74a1d92b33f49ad1a5a 100644 (file)
--- a/cgi_main.c
+++ b/cgi_main.c
@@ -436,7 +436,9 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
        php3_header();                  /* Make sure headers have been sent */
        php_request_shutdown((void *) 0);
        php_module_shutdown();
+#ifdef ZTS
        tsrm_shutdown();
+#endif
        return SUCCESS;
 }
 

diff --git a/main/main.c b/main/main.c
index 65f38cd557762858d94b0bd2ca84a4c371b81104..1f3303304d139fe4d457bd171f8d2fb881e3b184 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -470,7 +470,7 @@ static void php3_timeout(int dummy)
 {
        PLS_FETCH();
 
-       php3_error(E_ERROR, "Maximum execution time of %s seconds exceeded", INI_STRING("max_execution_time"));
+       php3_error(E_ERROR, "Maximum execution time of %s seconds exceeded", INI_STR("max_execution_time"));
 }
 #endif