dmitry Tue Mar 14 14:19:20 2006 UTC
Modified files:
/ZendEngine2 zend.h zend_config.w32.h
/ZendEngine2/tests bug36568.phpt
/php-src/win32/build config.w32.h.in
Log:
Fixed bug #36568 (memory_limit setting on win32 has no effect)
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend.h?r1=1.316&r2=1.317&diff_format=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.316 ZendEngine2/zend.h:1.317
--- ZendEngine2/zend.h:1.316 Fri Mar 3 09:56:47 2006
+++ ZendEngine2/zend.h Tue Mar 14 14:19:19 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.h,v 1.316 2006/03/03 09:56:47 johannes Exp $ */
+/* $Id: zend.h,v 1.317 2006/03/14 14:19:19 dmitry Exp $ */
#ifndef ZEND_H
#define ZEND_H
@@ -92,7 +92,7 @@
#endif /* HAVE_MACH_O_DYLD_H */
-#if defined(HAVE_LIBDL) && !defined(HAVE_MACH_O_DYLD_H)
+#if defined(HAVE_LIBDL) && !defined(HAVE_MACH_O_DYLD_H) && !defined(ZEND_WIN32)
# ifndef RTLD_LAZY
# define RTLD_LAZY 1 /* Solaris 1, FreeBSD's (2.1.7.1 and older) */
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_config.w32.h?r1=1.41&r2=1.42&diff_format=u
Index: ZendEngine2/zend_config.w32.h
diff -u ZendEngine2/zend_config.w32.h:1.41 ZendEngine2/zend_config.w32.h:1.42
--- ZendEngine2/zend_config.w32.h:1.41 Tue Feb 21 08:00:38 2006
+++ ZendEngine2/zend_config.w32.h Tue Mar 14 14:19:19 2006
@@ -17,14 +17,15 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_config.w32.h,v 1.41 2006/02/21 08:00:38 dmitry Exp $ */
+/* $Id: zend_config.w32.h,v 1.42 2006/03/14 14:19:19 dmitry Exp $ */
#ifndef ZEND_CONFIG_W32_H
#define ZEND_CONFIG_W32_H
#define USE_ZEND_ALLOC 1
-#define HAVE_ALLOCA 1
-#define HAVE_LIMITS_H 1
+
+#include <../main/config.w32.h>
+
#define _CRTDBG_MAP_ALLOC
#include <malloc.h>
@@ -44,19 +45,9 @@
typedef unsigned long ulong;
typedef unsigned int uint;
-#undef HAVE_KILL
-#define HAVE_GETPID 1
-/* #define HAVE_ALLOCA_H 1 */
-#define HAVE_MEMCPY 1
-#define HAVE_STRDUP 1
-#define HAVE_SYS_TYPES_H 1
#define HAVE_STDIOSTR_H 1
#define HAVE_CLASS_ISTDIOSTREAM
#define istdiostream stdiostream
-#define HAVE_STDARG_H 1
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_STRCOLL 1
#define snprintf _snprintf
#define vsnprintf _vsnprintf
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/bug36568.phpt?r1=1.1&r2=1.2&diff_format=u
Index: ZendEngine2/tests/bug36568.phpt
diff -u /dev/null ZendEngine2/tests/bug36568.phpt:1.2
--- /dev/null Tue Mar 14 14:19:20 2006
+++ ZendEngine2/tests/bug36568.phpt Tue Mar 14 14:19:19 2006
@@ -0,0 +1,15 @@
+--TEST--
+Bug #36568 (memory_limit has no effect)
+--SKIPIF--
+<?php
+ if (!function_exists('memory_get_usage')) die('skip PHP is configured
without memory_limit');
+?>
+--INI--
+memory_limit=16M
+--FILE--
+<?php
+ini_set("memory_limit", "32M");
+echo ini_get("memory_limit");
+?>
+--EXPECT--
+32M
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/config.w32.h.in?r1=1.9&r2=1.10&diff_format=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.9
php-src/win32/build/config.w32.h.in:1.10
--- php-src/win32/build/config.w32.h.in:1.9 Wed Jan 11 20:24:07 2006
+++ php-src/win32/build/config.w32.h.in Tue Mar 14 14:19:19 2006
@@ -1,6 +1,6 @@
/*
Build Configuration Template for Win32.
- $Id: config.w32.h.in,v 1.9 2006/01/11 20:24:07 helly Exp $
+ $Id: config.w32.h.in,v 1.10 2006/03/14 14:19:19 dmitry Exp $
*/
/* Default PHP / PEAR directories */
@@ -107,7 +107,11 @@
#undef HAVE_SYS_WAIT_H
#define HAVE_SYSLOG_H 1
#undef HAVE_UNISTD_H
-#define HAVE_LIBDL 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_STDARG_H 1
+#undef HAVE_ALLOCA_H
+#undef HAVE_KILL
+#define HAVE_GETPID 1
#define HAVE_LIBM 1
#define HAVE_CUSERID 0
#undef HAVE_RINT
@@ -143,3 +147,10 @@
#undef HAVE_ATOF_ACCEPTS_NAN
#undef HAVE_ATOF_ACCEPTS_INF
#define HAVE_HUGE_VAL_NAN 1
+
+/* vs.net 2005 has a 64-bit time_t. This will likely break
+ * 3rdParty libs that were built with older compilers; switch
+ * back to 32-bit */
+#define _USE_32BIT_TIME_T 1
+#define HAVE_STDLIB_H 1
+
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
