This commit was manufactured by cvs2svn to create branch 'PHP_4_3'.

diff --git a/ext/sqlite/php_sqlite.def b/ext/sqlite/php_sqlite.def
new file mode 100644 (file)
index 0000000..e61a0cd
--- /dev/null
+++ b/ext/sqlite/php_sqlite.def
@@ -0,0 +1,37 @@
+EXPORTS
+sqlite_open
+sqlite_close
+sqlite_exec
+sqlite_last_insert_rowid
+sqlite_changes
+sqlite_error_string
+sqlite_interrupt
+sqlite_complete
+sqlite_busy_handler
+sqlite_busy_timeout
+sqlite_get_table
+sqlite_free_table
+sqlite_exec_printf
+sqlite_exec_vprintf
+sqlite_get_table_printf
+sqlite_get_table_vprintf
+sqlite_mprintf
+sqlite_vmprintf
+sqlite_freemem
+sqlite_libversion
+sqlite_libencoding
+sqlite_create_function
+sqlite_create_aggregate
+sqlite_function_type
+sqlite_set_result_string
+sqlite_set_result_int
+sqlite_set_result_double
+sqlite_set_result_error
+sqlite_user_data
+sqlite_aggregate_context
+sqlite_aggregate_count
+sqlite_set_authorizer
+sqlite_trace
+sqlite_compile
+sqlite_step
+sqlite_finalize

diff --git a/ext/sqlite/sqlite.dsp b/ext/sqlite/sqlite.dsp
new file mode 100644 (file)
index 0000000..f3981cb
--- /dev/null
+++ b/ext/sqlite/sqlite.dsp
@@ -0,0 +1,331 @@
+# Microsoft Developer Studio Project File - Name="sqlite" - 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=sqlite - Win32 Debug_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 "sqlite.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 "sqlite.mak" CFG="sqlite - Win32 Debug_TS"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "sqlite - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "sqlite - 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)" == "sqlite - 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 /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SQLITE_EXPORTS" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\php4" /I "..\..\..\php4\main" /I "..\..\..\php4\Zend" /I "..\..\..\php4\TSRM" /I "..\..\..\php4\win32" /I "..\..\..\php_build" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_SQLITE" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS" /FR /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 0x407 /d "NDEBUG"\r
+# ADD RSC /l 0x407 /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 /nologo /dll /machine:I386\r
+# ADD LINK32 php4ts.lib 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 /out:"..\..\Release_TS\php_sqlite.dll" /libpath:"..\..\..\php4\Release_TS" /libpath:"..\..\..\php4\Release_TS_Inline" /libpath:"..\..\..\php_build\release"\r
+\r
+!ELSEIF  "$(CFG)" == "sqlite - Win32 Debug_TS"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Debug_TS"\r
+# PROP BASE Intermediate_Dir "Debug_TS"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\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 /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SQLITE_EXPORTS" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\php4" /I "..\..\..\php4\main" /I "..\..\..\php4\Zend" /I "..\..\..\php4\TSRM" /I "..\..\..\php4\win32" /I "..\..\..\php_build" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_SQLITE" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS" /YX /FD /GZ /c\r
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x407 /d "_DEBUG"\r
+# ADD RSC /l 0x407 /d "_DEBUG"\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 /nologo /dll /debug /machine:I386 /pdbtype:sept\r
+# ADD LINK32 php4ts_debug.lib 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 /out:"..\..\Debug_TS\php_sqlite.dll" /pdbtype:sept /libpath:"..\..\..\php4\Debug_TS" /libpath:"..\..\..\php_build\release"\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "sqlite - Win32 Release_TS"\r
+# Name "sqlite - 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 Group "libsqlite"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\attach.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\auth.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\btree.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\btree.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\btree_rb.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\build.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\config.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\copy.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\delete.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\encode.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\expr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\func.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\hash.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\hash.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\insert.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\main.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\opcodes.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\opcodes.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\os.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\os.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\pager.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\pager.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\parse.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\parse.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\pragma.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\printf.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\random.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\select.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\sqlite.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\sqlite.w32.h\r
+\r
+!IF  "$(CFG)" == "sqlite - Win32 Release_TS"\r
+\r
+# Begin Custom Build\r
+InputDir=.\libsqlite\src\r
+InputPath=.\libsqlite\src\sqlite.w32.h\r
+\r
+"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy $(InputPath) $(InputDir)\sqlite.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "sqlite - Win32 Debug_TS"\r
+\r
+# Begin Custom Build\r
+InputDir=.\libsqlite\src\r
+InputPath=.\libsqlite\src\sqlite.w32.h\r
+\r
+"$(InputDir)\sqlite.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy $(InputPath) $(InputDir)\sqlite.h\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\sqlite_config.w32.h\r
+\r
+!IF  "$(CFG)" == "sqlite - Win32 Release_TS"\r
+\r
+# Begin Custom Build\r
+InputDir=.\libsqlite\src\r
+InputPath=.\libsqlite\src\sqlite_config.w32.h\r
+\r
+"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy $(InputPath) $(InputDir)\config.h\r
+\r
+# End Custom Build\r
+\r
+!ELSEIF  "$(CFG)" == "sqlite - Win32 Debug_TS"\r
+\r
+# Begin Custom Build\r
+InputDir=.\libsqlite\src\r
+InputPath=.\libsqlite\src\sqlite_config.w32.h\r
+\r
+"$(InputDir)\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r
+       copy $(InputPath) $(InputDir)\config.h\r
+\r
+# End Custom Build\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\sqliteInt.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\table.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\tokenize.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\trigger.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\update.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\util.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\vacuum.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\vdbe.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\vdbe.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\libsqlite\src\where.c\r
+# End Source File\r
+# End Group\r
+# Begin Source File\r
+\r
+SOURCE=.\php_sqlite.def\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\sqlite.c\r
+# ADD CPP /I "libsqlite\src"\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=.\php_sqlite.h\r
+# End Source File\r
+# End Group\r
+# End Target\r
+# End Project\r

diff --git a/ext/sqlite/tests/sqlite_016.phpt b/ext/sqlite/tests/sqlite_016.phpt
new file mode 100755 (executable)
index 0000000..8df7dc9
--- /dev/null
+++ b/ext/sqlite/tests/sqlite_016.phpt
@@ -0,0 +1,42 @@
+--TEST--
+sqlite: fetch string
+--INI--
+sqlite.assoc_case=0
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded("sqlite")) print "skip"; ?>
+--FILE--
+<?php 
+include "blankdb.inc";
+
+$data = array(
+       array (0 => 'one', 1 => 'two'),
+       array (0 => 'three', 1 => 'four')
+       );
+
+sqlite_query("CREATE TABLE strings(a VARCHAR, b VARCHAR)", $db);
+
+foreach ($data as $str) {
+       sqlite_query("INSERT INTO strings VALUES('${str[0]}','${str[1]}')", $db);
+}
+
+echo "====BUFFERED====\n";
+$r = sqlite_query("SELECT a, b from strings", $db);
+while (sqlite_has_more($r)) {
+       var_dump(sqlite_fetch_string($r));
+}
+echo "====UNBUFFERED====\n";
+$r = sqlite_unbuffered_query("SELECT a, b from strings", $db);
+while (sqlite_has_more($r)) {
+       var_dump(sqlite_fetch_string($r));
+}
+echo "DONE!\n";
+?>
+--EXPECT--
+====BUFFERED====
+string(3) "one"
+string(5) "three"
+====UNBUFFERED====
+string(3) "one"
+string(5) "three"
+DONE!

diff --git a/ext/standard/tests/array/bug24198.phpt b/ext/standard/tests/array/bug24198.phpt
new file mode 100644 (file)
index 0000000..b1cd523
--- /dev/null
+++ b/ext/standard/tests/array/bug24198.phpt
@@ -0,0 +1,25 @@
+--TEST--n
+Bug #24198 (array_merge_recursive() invalid recursion detection)
+--FILE--
+<?php
+$c = array('a' => 'aa','b' => 'bb'); 
+
+var_dump(array_merge_recursive($c, $c)); 
+?>
+--EXPECT--
+array(2) {
+  ["a"]=>
+  array(2) {
+    [0]=>
+    string(2) "aa"
+    [1]=>
+    string(2) "aa"
+  }
+  ["b"]=>
+  array(2) {
+    [0]=>
+    string(2) "bb"
+    [1]=>
+    string(2) "bb"
+  }
+}