dmitry Thu Dec 21 09:01:10 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/TSRM tsrm_virtual_cwd.c tsrm_win32.c
Log:
Removed dependency from SHELL32.DLL
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.448&r2=1.2027.2.547.2.449&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.448 php-src/NEWS:1.2027.2.547.2.449
--- php-src/NEWS:1.2027.2.547.2.448 Wed Dec 20 19:20:01 2006
+++ php-src/NEWS Thu Dec 21 09:01:10 2006
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Dec 2006, PHP 5.2.1RC2
+- Removed dependency from SHELL32.DLL. (Dmitry)
- Added function stream_socket_shutdown(). It is a wraper for system shutdown()
function, that shut downs part of a full-duplex connection. (Dmitry)
- Added internal heap protection (Dmitry)
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.74.2.9.2.14&r2=1.74.2.9.2.15&diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.14
TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.15
--- TSRM/tsrm_virtual_cwd.c:1.74.2.9.2.14 Mon Nov 13 15:13:20 2006
+++ TSRM/tsrm_virtual_cwd.c Thu Dec 21 09:01:10 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.14 2006/11/13 15:13:20 dmitry Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.74.2.9.2.15 2006/12/21 09:01:10 dmitry Exp $ */
#include <sys/types.h>
#include <sys/stat.h>
@@ -35,11 +35,6 @@
#ifdef TSRM_WIN32
#include <io.h>
#include "tsrm_win32.h"
-# if HAVE_NEWAPIS_H
-# define WANT_GETLONGPATHNAME_WRAPPER
-# define COMPILE_NEWAPIS_STUBS
-# include <NewAPIs.h>
-# endif
#endif
#ifdef NETWARE
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_win32.c?r1=1.27.2.1&r2=1.27.2.1.2.1&diff_format=u
Index: TSRM/tsrm_win32.c
diff -u TSRM/tsrm_win32.c:1.27.2.1 TSRM/tsrm_win32.c:1.27.2.1.2.1
--- TSRM/tsrm_win32.c:1.27.2.1 Sun Jan 1 12:50:00 2006
+++ TSRM/tsrm_win32.c Thu Dec 21 09:01:10 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_win32.c,v 1.27.2.1 2006/01/01 12:50:00 sniper Exp $ */
+/* $Id: tsrm_win32.c,v 1.27.2.1.2.1 2006/12/21 09:01:10 dmitry Exp $ */
#include <stdio.h>
#include <fcntl.h>
@@ -86,11 +86,19 @@
TSRM_API int tsrm_win32_access(const char *pathname, int mode)
{
- SHFILEINFO sfi;
-
if (mode == 1 /*X_OK*/) {
+#if 1
+ /* This code is not supported by Windows 98,
+ * but we don't support it anymore */
+ DWORD type;
+
+ return GetBinaryType(pathname, &type)?0:-1;
+#else
+ SHFILEINFO sfi;
+
return access(pathname, 0) == 0 &&
SHGetFileInfo(pathname, 0, &sfi, sizeof(SHFILEINFO),
SHGFI_EXETYPE) != 0 ? 0 : -1;
+#endif
} else {
return access(pathname, mode);
}
--
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|
