Avoid locks when appening to the error log file

diff --git a/main/main.c b/main/main.c
index e556e70bc4c53223cef9f2c989e09538e652e688..1d29aa3be871ba02aaba4697fcabb390e82baed1 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -27,6 +27,7 @@
 
 #include "php.h"
 #include <stdio.h>
+#include <fcntl.h>
 #ifdef PHP_WIN32
 #include "win32/time.h"
 #include "win32/signal.h"
@@ -59,10 +60,8 @@
 #include "ext/standard/php_standard.h"
 #include "php_variables.h"
 #include "ext/standard/credits.h"
-#include "ext/standard/flock_compat.h"
 #ifdef PHP_WIN32
 #include <io.h>
-#include <fcntl.h>
 #include "win32/php_registry.h"
 #endif
 #include "php_syslog.h"
@@ -343,7 +342,7 @@ static int module_shutdown = 0;
  */
 PHPAPI void php_log_err(char *log_message TSRMLS_DC)
 {
-       FILE *log_file;
+       int fd = -1;
        char error_time_str[128];
        struct tm tmbuf;
        time_t error_time;
@@ -356,13 +355,16 @@ PHPAPI void php_log_err(char *log_message TSRMLS_DC)
                        return;
                }
 #endif
-               log_file = VCWD_FOPEN(PG(error_log), "ab");
-               if (log_file != NULL) {
+               fd = VCWD_OPEN_MODE(PG(error_log), O_CREAT | O_APPEND | O_WRONLY, 0644);
+               if (fd != -1) {
+                       char *tmp;
+                       int len;
                        time(&error_time);
                        strftime(error_time_str, sizeof(error_time_str), "%d-%b-%Y %H:%M:%S", php_localtime_r(&error_time, &tmbuf));
-                       php_flock(fileno(log_file), 2);
-                       fprintf(log_file, "[%s] %s%s", error_time_str, log_message, PHP_EOL);
-                       fclose(log_file);
+                       len = spprintf(&tmp, 0, "[%s] %s%s", error_time_str, log_message, PHP_EOL);
+                       write(fd, tmp, len);
+                       efree(tmp); 
+                       close(fd);
                        return;
                }
        }