From ea0f19850e26477918736c617d51e624928f9d00 Mon Sep 17 00:00:00 2001
From: Andrey Hristov <andrey@php.net>
Date: Mon, 10 May 1999 20:41:42 +0000
Subject: [PATCH] A couple of fixes.

---
 cgi_main.c  | 2 ++
 main/main.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cgi_main.c b/cgi_main.c
index a7c01c7f077..a73b427e01c 100644
--- 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 65f38cd5577..1f3303304d1 100644
--- 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