Imported Upstream version 5.1.5upstream/5.1.5

7 files changed, 408 insertions, 84 deletions

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 8b8bdb449..bc865cbce 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.40.2.6 2005/12/14 02:01:13 wez Exp $
+// $Id: config.w32,v 1.40.2.8 2006/04/29 14:33:46 fmk Exp $
 // "Master" config file; think of it as a configure.in
 // equivalent.
 
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index 23cd5eb62..e7d2218f2 100644
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -1,6 +1,6 @@
 /*
 	Build Configuration Template for Win32.
-	$Id: config.w32.h.in,v 1.7.2.2 2005/12/14 02:01:13 wez Exp $
+	$Id: config.w32.h.in,v 1.7.2.4 2006/03/14 14:19:00 dmitry Exp $
 */
 
 /* Default PHP / PEAR directories */
@@ -107,11 +107,16 @@
 #undef HAVE_SYS_WAIT_H
 #define HAVE_SYSLOG_H 1
 #undef HAVE_UNISTD_H
-#define HAVE_LIBDL 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_STDARG_H 1
+#undef HAVE_ALLOCA_H
+#undef HAVE_KILL
+#define HAVE_GETPID 1
 #define HAVE_LIBM 1
 #define HAVE_CUSERID 0
 #undef HAVE_RINT
 #define HAVE_STRFTIME 1
+#define SIZEOF_SHORT 2
 /* int and long are stll 32bit in 64bit compiles */
 #define SIZEOF_INT 4
 #define SIZEOF_LONG 4
diff --git a/win32/build/template.rc b/win32/build/template.rc
index f03575448..b97af82d9 100644
--- a/win32/build/template.rc
+++ b/win32/build/template.rc
@@ -1,5 +1,5 @@
 /* This is a template RC file.
- * $Id: template.rc,v 1.7 2005/08/03 14:08:58 sniper Exp $
+ * $Id: template.rc,v 1.7.2.2 2006/02/08 21:09:18 johannes Exp $
  * Do not edit with MSVC */
 #ifdef APSTUDIO_INVOKED
 # error dont edit with MSVC
@@ -47,7 +47,7 @@ BEGIN
             VALUE "FileDescription", FILE_DESCRIPTION "\0"
             VALUE "FileVersion", STRVER4(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION, PHP_RELEASE_VERSION)
             VALUE "InternalName", FILE_NAME "\0"
-            VALUE "LegalCopyright", "Copyright © 1997-2005 The PHP Group\0"
+            VALUE "LegalCopyright", "Copyright © 1997-2006 The PHP Group\0"
             VALUE "LegalTrademarks", "PHP\0"
             VALUE "OriginalFilename", FILE_NAME "\0"
             VALUE "PrivateBuild", "\0"
diff --git a/win32/php5dllts.dsp b/win32/php5dllts.dsp
index 745d800f4..ccb8def8e 100644
--- a/win32/php5dllts.dsp
+++ b/win32/php5dllts.dsp
@@ -213,6 +213,10 @@ SOURCE=..\main\php_scandir.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\main\php_sprintf.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\main\php_ticks.c

 # End Source File

 # Begin Source File

@@ -388,28 +392,83 @@ SOURCE=..\main\win95nt.h
 # PROP Default_Filter ".c"

 # Begin Source File

 

-SOURCE=..\ext\pcre\pcrelib\chartables.c

-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8"

+SOURCE=..\ext\pcre\pcrelib\pcre_chartables.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\pcre\pcrelib\pcre_compile.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\pcre\pcrelib\pcre_exec.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\pcre\pcrelib\pcre_fullinfo.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\pcre\pcrelib\pcre_get.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\pcre\pcrelib\pcre_globals.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\pcre\pcrelib\pcre_info.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

 # End Source File

 # Begin Source File

 

-SOURCE=..\ext\pcre\pcrelib\get.c

-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2

+SOURCE=..\ext\pcre\pcrelib\pcre_maketables.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

 # End Source File

 # Begin Source File

 

-SOURCE=..\ext\pcre\pcrelib\maketables.c

-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2

+SOURCE=..\ext\pcre\pcrelib\pcre_ord2utf8.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

 # End Source File

 # Begin Source File

 

-SOURCE=..\ext\pcre\pcrelib\pcre.c

-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2

+SOURCE=..\ext\pcre\pcrelib\pcre_study.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

 # End Source File

 # Begin Source File

 

-SOURCE=..\ext\pcre\pcrelib\study.c

-# ADD CPP /D "STATIC" /D "SUPPORT_UTF8" /D LINK_SIZE=2

+SOURCE=..\ext\pcre\pcrelib\pcre_tables.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\pcre\pcrelib\pcre_try_flipped.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\pcre\pcrelib\pcre_ucp_searchfuncs.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\pcre\pcrelib\pcre_valid_utf8.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\pcre\pcrelib\pcre_version.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\pcre\pcrelib\pcre_xclass.c

+# ADD CPP /D "SUPPORT_UTF8" /D LINK_SIZE=2 /D MATCH_LIMIT=10000000 /D MATCH_LIMIT_RECURSION=10000000 /D NEWLINE=10 /D "SUPPORT_UCP"

 # End Source File

 # End Group

 # Begin Group "Header Files No. 3"

@@ -705,58 +764,6 @@ SOURCE=..\ext\ftp\php_ftp.h
 # End Source File

 # End Group

 # End Group

-# Begin Group "Calendar"

-

-# PROP Default_Filter ""

-# Begin Group "Source Files No. 7"

-

-# PROP Default_Filter ".c"

-# Begin Source File

-

-SOURCE=..\ext\calendar\cal_unix.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\calendar\calendar.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\calendar\dow.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\calendar\easter.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\calendar\french.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\calendar\gregor.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\calendar\jewish.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\calendar\julian.c

-# End Source File

-# End Group

-# Begin Group "Header Files No. 7"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=..\ext\calendar\php_calendar.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\ext\calendar\sdncal.h

-# End Source File

-# End Group

-# End Group

 # Begin Group "bcmath"

 

 # PROP Default_Filter ""

@@ -1753,10 +1760,6 @@ SOURCE=..\ext\standard\strnatcmp.c
 # End Source File

 # Begin Source File

 

-SOURCE=..\ext\standard\sunfuncs.c

-# End Source File

-# Begin Source File

-

 SOURCE=..\ext\standard\syslog.c

 # End Source File

 # Begin Source File

@@ -2023,6 +2026,302 @@ SOURCE=..\ext\libxml\libxml.c
 # End Source File

 # End Group

 # End Group

+# Begin Group "Date"

+

+# PROP Default_Filter ""

+# Begin Group "Source Files No. 10"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\ext\date\lib\astro.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\date\lib\dow.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\date\lib\parse_date.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\date\lib\parse_tz.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\date\php_date.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\date\lib\timelib.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\date\lib\tm2unixtime.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\date\lib\unixtime2tm.c

+# End Source File

+# End Group

+# Begin Group "Header Files No. 7"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\ext\date\lib\astro.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\date\lib\fallbackmap.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\date\php_date.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\date\lib\timelib_config.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\date\lib\timelib_structs.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\date\lib\timezonedb.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\date\lib\timezonemap.h

+# End Source File

+# End Group

+# End Group

+# Begin Group "Calendar"

+

+# PROP Default_Filter ""

+# Begin Group "Source Files No. 7"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\ext\calendar\cal_unix.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\calendar\calendar.c

+# PROP Intermediate_Dir "calendar"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\calendar\dow.c

+# PROP Intermediate_Dir "calendar"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\calendar\easter.c

+# PROP Intermediate_Dir "calendar"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\calendar\french.c

+# PROP Intermediate_Dir "calendar"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\calendar\gregor.c

+# PROP Intermediate_Dir "calendar"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\calendar\jewish.c

+# PROP Intermediate_Dir "calendar"

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\calendar\julian.c

+# PROP Intermediate_Dir "calendar"

+# End Source File

+# End Group

+# Begin Group "Header Files No. 11"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\ext\calendar\php_calendar.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\calendar\sdncal.h

+# End Source File

+# End Group

+# End Group

+# Begin Group "SPL"

+

+# PROP Default_Filter ""

+# Begin Group "Source Files No. 11"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\ext\spl\php_spl.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_array.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_directory.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_engine.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_exceptions.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_functions.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_iterators.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_observer.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_sxe.c

+# End Source File

+# End Group

+# Begin Group "Header Files No. 12"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\ext\spl\php_spl.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_array.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_directory.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_engine.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_exceptions.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_functions.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_iterators.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_observer.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\ext\spl\spl_sxe.h

+# End Source File

+# End Group

+# End Group

+# Begin Group "Reflection"

+

+# PROP Default_Filter ""

+# Begin Group "Source Files No. 12"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\ext\reflection\php_reflection.c

+# End Source File

+# End Group

+# Begin Group "Header Files No. 13"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\ext\reflection\php_reflection.h

+# End Source File

+# End Group

+# End Group

+# Begin Group "XMLReader"

+

+# PROP Default_Filter ""

+# Begin Group "Source Files No. 13"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\ext\xmlreader\php_xmlreader.c

+# End Source File

+# End Group

+# Begin Group "Header Files No. 14"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\ext\xmlreader\php_xmlreader.h

+# End Source File

+# End Group

+# End Group

+# Begin Group "XMLwriter"

+

+# PROP Default_Filter ""

+# Begin Group "Source Files No. 14"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\ext\xmlwriter\php_xmlwriter.c

+# End Source File

+# End Group

+# Begin Group "Header Files No. 15"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\ext\xmlwriter\php_xmlwriter.h

+# End Source File

+# End Group

+# End Group

+# Begin Group "IConv"

+

+# PROP Default_Filter ""

+# Begin Group "Source Files No. 15"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\ext\iconv\iconv.c

+# ADD CPP /D "PHP_ICONV_EXPORTS"

+# End Source File

+# End Group

+# Begin Group "Header Files No. 16"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\ext\iconv\php_iconv.h

+# End Source File

+# End Group

+# End Group

 # End Group

 # Begin Group "Win32"

 

@@ -2082,6 +2381,21 @@ SOURCE=..\win32\winutil.c
 

 SOURCE=..\win32\wsyslog.c

 # End Source File

+# Begin Source File

+

+SOURCE=.\build\wsyslog.mc

+

+# Begin Custom Build

+InputDir=.\build

+IntDir=.\Release_TSDbg

+InputPath=.\build\wsyslog.mc

+

+"wsyslog.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	mc -h $(InputDir)/.. -r $(InputDir) -x $(IntDir) $(InputPath)

+

+# End Custom Build

+

+# End Source File

 # End Group

 # Begin Group "Header Files No. 2"

 

diff --git a/win32/select.c b/win32/select.c
index 69e45096c..39c0d96fd 100644
--- a/win32/select.c
+++ b/win32/select.c
@@ -21,7 +21,7 @@
 
 #ifdef PHP_WIN32
 
-/* $Id: select.c,v 1.10.2.1 2006/01/01 12:50:20 sniper Exp $ */
+/* $Id: select.c,v 1.10.2.2 2006/02/26 10:49:50 helly Exp $ */
 
 /* Win32 select() will only work with sockets, so we roll our own implementation here.
  * - If you supply only sockets, this simply passes through to winsock select().
@@ -67,13 +67,13 @@ PHPAPI int php_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, stru
 			if ((DWORD)handles[n_handles] == 0xffffffff) {
 				/* socket */
 				if (SAFE_FD_ISSET(i, rfds)) {
-					FD_SET(i, &sock_read);
+					FD_SET((uint)i, &sock_read);
 				}
 				if (SAFE_FD_ISSET(i, wfds)) {
-					FD_SET(i, &sock_write);
+					FD_SET((uint)i, &sock_write);
 				}
 				if (SAFE_FD_ISSET(i, efds)) {
-					FD_SET(i, &sock_except);
+					FD_SET((uint)i, &sock_except);
 				}
 				if (i > sock_max_fd) {
 					sock_max_fd = i;
@@ -136,13 +136,13 @@ PHPAPI int php_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, stru
 				for (i = 0; i < n_handles; i++) {
 					if (WAIT_OBJECT_0 == WaitForSingleObject(handles[i], 0)) {
 						if (SAFE_FD_ISSET(handle_slot_to_fd[i], rfds)) {
-							FD_SET(handle_slot_to_fd[i], &aread);
+							FD_SET((uint)handle_slot_to_fd[i], &aread);
 						}
 						if (SAFE_FD_ISSET(handle_slot_to_fd[i], wfds)) {
-							FD_SET(handle_slot_to_fd[i], &awrite);
+							FD_SET((uint)handle_slot_to_fd[i], &awrite);
 						}
 						if (SAFE_FD_ISSET(handle_slot_to_fd[i], efds)) {
-							FD_SET(handle_slot_to_fd[i], &aexcept);
+							FD_SET((uint)handle_slot_to_fd[i], &aexcept);
 						}
 						retcode++;
 					}
diff --git a/win32/sendmail.c b/win32/sendmail.c
index c487facea..23c33725e 100644
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -17,7 +17,7 @@
  *
  */
 
-/* $Id: sendmail.c,v 1.65.2.1 2006/01/06 02:04:33 sniper Exp $ */
+/* $Id: sendmail.c,v 1.65.2.2 2006/02/08 21:03:36 johannes Exp $ */
 
 #include "php.h"				/*php specific */
 #include <stdio.h>
@@ -85,9 +85,9 @@ char LocalHost[HOST_NAME_LEN];
 #endif
 char seps[] = " ,\t\n";
 #ifndef NETWARE
-char *php_mailer = "PHP 4 WIN32";
+char *php_mailer = "PHP 5 WIN32";
 #else
-char *php_mailer = "PHP 4 NetWare";
+char *php_mailer = "PHP 5 NetWare";
 #endif	/* NETWARE */
 
 /* Error messages */
diff --git a/win32/wsyslog.c b/win32/wsyslog.c
index 294b3976c..4266079e1 100644
--- a/win32/wsyslog.c
+++ b/win32/wsyslog.c
@@ -62,9 +62,14 @@
 void closelog(void)
 {
 	TSRMLS_FETCH();
-	DeregisterEventSource(PW32G(log_source));
-	STR_FREE(PW32G(log_header));
-	PW32G(log_header) = NULL;
+	if (PW32G(log_source)) {
+		DeregisterEventSource(PW32G(log_source));
+		PW32G(log_source) = NULL;
+	}
+	if (PW32G(log_header)) {
+		STR_FREE(PW32G(log_header));
+		PW32G(log_header) = NULL;
+	}
 }
 
 /* Emulator for BSD syslog() routine