iliaa Wed Sep 24 19:22:33 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/main main.c php.h
Log:
MFH: Fixed bug #25293 (Output correct EOL to error_log)
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.407 php-src/NEWS:1.1247.2.408
--- php-src/NEWS:1.1247.2.407 Wed Sep 24 18:55:58 2003
+++ php-src/NEWS Wed Sep 24 19:22:32 2003
@@ -42,6 +42,7 @@
- Fixed bug #25307 (Crash with WDDX serializer). (Sascha, Jani)
- Fixed bug #25295 (QNX6: php_ini.c:414: 'alphasort' undeclared). (Jani)
- Fixed bug #25294 (ext/ftp: NLST failure leads to crash on exit). (Sara, Rob)
+- Fixed bug #25293 (Output correct EOL to error_log). (Ilia)
- Fixed bug #25239 (ftp_fopen_wrapper not RFC compliant). (Sara)
- Fixed bug #25211 (image.c compile failure with AIX). (Marcus)
- Fixed bug #25166 (WDDX serializer handler missing in win32). (Jani)
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.46 php-src/main/main.c:1.512.2.47
--- php-src/main/main.c:1.512.2.46 Fri Aug 22 16:02:11 2003
+++ php-src/main/main.c Wed Sep 24 19:22:32 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.512.2.46 2003/08/22 20:02:11 iliaa Exp $ */
+/* $Id: main.c,v 1.512.2.47 2003/09/24 23:22:32 iliaa Exp $ */
/* {{{ includes
*/
@@ -394,7 +394,7 @@
strftime(error_time_str, sizeof(error_time_str), "%d-%b-%Y
%H:%M:%S", php_localtime_r(&error_time, &tmbuf));
fprintf(log_file, "[%s] ", error_time_str);
fprintf(log_file, "%s", log_message);
- fprintf(log_file, "\n");
+ fprintf(log_file, "%s", PHP_EOL);
fclose(log_file);
return;
}
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.178.2.7 php-src/main/php.h:1.178.2.8
--- php-src/main/php.h:1.178.2.7 Thu Aug 28 11:52:15 2003
+++ php-src/main/php.h Wed Sep 24 19:22:32 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.178.2.7 2003/08/28 15:52:15 sas Exp $ */
+/* $Id: php.h,v 1.178.2.8 2003/09/24 23:22:32 iliaa Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -55,10 +55,16 @@
# define PHPAPI __declspec(dllimport)
# endif
#define PHP_DIR_SEPARATOR '\\'
+#define PHP_EOL "\r\n"
#else
#define PHPAPI
#define THREAD_LS
#define PHP_DIR_SEPARATOR '/'
+#if defined(__MacOSX__)
+#define PHP_EOL "\r"
+#else
+#define PHP_EOL "\n"
+#endif
#endif
#ifdef NETWARE
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
