dmitry Tue Mar 14 14:19:00 2006 UTC
Added files: (Branch: PHP_5_1)
/ZendEngine2/tests bug36568.phpt
Modified files:
/php-src NEWS
/ZendEngine2 zend.h zend_config.w32.h
/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/php-src/NEWS?r1=1.2027.2.458&r2=1.2027.2.459&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.458 php-src/NEWS:1.2027.2.459
--- php-src/NEWS:1.2027.2.458 Mon Mar 13 21:56:38 2006
+++ php-src/NEWS Tue Mar 14 14:19:00 2006
@@ -7,6 +7,7 @@
- Fixed bug #36629 (SoapServer::handle() exits on SOAP faults). (Dmitry)
- Fixed bug #36697 (Transparency is lost when using imagecreatetruecolor).
(Pierre)
+- Fixed bug #36568 (memory_limit setting on win32 has no effect). (Dmitry)
09 Mar 2006, PHP 5.1.3RC1
- Updated PCRE to version 6.6. (Andrei)
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend.h?r1=1.293.2.9&r2=1.293.2.10&diff_format=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.293.2.9 ZendEngine2/zend.h:1.293.2.10
--- ZendEngine2/zend.h:1.293.2.9 Wed Jan 4 23:53:03 2006
+++ ZendEngine2/zend.h Tue Mar 14 14:19:00 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.h,v 1.293.2.9 2006/01/04 23:53:03 andi Exp $ */
+/* $Id: zend.h,v 1.293.2.10 2006/03/14 14:19:00 dmitry Exp $ */
#ifndef ZEND_H
#define ZEND_H
@@ -91,7 +91,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.39.2.1&r2=1.39.2.2&diff_format=u
Index: ZendEngine2/zend_config.w32.h
diff -u ZendEngine2/zend_config.w32.h:1.39.2.1
ZendEngine2/zend_config.w32.h:1.39.2.2
--- ZendEngine2/zend_config.w32.h:1.39.2.1 Wed Jan 4 23:53:04 2006
+++ ZendEngine2/zend_config.w32.h Tue Mar 14 14:19:00 2006
@@ -5,7 +5,7 @@
| Copyright (c) 1998-2006 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
- | that is bundled with this package in the file LICENSE, and is |
+ | that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.zend.com/license/2_00.txt. |
| If you did not receive a copy of the Zend license and are unable to |
@@ -17,14 +17,15 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_config.w32.h,v 1.39.2.1 2006/01/04 23:53:04 andi Exp $ */
+/* $Id: zend_config.w32.h,v 1.39.2.2 2006/03/14 14:19:00 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
@@ -87,7 +78,7 @@
#define ZEND_DLEXPORT __declspec(dllexport)
#define ZEND_DLIMPORT __declspec(dllimport)
-/* 0x00200000L is MB_SERVICE_NOTIFICATION, which is only supported under
Windows NT
+/* 0x00200000L is MB_SERVICE_NOTIFICATION, which is only supported under
Windows NT
* (and requires _WIN32_WINNT to be defined, which prevents the resulting
executable
* from running under Windows 9x
* Windows 9x should silently ignore it, so it's being used here directly
http://cvs.php.net/viewcvs.cgi/php-src/win32/build/config.w32.h.in?r1=1.7.2.3&r2=1.7.2.4&diff_format=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.7.2.3
php-src/win32/build/config.w32.h.in:1.7.2.4
--- php-src/win32/build/config.w32.h.in:1.7.2.3 Wed Jan 11 20:31:05 2006
+++ php-src/win32/build/config.w32.h.in Tue Mar 14 14:19:00 2006
@@ -1,6 +1,6 @@
/*
Build Configuration Template for Win32.
- $Id: config.w32.h.in,v 1.7.2.3 2006/01/11 20:31:05 helly Exp $
+ $Id: config.w32.h.in,v 1.7.2.4 2006/03/14 14:19:00 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
http://cvs.php.net/viewcvs.cgi/ZendEngine2/tests/bug36568.phpt?view=markup&rev=1.1
Index: ZendEngine2/tests/bug36568.phpt
+++ ZendEngine2/tests/bug36568.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
