- Add FTP extension to default Win32 build

diff --git a/NEWS b/NEWS
index 5fef30ac3a21aae7fd263aa481db6348db6e65a3..55f0d7eeec83677bd0ae08186ce41e2bdecd8139 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ PHP 4.0                                                                    NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 05 Oct 2000, Version 4.0.3
+- Add FTP module to default Win32 build (Andi)
 - Fixed crash in the POSIX getrlimit() function (alex@zend.com)
 - Fixed dirname() under certain conditions (Andi)
 - Add --with-imap-ssl to support SSL'ized imap library in RH7 and others

diff --git a/ext/ftp/ftp.dsp b/ext/ftp/ftp.dsp
deleted file mode 100644 (file)
index 9b9daa2..0000000
--- a/ext/ftp/ftp.dsp
+++ /dev/null
@@ -1,121 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ftp" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=ftp - Win32 Release_TS\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "ftp.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "ftp.mak" CFG="ftp - Win32 Release_TS"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "ftp - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "ftp - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "ftp - Win32 Release_TS"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release_TS"\r
-# PROP BASE Intermediate_Dir "Release_TS"\r
-# PROP BASE Ignore_Export_Lib 0\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release_TS"\r
-# PROP Intermediate_Dir "Release_TS"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_FTP" /D ZTS=1 /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTP_EXPORTS" /D "COMPILE_DL_FTP" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_FTP=1 /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x406 /d "NDEBUG"\r
-# ADD RSC /l 0x406 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ftp.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"\r
-\r
-!ELSEIF  "$(CFG)" == "ftp - Win32 Debug_TS"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Debug_TS"\r
-# PROP BASE Intermediate_Dir "Debug_TS"\r
-# PROP BASE Ignore_Export_Lib 0\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Debug_TS"\r
-# PROP Intermediate_Dir "Debug_TS"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_FTP" /D ZTS=1 /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FTP_EXPORTS" /D "COMPILE_DL_FTP" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_FTP=1 /YX /FD /c\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x406 /d "NDEBUG"\r
-# ADD RSC /l 0x406 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php4ts_debug.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_ftp.dll" /libpath:"..\..\Debug_TS"\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "ftp - Win32 Release_TS"\r
-# Name "ftp - Win32 Debug_TS"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\ftp.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\php_ftp.c\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\ftp.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\php_ftp.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# End Target\r
-# End Project\r

diff --git a/main/config.w32.h b/main/config.w32.h
index fd3c68d94493c2f629daa8f6bd003dabd3fa2845..74a1b8630db137c4e16f2a9b8ed4f75695bd8fb9 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -18,6 +18,10 @@
 /* set to enable mysql */
 #define HAVE_MYSQL 1
 
+/* set to enable FTP support */
+#define HAVE_FTP 1
+
+
 /* set to enable bundled PCRE library */
 #define HAVE_BUNDLED_PCRE      1
 

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index a1144e0aac0dcad17aa0a1c4c93b5ceec9cb0ce1..d9fe462adafccf9cc23c045ad47ebc41536941a3 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -50,6 +50,7 @@
 #include "ext/standard/php_array.h"
 #include "ext/standard/php_assert.h"
 #include "ext/com/php_COM.h"
+#include "ext/ftp/php_ftp.h"
 #include "ext/standard/reg.h"
 #include "ext/pcre/php_pcre.h"
 #include "ext/odbc/php_odbc.h"
@@ -67,6 +68,7 @@ zend_module_entry *php_builtin_extensions[] = {
 #endif
        phpext_standard_ptr,
        COM_module_ptr,
+       phpext_ftp_ptr,
        phpext_pcre_ptr,
        phpext_odbc_ptr,
        phpext_session_ptr,

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index 0f38d73d4db613f43d3a30de624bd8ebb247539d..da71bf3d3d1924b66269442d1d1d4d20eb95109e 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -910,6 +910,34 @@ SOURCE=..\ext\xml\expat\xmltok\xmltok_ns.c
 # End Group\r
 # End Group\r
 # End Group\r
+# Begin Group "FTP"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Group "Source Files No. 6"\r
+\r
+# PROP Default_Filter "*.c"\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\ftp\ftp.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\ftp\php_ftp.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files No. 6"\r
+\r
+# PROP Default_Filter "*.h"\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\ftp\ftp.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\ftp\php_ftp.h\r
+# End Source File\r
+# End Group\r
+# End Group\r
 # End Group\r
 # Begin Group "Win32"\r
 \r

diff --git a/win32/php_modules.dsw b/win32/php_modules.dsw
index bd7a999c2ea7b31e95d9a7cf81576810343b9bd9..fbc5b668e03659462af6df3233b6cffd44dd45b7 100644 (file)
--- a/win32/php_modules.dsw
+++ b/win32/php_modules.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 \r
 ###############################################################################\r
 \r
-Project: "ZendTS"=.\Zend\ZendTS.dsp - Package Owner=<4>\r
+Project: "ZendTS"=..\Zend\ZendTS.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -15,7 +15,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "calendar"=.\ext\calendar\calendar.dsp - Package Owner=<4>\r
+Project: "calendar"=..\ext\calendar\calendar.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -27,7 +27,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "cpdf"=.\ext\cpdf\cpdf.dsp - Package Owner=<4>\r
+Project: "cpdf"=..\ext\cpdf\cpdf.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -39,7 +39,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "curl"=.\ext\curl\curl.dsp - Package Owner=<4>\r
+Project: "curl"=..\ext\curl\curl.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -51,7 +51,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "cybercash"=.\ext\cybercash\cybercash.dsp - Package Owner=<4>\r
+Project: "cybercash"=..\ext\cybercash\cybercash.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -63,7 +63,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "db"=.\ext\db\db.dsp - Package Owner=<4>\r
+Project: "db"=..\ext\db\db.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -75,7 +75,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "dbase"=.\ext\dbase\dbase.dsp - Package Owner=<4>\r
+Project: "dbase"=..\ext\dbase\dbase.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -87,7 +87,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "domxml"=.\ext\domxml\domxml.dsp - Package Owner=<4>\r
+Project: "domxml"=..\ext\domxml\domxml.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -99,7 +99,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "dotnet"=.\ext\dotnet\dotnet.dsp - Package Owner=<4>\r
+Project: "dotnet"=..\ext\dotnet\dotnet.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -111,7 +111,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "filepro"=".\ext\filepro\filepro.dsp" - Package Owner=<4>\r
+Project: "exif"=..\ext\exif\exif.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -123,7 +123,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "exif"=.\ext\exif\exif.dsp - Package Owner=<4>\r
+Project: "fdf"=..\ext\fdf\fdf.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -135,7 +135,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "fdf"=.\ext\fdf\fdf.dsp - Package Owner=<4>\r
+Project: "filepro"=..\ext\filepro\filepro.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -147,7 +147,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "ftp"=.\ext\ftp\ftp.dsp - Package Owner=<4>\r
+Project: "gd"=..\ext\gd\gd.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -159,7 +159,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "gd"=.\ext\gd\gd.dsp - Package Owner=<4>\r
+Project: "gettext"=..\ext\gettext\gettext.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -171,7 +171,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "gettext"=.\ext\gettext\gettext.dsp - Package Owner=<4>\r
+Project: "ifx"=..\ext\informix\ifx.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -183,7 +183,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "imap"=.\ext\imap\imap.dsp - Package Owner=<4>\r
+Project: "imap"=..\ext\imap\imap.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -195,20 +195,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "ifx"=.\ext\informix\ifx.dsp - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-}}}\r
-\r
-\r
-###############################################################################\r
-\r
-Project: "interbase"=.\ext\interbase\interbase.dsp - Package Owner=<4>\r
+Project: "interbase"=..\ext\interbase\interbase.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -220,7 +207,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "java"=.\ext\java\java.dsp - Package Owner=<4>\r
+Project: "java"=..\ext\java\java.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -232,7 +219,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "ldap"=.\ext\ldap\ldap.dsp - Package Owner=<4>\r
+Project: "ldap"=..\ext\ldap\ldap.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -244,7 +231,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "mcrypt"=.\ext\mcrypt\mcrypt.dsp - Package Owner=<4>\r
+Project: "mcrypt"=..\ext\mcrypt\mcrypt.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -256,7 +243,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "mhash"=.\ext\mhash\mhash.dsp - Package Owner=<4>\r
+Project: "mhash"=..\ext\mhash\mhash.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -268,7 +255,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "mssql"=.\ext\mssql\mssql.dsp - Package Owner=<4>\r
+Project: "mssql"=..\ext\mssql\mssql.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -280,7 +267,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "oci8"=.\ext\oci8\oci8.dsp - Package Owner=<4>\r
+Project: "oci8"=..\ext\oci8\oci8.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -292,7 +279,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "oracle"=.\ext\oracle\oracle.dsp - Package Owner=<4>\r
+Project: "oracle"=..\ext\oracle\oracle.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -304,7 +291,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "pdf"=".\ext\pdf\pdf.dsp" - Package Owner=<4>\r
+Project: "pdf"=..\ext\pdf\pdf.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -316,7 +303,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "pgsql"=.\ext\pgsql\pgsql.dsp - Package Owner=<4>\r
+Project: "pgsql"=..\ext\pgsql\pgsql.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -328,7 +315,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "snmp"=.\ext\snmp\snmp.dsp - Package Owner=<4>\r
+Project: "snmp"=..\ext\snmp\snmp.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -340,7 +327,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "swf"=.\ext\swf\swf.dsp - Package Owner=<4>\r
+Project: "swf"=..\ext\swf\swf.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -352,7 +339,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "sybase_ct"=.\ext\sybase_ct\sybase_ct.dsp - Package Owner=<4>\r
+Project: "sybase_ct"=..\ext\sybase_ct\sybase_ct.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r
@@ -364,7 +351,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "zlib"=.\ext\zlib\zlib.dsp - Package Owner=<4>\r
+Project: "zlib"=..\ext\zlib\zlib.dsp - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r