use proper value to check the log_source handle

diff --git a/win32/globals.c b/win32/globals.c
index 69dc5ef23263fc2b2f3aabdfb11f987aa30459d5..32d1aa0e0754f866f0d8d3052f4f205a077ee8d8 100644 (file)
--- a/win32/globals.c
+++ b/win32/globals.c
@@ -34,6 +34,8 @@ void php_win32_core_globals_ctor(void *vg)
        memset(wg, 0, sizeof(*wg));
 
        wg->mail_socket = INVALID_SOCKET;
+
+       wg->log_source = INVALID_HANDLE_VALUE;
 }
 
 void php_win32_core_globals_dtor(void *vg)

diff --git a/win32/wsyslog.c b/win32/wsyslog.c
index ff0293fd9d9299ce9eca053299cbf7bbc5199a9c..8244fa12f74f83bab02f1d6183423288c174ebd3 100644 (file)
--- a/win32/wsyslog.c
+++ b/win32/wsyslog.c
@@ -61,9 +61,9 @@
 
 void closelog(void)
 {
-       if (PW32G(log_source)) {
+       if (INVALID_HANDLE_VALUE != PW32G(log_source)) {
                DeregisterEventSource(PW32G(log_source));
-               PW32G(log_source) = NULL;
+               PW32G(log_source) = INVALID_HANDLE_VALUE;
        }
        if (PW32G(log_header)) {
                efree(PW32G(log_header));
@@ -86,7 +86,7 @@ void syslog(int priority, const char *message, ...)
        DWORD evid;
 
        /* default event source */
-       if (!PW32G(log_source))
+       if (INVALID_HANDLE_VALUE == PW32G(log_source))
                openlog("php", LOG_PID, LOG_SYSLOG);
 
        switch (priority) {                     /* translate UNIX type into NT type */
@@ -122,11 +122,7 @@ void syslog(int priority, const char *message, ...)
 void openlog(const char *ident, int logopt, int facility)
 {
 
-       if (PW32G(log_source)) {
-               closelog();
-       }
-
-       efree(PW32G(log_header));
+       closelog();
 
        PW32G(log_source) = RegisterEventSource(NULL, "PHP-" PHP_VERSION);
        spprintf(&PW32G(log_header), 0, (logopt & LOG_PID) ? "%s[%d]" : "%s", ident, getpid());