iliaa Wed Sep 24 19:20:49 2003 EDT
Modified files:
/php-src/main main.c php.h
Log:
Fixed bug #25293 (Output correct EOL to error_log)
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.577 php-src/main/main.c:1.578
--- php-src/main/main.c:1.577 Wed Sep 17 20:04:57 2003
+++ php-src/main/main.c Wed Sep 24 19:20:48 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.577 2003/09/18 00:04:57 iliaa Exp $ */
+/* $Id: main.c,v 1.578 2003/09/24 23:20:48 iliaa Exp $ */
/* {{{ includes
*/
@@ -366,7 +366,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.198 php-src/main/php.h:1.199
--- php-src/main/php.h:1.198 Tue Sep 2 09:05:15 2003
+++ php-src/main/php.h Wed Sep 24 19:20:48 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.198 2003/09/02 13:05:15 abies Exp $ */
+/* $Id: php.h,v 1.199 2003/09/24 23:20:48 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
