*** empty log message ***

diff --git a/main/main.c b/main/main.c
index 0150bb6a3396b8e3f4917a68e18a66e88820624f..bff5f59bb9e27cf5bdb067252c5ffe3616200f96 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -735,7 +735,6 @@ void php3_request_shutdown(void *dummy INLINE_TLS)
        }
        if (GLOBAL(initialized) & INIT_SCANNER) {
                SHUTDOWN_DEBUG("Scanner");
-               reset_scanner(CLS_C);
                GLOBAL(initialized) &= ~INIT_SCANNER;
        }
        SHUTDOWN_DEBUG("Memory manager");

diff --git a/php4ts.dsp b/php4ts.dsp
index 99f43924f52eb1ef01594ee6656e600fc53f0400..edd60af94f0aa31f284a59fb0b431c88cf6c366d 100644 (file)
--- a/php4ts.dsp
+++ b/php4ts.dsp
@@ -233,7 +233,7 @@ SOURCE=.\win95nt.h
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\apache.c\r
+SOURCE=.\ext\apache\apache.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -245,7 +245,7 @@ SOURCE=.\ext\standard\basic_functions.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\bcmath.c\r
+SOURCE=.\ext\bcmath\bcmath.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -261,7 +261,7 @@ SOURCE=.\ext\standard\dir.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\dl.c\r
+SOURCE=.\ext\standard\dl.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -293,7 +293,7 @@ SOURCE=.\ext\standard\fsock.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\head.c\r
+SOURCE=.\ext\standard\head.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -333,11 +333,11 @@ SOURCE=.\ext\standard\microtime.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\mime.c\r
+SOURCE=.\ext\standard\mime.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\number.c\r
+SOURCE=.\ext\bcmath\number.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -353,7 +353,7 @@ SOURCE=.\ext\standard\pageinfo.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\post.c\r
+SOURCE=.\ext\standard\post.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -409,7 +409,7 @@ SOURCE=.\ext\standard\datetime.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\dl.h\r
+SOURCE=.\ext\standard\dl.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -437,7 +437,7 @@ SOURCE=.\functions\global.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\head.h\r
+SOURCE=.\ext\standard\head.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -449,11 +449,11 @@ SOURCE=.\ext\standard\md5.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\mime.h\r
+SOURCE=.\ext\standard\mime.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\number.h\r
+SOURCE=.\ext\bcmath\number.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -461,7 +461,7 @@ SOURCE=.\ext\standard\pageinfo.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\php3_bcmath.h\r
+SOURCE=.\ext\bcmath\php3_bcmath.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -505,7 +505,7 @@ SOURCE=.\functions\phpmath.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\post.h\r
+SOURCE=.\ext\standard\post.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -553,7 +553,7 @@ SOURCE=.\regex\regfree.c
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\functions\COM.c\r
+SOURCE=.\ext\com\COM.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -605,6 +605,10 @@ SOURCE=.\win32\param.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\ext\com\php3_COM.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\win32\php_registry.h\r
 # End Source File\r
 # Begin Source File\r