dmitry Thu Nov 23 08:37:21 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/main main.c
Log:
Fixed bug #39548 (ZMSG_LOG_SCRIPT_NAME not routed to OutputDebugString() on
Windows)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.371&r2=1.2027.2.547.2.372&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.371 php-src/NEWS:1.2027.2.547.2.372
--- php-src/NEWS:1.2027.2.547.2.371 Thu Nov 23 08:07:05 2006
+++ php-src/NEWS Thu Nov 23 08:37:21 2006
@@ -43,6 +43,8 @@
- Added optimization for imageline with horizontal and vertial lines (Pierre)
- Fixed bug #39602 (Invalid session.save_handler crashes PHP). (Dmitry)
- Fixed bug #39576 (array_walk() doesn't separate userdata zval). (Tony)
+- Fixed bug #39548 (ZMSG_LOG_SCRIPT_NAME not routed to OutputDebugString()
+ on Windows). (Dmitry)
- Fixed bug #39538 (fgetcsv can't handle starting newlines and trailing odd
number of backslashes). (David Soria Parra, Pierre)
- Fixed bug #39454 (Returning a SOAP array segfaults PHP). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.18&r2=1.640.2.23.2.19&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.18 php-src/main/main.c:1.640.2.23.2.19
--- php-src/main/main.c:1.640.2.23.2.18 Fri Nov 17 11:40:52 2006
+++ php-src/main/main.c Thu Nov 23 08:37:21 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.18 2006/11/17 11:40:52 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.19 2006/11/23 08:37:21 dmitry Exp $ */
/* {{{ includes
*/
@@ -1005,12 +1005,18 @@
struct tm *ta, tmbuf;
time_t curtime;
char *datetime_str, asctimebuf[52];
+ char memory_leak_buf[4096];
time(&curtime);
ta = php_localtime_r(&curtime, &tmbuf);
datetime_str = php_asctime_r(ta, asctimebuf);
datetime_str[strlen(datetime_str)-1]=0; /* get
rid of the trailing newline */
- fprintf(stderr, "[%s] Script: '%s'\n",
datetime_str, SAFE_FILENAME(SG(request_info).path_translated));
+ snprintf(memory_leak_buf,
sizeof(memory_leak_buf), "[%s] Script: '%s'\n", datetime_str,
SAFE_FILENAME(SG(request_info).path_translated));
+# if defined(PHP_WIN32)
+ OutputDebugString(memory_leak_buf);
+# else
+ fprintf(stderr, "%s", memory_leak_buf);
+# endif
}
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
