From 9ece8612b821497dcbf0fbb944d1137dace3d974 Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Thu, 5 Oct 2000 23:25:41 +0000 Subject: [PATCH] - Add FTP extension to default Win32 build --- NEWS | 1 + ext/ftp/ftp.dsp | 121 -------------------------------- main/config.w32.h | 4 ++ main/internal_functions_win32.c | 2 + win32/php4dllts.dsp | 28 ++++++++ win32/php_modules.dsw | 73 ++++++++----------- 6 files changed, 65 insertions(+), 164 deletions(-) delete mode 100644 ext/ftp/ftp.dsp diff --git a/NEWS b/NEWS index 5fef30ac3a..55f0d7eeec 100644 --- 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 index 9b9daa2895..0000000000 --- a/ext/ftp/ftp.dsp +++ /dev/null @@ -1,121 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ftp" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=ftp - Win32 Release_TS -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ftp.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ftp.mak" CFG="ftp - Win32 Release_TS" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ftp - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ftp - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ftp - Win32 Release_TS" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release_TS" -# PROP BASE Intermediate_Dir "Release_TS" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_TS" -# PROP Intermediate_Dir "Release_TS" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x406 /d "NDEBUG" -# ADD RSC /l 0x406 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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" - -!ELSEIF "$(CFG)" == "ftp - Win32 Debug_TS" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Debug_TS" -# PROP BASE Intermediate_Dir "Debug_TS" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Debug_TS" -# PROP Intermediate_Dir "Debug_TS" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# 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 -# 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 -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x406 /d "NDEBUG" -# ADD RSC /l 0x406 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# 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 -# 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" - -!ENDIF - -# Begin Target - -# Name "ftp - Win32 Release_TS" -# Name "ftp - Win32 Debug_TS" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\ftp.c -# End Source File -# Begin Source File - -SOURCE=.\php_ftp.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\ftp.h -# End Source File -# Begin Source File - -SOURCE=.\php_ftp.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/main/config.w32.h b/main/config.w32.h index fd3c68d944..74a1b8630d 100644 --- 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 a1144e0aac..d9fe462ada 100644 --- 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 0f38d73d4d..da71bf3d3d 100644 --- a/win32/php4dllts.dsp +++ b/win32/php4dllts.dsp @@ -910,6 +910,34 @@ SOURCE=..\ext\xml\expat\xmltok\xmltok_ns.c # End Group # End Group # End Group +# Begin Group "FTP" + +# PROP Default_Filter "" +# Begin Group "Source Files No. 6" + +# PROP Default_Filter "*.c" +# Begin Source File + +SOURCE=..\ext\ftp\ftp.c +# End Source File +# Begin Source File + +SOURCE=..\ext\ftp\php_ftp.c +# End Source File +# End Group +# Begin Group "Header Files No. 6" + +# PROP Default_Filter "*.h" +# Begin Source File + +SOURCE=..\ext\ftp\ftp.h +# End Source File +# Begin Source File + +SOURCE=..\ext\ftp\php_ftp.h +# End Source File +# End Group +# End Group # End Group # Begin Group "Win32" diff --git a/win32/php_modules.dsw b/win32/php_modules.dsw index bd7a999c2e..fbc5b668e0 100644 --- a/win32/php_modules.dsw +++ b/win32/php_modules.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "ZendTS"=.\Zend\ZendTS.dsp - Package Owner=<4> +Project: "ZendTS"=..\Zend\ZendTS.dsp - Package Owner=<4> Package=<5> {{{ @@ -15,7 +15,7 @@ Package=<4> ############################################################################### -Project: "calendar"=.\ext\calendar\calendar.dsp - Package Owner=<4> +Project: "calendar"=..\ext\calendar\calendar.dsp - Package Owner=<4> Package=<5> {{{ @@ -27,7 +27,7 @@ Package=<4> ############################################################################### -Project: "cpdf"=.\ext\cpdf\cpdf.dsp - Package Owner=<4> +Project: "cpdf"=..\ext\cpdf\cpdf.dsp - Package Owner=<4> Package=<5> {{{ @@ -39,7 +39,7 @@ Package=<4> ############################################################################### -Project: "curl"=.\ext\curl\curl.dsp - Package Owner=<4> +Project: "curl"=..\ext\curl\curl.dsp - Package Owner=<4> Package=<5> {{{ @@ -51,7 +51,7 @@ Package=<4> ############################################################################### -Project: "cybercash"=.\ext\cybercash\cybercash.dsp - Package Owner=<4> +Project: "cybercash"=..\ext\cybercash\cybercash.dsp - Package Owner=<4> Package=<5> {{{ @@ -63,7 +63,7 @@ Package=<4> ############################################################################### -Project: "db"=.\ext\db\db.dsp - Package Owner=<4> +Project: "db"=..\ext\db\db.dsp - Package Owner=<4> Package=<5> {{{ @@ -75,7 +75,7 @@ Package=<4> ############################################################################### -Project: "dbase"=.\ext\dbase\dbase.dsp - Package Owner=<4> +Project: "dbase"=..\ext\dbase\dbase.dsp - Package Owner=<4> Package=<5> {{{ @@ -87,7 +87,7 @@ Package=<4> ############################################################################### -Project: "domxml"=.\ext\domxml\domxml.dsp - Package Owner=<4> +Project: "domxml"=..\ext\domxml\domxml.dsp - Package Owner=<4> Package=<5> {{{ @@ -99,7 +99,7 @@ Package=<4> ############################################################################### -Project: "dotnet"=.\ext\dotnet\dotnet.dsp - Package Owner=<4> +Project: "dotnet"=..\ext\dotnet\dotnet.dsp - Package Owner=<4> Package=<5> {{{ @@ -111,7 +111,7 @@ Package=<4> ############################################################################### -Project: "filepro"=".\ext\filepro\filepro.dsp" - Package Owner=<4> +Project: "exif"=..\ext\exif\exif.dsp - Package Owner=<4> Package=<5> {{{ @@ -123,7 +123,7 @@ Package=<4> ############################################################################### -Project: "exif"=.\ext\exif\exif.dsp - Package Owner=<4> +Project: "fdf"=..\ext\fdf\fdf.dsp - Package Owner=<4> Package=<5> {{{ @@ -135,7 +135,7 @@ Package=<4> ############################################################################### -Project: "fdf"=.\ext\fdf\fdf.dsp - Package Owner=<4> +Project: "filepro"=..\ext\filepro\filepro.dsp - Package Owner=<4> Package=<5> {{{ @@ -147,7 +147,7 @@ Package=<4> ############################################################################### -Project: "ftp"=.\ext\ftp\ftp.dsp - Package Owner=<4> +Project: "gd"=..\ext\gd\gd.dsp - Package Owner=<4> Package=<5> {{{ @@ -159,7 +159,7 @@ Package=<4> ############################################################################### -Project: "gd"=.\ext\gd\gd.dsp - Package Owner=<4> +Project: "gettext"=..\ext\gettext\gettext.dsp - Package Owner=<4> Package=<5> {{{ @@ -171,7 +171,7 @@ Package=<4> ############################################################################### -Project: "gettext"=.\ext\gettext\gettext.dsp - Package Owner=<4> +Project: "ifx"=..\ext\informix\ifx.dsp - Package Owner=<4> Package=<5> {{{ @@ -183,7 +183,7 @@ Package=<4> ############################################################################### -Project: "imap"=.\ext\imap\imap.dsp - Package Owner=<4> +Project: "imap"=..\ext\imap\imap.dsp - Package Owner=<4> Package=<5> {{{ @@ -195,20 +195,7 @@ Package=<4> ############################################################################### -Project: "ifx"=.\ext\informix\ifx.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - - -############################################################################### - -Project: "interbase"=.\ext\interbase\interbase.dsp - Package Owner=<4> +Project: "interbase"=..\ext\interbase\interbase.dsp - Package Owner=<4> Package=<5> {{{ @@ -220,7 +207,7 @@ Package=<4> ############################################################################### -Project: "java"=.\ext\java\java.dsp - Package Owner=<4> +Project: "java"=..\ext\java\java.dsp - Package Owner=<4> Package=<5> {{{ @@ -232,7 +219,7 @@ Package=<4> ############################################################################### -Project: "ldap"=.\ext\ldap\ldap.dsp - Package Owner=<4> +Project: "ldap"=..\ext\ldap\ldap.dsp - Package Owner=<4> Package=<5> {{{ @@ -244,7 +231,7 @@ Package=<4> ############################################################################### -Project: "mcrypt"=.\ext\mcrypt\mcrypt.dsp - Package Owner=<4> +Project: "mcrypt"=..\ext\mcrypt\mcrypt.dsp - Package Owner=<4> Package=<5> {{{ @@ -256,7 +243,7 @@ Package=<4> ############################################################################### -Project: "mhash"=.\ext\mhash\mhash.dsp - Package Owner=<4> +Project: "mhash"=..\ext\mhash\mhash.dsp - Package Owner=<4> Package=<5> {{{ @@ -268,7 +255,7 @@ Package=<4> ############################################################################### -Project: "mssql"=.\ext\mssql\mssql.dsp - Package Owner=<4> +Project: "mssql"=..\ext\mssql\mssql.dsp - Package Owner=<4> Package=<5> {{{ @@ -280,7 +267,7 @@ Package=<4> ############################################################################### -Project: "oci8"=.\ext\oci8\oci8.dsp - Package Owner=<4> +Project: "oci8"=..\ext\oci8\oci8.dsp - Package Owner=<4> Package=<5> {{{ @@ -292,7 +279,7 @@ Package=<4> ############################################################################### -Project: "oracle"=.\ext\oracle\oracle.dsp - Package Owner=<4> +Project: "oracle"=..\ext\oracle\oracle.dsp - Package Owner=<4> Package=<5> {{{ @@ -304,7 +291,7 @@ Package=<4> ############################################################################### -Project: "pdf"=".\ext\pdf\pdf.dsp" - Package Owner=<4> +Project: "pdf"=..\ext\pdf\pdf.dsp - Package Owner=<4> Package=<5> {{{ @@ -316,7 +303,7 @@ Package=<4> ############################################################################### -Project: "pgsql"=.\ext\pgsql\pgsql.dsp - Package Owner=<4> +Project: "pgsql"=..\ext\pgsql\pgsql.dsp - Package Owner=<4> Package=<5> {{{ @@ -328,7 +315,7 @@ Package=<4> ############################################################################### -Project: "snmp"=.\ext\snmp\snmp.dsp - Package Owner=<4> +Project: "snmp"=..\ext\snmp\snmp.dsp - Package Owner=<4> Package=<5> {{{ @@ -340,7 +327,7 @@ Package=<4> ############################################################################### -Project: "swf"=.\ext\swf\swf.dsp - Package Owner=<4> +Project: "swf"=..\ext\swf\swf.dsp - Package Owner=<4> Package=<5> {{{ @@ -352,7 +339,7 @@ Package=<4> ############################################################################### -Project: "sybase_ct"=.\ext\sybase_ct\sybase_ct.dsp - Package Owner=<4> +Project: "sybase_ct"=..\ext\sybase_ct\sybase_ct.dsp - Package Owner=<4> Package=<5> {{{ @@ -364,7 +351,7 @@ Package=<4> ############################################################################### -Project: "zlib"=.\ext\zlib\zlib.dsp - Package Owner=<4> +Project: "zlib"=..\ext\zlib\zlib.dsp - Package Owner=<4> Package=<5> {{{ -- 2.50.1