Imported Upstream version 5.4.1~rc1upstream/5.4.1_rc1

23 files changed, 25 insertions, 25 deletions

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 34d87ab1d..e2d62545b 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -14,7 +14,7 @@
 #  | Author: Wez Furlong <wez@thebrainroom.com>                           |
 #  +----------------------------------------------------------------------+
 #
-# $Id: Makefile 322075 2012-01-11 15:47:37Z pajoye $
+# $Id$
 # This is the makefile template for the win32 build
 
 CC="$(PHP_CL)"
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index aac996631..1a4b834be 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: config.w32 322074 2012-01-11 15:46:45Z pajoye $
+// $Id$
 // "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 81fb71b13..c6cf076ba 100644
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -1,13 +1,13 @@
 /*
 	Build Configuration Template for Win32.
-	$Id: config.w32.h.in 313575 2011-07-22 11:25:30Z pajoye $
+	$Id$
 */
 
 /* Define the minimum supported version */
 #undef _WIN32_WINNT
 #undef NTDDI_VERSION
-#define _WIN32_WINNT 0x502
-#define NTDDI_VERSION  _WIN32_WIN2K
+#define _WIN32_WINNT 0x0501
+#define NTDDI_VERSION  0x05010200
 
 /* Default PHP / PEAR directories */
 #define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):""
diff --git a/win32/build/configure.tail b/win32/build/configure.tail
index 6f746bf9b..70625a43d 100644
--- a/win32/build/configure.tail
+++ b/win32/build/configure.tail
@@ -1,5 +1,5 @@
 // vim:ft=javascript
-// $Id: configure.tail 306347 2010-12-13 20:55:13Z pajoye $
+// $Id$
 // tail end of configure
 
 if (!MODE_PHPIZE && sapi_enabled.length < 1) {
diff --git a/win32/build/deplister.c b/win32/build/deplister.c
index 79191f0b6..bf91b96d5 100644
--- a/win32/build/deplister.c
+++ b/win32/build/deplister.c
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: deplister.c 293036 2010-01-03 09:23:27Z sebastian $ */
+/* $Id$ */
 
 /* This little application will list the DLL dependencies for a PE
  * module to it's stdout for use by distro/installer building tools */
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index 0181724db..17f7cd020 100644
--- a/win32/build/mkdist.php
+++ b/win32/build/mkdist.php
@@ -1,4 +1,4 @@
-<?php # $Id: mkdist.php 321952 2012-01-09 13:56:46Z pajoye $
+<?php # $Id$
 /* piece together a windows binary distro */
 
 $build_dir = $argv[1];
diff --git a/win32/build/template.rc b/win32/build/template.rc
index cf7f5c45a..2db889649 100644
--- a/win32/build/template.rc
+++ b/win32/build/template.rc
@@ -1,5 +1,5 @@
 /* This is a template RC file.
- * $Id: template.rc 298283 2010-04-21 23:07:54Z kalle $
+ * $Id$
  * Do not edit with MSVC */
 #ifdef APSTUDIO_INVOKED
 # error dont edit with MSVC
diff --git a/win32/fnmatch.c b/win32/fnmatch.c
index 568d5843b..590d23f5f 100644
--- a/win32/fnmatch.c
+++ b/win32/fnmatch.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * From FreeBSD fnmatch.c 1.11
- * $Id: fnmatch.c 273994 2009-01-20 01:37:48Z pajoye $
+ * $Id$
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/win32/fnmatch.h b/win32/fnmatch.h
index 530c7c09f..a8e7d6612 100644
--- a/win32/fnmatch.h
+++ b/win32/fnmatch.h
@@ -33,7 +33,7 @@
  *	@(#)fnmatch.h	8.1 (Berkeley) 6/2/93
  *
  * From FreeBSD fnmatch.h 1.7
- * $Id: fnmatch.h 273994 2009-01-20 01:37:48Z pajoye $
+ * $Id$
  */
 
 #ifndef	_FNMATCH_H_
diff --git a/win32/glob.c b/win32/glob.c
index 15be8ff0e..a197f3bbe 100644
--- a/win32/glob.c
+++ b/win32/glob.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: glob.c 303317 2010-09-13 11:17:40Z pajoye $ */
+/* $Id$ */
 
 /*
  * glob(3) -- a superset of the one defined in POSIX 1003.2.
diff --git a/win32/glob.h b/win32/glob.h
index 8548eec25..3f7a57a0b 100644
--- a/win32/glob.h
+++ b/win32/glob.h
@@ -1,4 +1,4 @@
-/*      $Id: glob.h 272473 2009-01-01 12:32:49Z pajoye $ */
+/*      $Id$ */
 /*	OpenBSD: glob.h,v 1.7 2002/02/17 19:42:21 millert Exp 	*/
 /*	NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp 	*/
 
diff --git a/win32/globals.c b/win32/globals.c
index 71a814bcc..b92fad9f2 100755
--- a/win32/globals.c
+++ b/win32/globals.c
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: globals.c 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 #include "php.h"
 #include "php_win32_globals.h"
diff --git a/win32/grp.h b/win32/grp.h
index 967ce5f53..d99449488 100644
--- a/win32/grp.h
+++ b/win32/grp.h
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: grp.h 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 struct group {
 	char *gr_name;			
diff --git a/win32/inet.h b/win32/inet.h
index e96d76b24..e58083828 100644
--- a/win32/inet.h
+++ b/win32/inet.h
@@ -3,7 +3,7 @@
 #endif
 #include <Ws2tcpip.h>
 
-#if (_WIN32_WINNT <= 0x502)
+#if (_WIN32_WINNT < 0x0600)
 PHPAPI int inet_pton(int af, const char* src, void* dst);
 PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size);
 PHPAPI int inet_aton(const char *cp, struct in_addr *inp);
diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h
index 40ee7f678..1fcfb6036 100755
--- a/win32/php_win32_globals.h
+++ b/win32/php_win32_globals.h
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_win32_globals.h 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 #ifndef PHP_WIN32_GLOBALS_H
 #define PHP_WIN32_GLOBALS_H
diff --git a/win32/select.c b/win32/select.c
index 355a915fb..544009610 100644
--- a/win32/select.c
+++ b/win32/select.c
@@ -21,7 +21,7 @@
 
 #ifdef PHP_WIN32
 
-/* $Id: select.c 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 /* 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().
diff --git a/win32/select.h b/win32/select.h
index 5e7395987..d156fa7e7 100644
--- a/win32/select.h
+++ b/win32/select.h
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: select.h 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 PHPAPI int php_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tv);
 
diff --git a/win32/sendmail.c b/win32/sendmail.c
index 13d425d17..c4969ad5e 100644
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -17,7 +17,7 @@
  *
  */
 
-/* $Id: sendmail.c 287783 2009-08-26 21:59:54Z pajoye $ */
+/* $Id$ */
 
 #include "php.h"				/*php specific */
 #include <stdio.h>
diff --git a/win32/sockets.c b/win32/sockets.c
index a1cb6f1b7..2698c95a5 100644
--- a/win32/sockets.c
+++ b/win32/sockets.c
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sockets.c 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 /* Code originally from ext/sockets */
 
diff --git a/win32/sockets.h b/win32/sockets.h
index 70e98a697..2e9b070b4 100644
--- a/win32/sockets.h
+++ b/win32/sockets.h
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sockets.h 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 /* Code originally from ext/sockets */
 
diff --git a/win32/syslog.h b/win32/syslog.h
index 24a2df8a3..b2d32cb5a 100644
--- a/win32/syslog.h
+++ b/win32/syslog.h
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: syslog.h 321634 2012-01-01 13:15:04Z felipe $ */
+/* $Id$ */
 
 #ifndef SYSLOG_H
 #define	SYSLOG_H
diff --git a/win32/time.c b/win32/time.c
index 0c3ccf082..a376fd61b 100644
--- a/win32/time.c
+++ b/win32/time.c
@@ -11,7 +11,7 @@
  *
  *****************************************************************************/
 
-/* $Id: time.c 305298 2010-11-12 18:37:02Z cataphract $ */
+/* $Id$ */
 
  /**
   *
diff --git a/win32/winutil.c b/win32/winutil.c
index 0076b606a..d9609f798 100644
--- a/win32/winutil.c
+++ b/win32/winutil.c
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: winutil.c 322843 2012-01-27 10:56:33Z pajoye $ */
+/* $Id$ */
 
 #include "php.h"
 #include <wincrypt.h>