HEAD defaults to build with ZE2 now

diff --git a/main/config.w32.h b/main/config.w32.h
index a2602533df039152b43a1e058933d3b0b4158489..6ada3c1c62030d2e4821ce0adc6de4f7bc55d81c 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -32,8 +32,8 @@
 /* Enable / Disable CALENDAR extension (default: enabled) */
 #define HAVE_CALENDAR 1
 
-/* Enable / Disable COM extension (default: enabled) */
-#define HAVE_COM 1
+/* Enable / Disable RPC extension (default: enabled) */
+#define HAVE_RPC 1
 
 /* Enable / Disable CTYPE extension (default: enabled) */
 #define HAVE_CTYPE 1
@@ -56,9 +56,6 @@
 /* Enable / Disable ODBC extension (default: enabled) */
 #define HAVE_UODBC 1
 
-/* Enable / Disable OVERLOAD extension (default: enabled) */
-#define HAVE_OVERLOAD 1
-
 /* Enable / Disable PCRE extension (default: enabled) */
 #define HAVE_BUNDLED_PCRE      1
 #define HAVE_PCRE 1

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index d730bee3f502516c378c71eaa08ea9d9ea951263..7ecf27361f4251246256846fec9c492e887fd726 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -54,8 +54,8 @@
 #if HAVE_CTYPE
 #include "ext/ctype/php_ctype.h"
 #endif
-#if HAVE_COM
-#include "ext/com/php_COM.h"
+#if HAVE_RPC
+#include "ext/rpc/php_rpc.h"
 #endif
 #if HAVE_FTP
 #include "ext/ftp/php_ftp.h"
@@ -82,11 +82,6 @@
 #if HAVE_MBSTRING
 #include "ext/mbstring/mbstring.h"
 #endif
-#ifndef ZEND_ENGINE_2
-#if HAVE_OVERLOAD
-#include "ext/overload/php_overload.h"
-#endif
-#endif
 #if HAVE_TOKENIZER
 #include "ext/tokenizer/php_tokenizer.h"
 #endif
@@ -108,8 +103,8 @@ zend_module_entry *php_builtin_extensions[] = {
 #if HAVE_CTYPE
        ,phpext_ctype_ptr
 #endif
-#if HAVE_COM
-       ,phpext_com_ptr
+#if HAVE_RPC
+       ,phpext_rpc_ptr
 #endif
 #if HAVE_FTP
        ,phpext_ftp_ptr
@@ -123,11 +118,6 @@ zend_module_entry *php_builtin_extensions[] = {
 #if HAVE_UODBC
        ,phpext_odbc_ptr
 #endif
-#ifndef ZEND_ENGINE_2
-#if HAVE_OVERLOAD
-  ,phpext_overload_ptr
-#endif
-#endif
 #if HAVE_PCRE || HAVE_BUNDLED_PCRE
        ,phpext_pcre_ptr
 #endif

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index b496c5d0e1528e1fd9a352995324a570e87754d1..5241351ef66451b836c5450f2157c5f3a75b188a 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -5,6 +5,7 @@
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
 \r
 CFG=php4dllts - Win32 Debug_TS\r
+\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
@@ -55,7 +56,7 @@ BSC32=bscmake.exe
 # 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 /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib /nologo /version:4.0 /dll /debug /machine:I386 /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"..\ext\mysql\libmysql\Debug_TS" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib Urlmon.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"..\ext\mysql\libmysql\Debug_TS" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
 \r
@@ -81,7 +82,7 @@ BSC32=bscmake.exe
 # 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 /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib /nologo /version:4.0 /dll /machine:I386 /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS" /libpath:"..\..\zlib\Release"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib Urlmon.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS" /libpath:"..\..\zlib\Release"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
 \r
@@ -108,7 +109,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release"\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib /nologo /version:4.0 /dll /machine:I386 /out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS_inline" /libpath:"Release_TS_Inline" /libpath:"..\..\zlib\Release"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib Urlmon.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS_inline" /libpath:"Release_TS_Inline" /libpath:"..\..\zlib\Release"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"\r
 \r
@@ -135,7 +136,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS"\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TSDbg\php4ts.dll" /libpath:"..\TSRM\Release_TSDbg" /libpath:"..\Zend\Release_TSDbg" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TSDbg" /libpath:"Release_TSDbg"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib Urlmon.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TSDbg\php4ts.dll" /libpath:"..\TSRM\Release_TSDbg" /libpath:"..\Zend\Release_TSDbg" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TSDbg" /libpath:"Release_TSDbg"\r
 \r
 !ENDIF \r
 \r
@@ -165,6 +166,10 @@ SOURCE=..\ext\standard\cyr_convert.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\ext\standard\filters.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE="..\main\fopen_wrappers.c"\r
 # End Source File\r
 # Begin Source File\r
@@ -178,6 +183,10 @@ SOURCE=..\main\main.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\main\memory_streams.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\main\mergesort.c\r
 # End Source File\r
 # Begin Source File\r
@@ -246,15 +255,11 @@ SOURCE=..\main\streams.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\memory_streams.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\main\user_streams.c\r
+SOURCE=..\main\strlcat.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\ext\standard\filters.c\r
+SOURCE=..\main\strlcpy.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -262,11 +267,7 @@ SOURCE=..\ext\standard\user_filters.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\main\strlcat.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\main\strlcpy.c\r
+SOURCE=..\main\user_streams.c\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
@@ -1372,58 +1373,6 @@ SOURCE=..\ext\bcmath\libbcmath\src\private.h
 \r
 # End Source File\r
 # End Group\r
-# End Group\r
-# Begin Group "COM"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Group "Source Files No. 9"\r
-\r
-# PROP Default_Filter ".c"\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\com\COM.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\com\conversion.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\com\dispatch.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\com\VARIANT.c\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files No. 9"\r
-\r
-# PROP Default_Filter ".h"\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\com\com.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\com\conversion.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\com\php_COM.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\com\php_VARIANT.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\com\variant.h\r
-# End Source File\r
-# End Group\r
-# End Group\r
-# Begin Group "Standard"\r
-\r
-# PROP Default_Filter ""\r
 # Begin Group "Source Files No. 1"\r
 \r
 # PROP Default_Filter ""\r
@@ -1860,7 +1809,46 @@ SOURCE=..\ext\standard\url_scanner_ex.h
 # End Source File\r
 # End Group\r
 # End Group\r
-# Begin Group "zlib"\r
+# Begin Group "rpc"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Group "Source Files No. 9"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\rpc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\rpc_proxy.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files No. 9"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\handler.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\layer.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\php_rpc.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\rpc.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\rpc_proxy.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "com"\r
 \r
 # PROP Default_Filter ""\r
 # Begin Group "Source Files No. 10"\r
@@ -1868,6 +1856,55 @@ SOURCE=..\ext\standard\url_scanner_ex.h
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=..\ext\rpc\com\com.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\com\com_wrapper.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\com\conversion.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\com\dispatch.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\com\variant.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files No. 10"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\com\com.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\com\com_wrapper.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\com\conversion.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\rpc\com\variant.h\r
+# End Source File\r
+# End Group\r
+# End Group\r
+# End Group\r
+# Begin Group "zlib"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Group "Source Files No. 10 Nr. 1"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
 SOURCE=..\ext\zlib\zlib.c\r
 # End Source File\r
 # Begin Source File\r
@@ -1875,7 +1912,7 @@ SOURCE=..\ext\zlib\zlib.c
 SOURCE=..\ext\zlib\zlib_fopen_wrapper.c\r
 # End Source File\r
 # End Group\r
-# Begin Group "Header Files No. 10"\r
+# Begin Group "Header Files No. 10 Nr. 1"\r
 \r
 # PROP Default_Filter ""\r
 # Begin Source File\r