* Fix a warning

* Update ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 59051d7bdbee18a8746ae4541e2147abc029f940..c6805288c53bd6dc85dab5090620240c874cbbaf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ PHP 4.0 CHANGE LOG                                                    ChangeLog
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ??? ?? 1999, Version 4.0 Beta 2
+- Fixed a memory leak with switch statement containing return statements
+  (Andi & Zeev, libzend)
+- Fixed a crash problem in switch statements that had a string offset
+  as a conditional (Andi & Zeev, libzend)
 - Imported PHP3 fixes for rand() and mt_rand() (Rasmus)
 - Added function entries for strip_tags() and similar_text() (Andrey)
 - Fixed a bug in WDDX that would cause a crash if a number was passed in

diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index cc000f42b4202aaa2658725c3c53a465e051783d..ea5968e043ea4080906cc4a967de2d8a0f6749c4 100644 (file)
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -248,7 +248,7 @@ static void _php3_fsockopen(INTERNAL_FUNCTION_PARAMETERS, int persistent) {
        switch(arg_count) {
                case 5:
                        convert_to_double(args[4]);
-                       conv = args[4]->value.dval * 1000000.0;
+                       conv = (unsigned long) args[4]->value.dval * 1000000.0;
                        timeout.tv_sec = conv / 1000000;
                        timeout.tv_usec = conv % 1000000;
                        /* fall-through */

diff --git a/php4dllts.dsp b/php4dllts.dsp
index 4da958a50c03a9bed1be197c5960134d1df38075..fe93f840423b24c818042058312b07bd179ac18e 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -792,6 +792,10 @@ InputPath=".\configuration-scanner.l"
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=.\ChangeLog\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\LICENSE\r
 # End Source File\r
 # Begin Source File\r