add file locking under windows

change win build to use common clock compat files

diff --git a/ext/standard/config.w32 b/ext/standard/config.w32
index e02e6965f8ed3a72221f1d1e0e2b9abbe795412f..bbfde2c88c9e5e108ad46291eb320f345ee0f87a 100644 (file)
--- a/ext/standard/config.w32
+++ b/ext/standard/config.w32
@@ -16,5 +16,5 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \
        url_scanner_ex.c ftp_fopen_wrapper.c http_fopen_wrapper.c \
        php_fopen_wrapper.c credits.c css.c var_unserializer.c ftok.c sha1.c \
        user_filters.c uuencode.c filters.c proc_open.c \
-       streamsfuncs.c http.c", false /* never shared */);
+       streamsfuncs.c http.c flock_compat.c", false /* never shared */);
 

diff --git a/main/main.c b/main/main.c
index 4f5c8aa301e0822da34b46c8487aaed8271f993e..2b290efc153c8bfeb9aa022c31f2242cf5ddf78a 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -63,6 +63,7 @@
 #ifdef PHP_WIN32
 #include <io.h>
 #include "win32/php_registry.h"
+#include "ext/standard/flock_compat.h"
 #endif
 #include "php_syslog.h"
 #include "Zend/zend_exceptions.h"
@@ -362,8 +363,11 @@ PHPAPI void php_log_err(char *log_message TSRMLS_DC)
                        time(&error_time);
                        strftime(error_time_str, sizeof(error_time_str), "%d-%b-%Y %H:%M:%S", php_localtime_r(&error_time, &tmbuf));
                        len = spprintf(&tmp, 0, "[%s] %s%s", error_time_str, log_message, PHP_EOL);
+#ifdef PHP_WIN32
+                       php_flock(fd, 2);
+#endif
                        write(fd, tmp, len);
-                       efree(tmp); 
+                       efree(tmp);
                        close(fd);
                        return;
                }

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 4ee2dc8c2b54a66c944c65598ab167e1f6c0803f..ebf12d8937cc577138b4922b7a740d72fb257139 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -309,7 +309,7 @@ ADD_SOURCES("main", "main.c snprintf.c spprintf.c safe_mode.c fopen_wrappers.c \
 ADD_SOURCES("main/streams", "streams.c cast.c memory.c filter.c plain_wrapper.c \
        userspace.c transports.c xp_socket.c mmap.c");
 
-ADD_SOURCES("win32", "crypt_win32.c flock.c glob.c md5crypt.c readdir.c \
+ADD_SOURCES("win32", "crypt_win32.c glob.c md5crypt.c readdir.c \
        registry.c select.c sendmail.c time.c wfile.c winutil.c wsyslog.c globals.c");
 
 ADD_SOURCES("regex", "regcomp.c regerror.c regexec.c regfree.c");