From: Zeev Suraski <zeev@php.net>
Date: Sat, 19 Aug 2000 18:01:04 +0000 (+0000)
Subject: - Update NEWS
X-Git-Tag: php-4.0.2RC1~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a45e3cb89d88db9a42a62943d1e1f1ffe8025ee;p=php

- Update NEWS
- Fix non ZTS Windows build
---

diff --git a/NEWS b/NEWS
index 94686baf6c..02d01761ce 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP 4.0                                                                    NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ?? ??? 2000, Version 4.0.2
+- Fixed memory leaks in eval();  A script that used eval() extensively, could
+  end up consuming very large amounts of memory during execution (Zeev, Zend
+  Engine)
 - Fixed memory_limit feature, which did not work properly in previous versions
   (Zeev, Zend Engine)
 - Fixed stdout support with the swf extension. (Sterling)
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 84be4cae4a..bd7781d04b 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -395,10 +395,14 @@ function_entry basic_functions[] = {
 #if HAVE_SYS_TIME_H
 	PHP_FE(socket_set_timeout,	NULL)
 #else
-	PHP_FALIAS(socket_set_timeout  , warn_not_available,      NULL)                             
+	PHP_FALIAS(socket_set_timeout, warn_not_available,      NULL)                             
 #endif
 	PHP_FE(socket_get_status,	NULL)
+#if !PHP_WIN32 || defined(ZTS)
 	PHP_FE(realpath,			NULL)
+#else
+	PHP_FALIAS(realpath,		warn_not_available,		NULL)
+#endif
 
 	/* functions from fsock.c */
 	PHP_FE(fsockopen, 			third_and_fourth_args_force_ref)
diff --git a/ext/standard/file.c b/ext/standard/file.c
index e8e703559c..47dd9445a9 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1974,6 +1974,7 @@ PHP_FUNCTION(fgetcsv) {
 
 /* }}} */
 
+#if !PHP_WIN32 || defined(ZTS)
 /* {{{ proto string realpath(string path)
    Return the resolved path */
 PHP_FUNCTION(realpath)
@@ -1994,7 +1995,7 @@ PHP_FUNCTION(realpath)
 	}
 }
 /* }}} */
-
+#endif
 
 
 #if 0