From: Zeev Suraski <zeev@php.net>
Date: Sat, 24 Jul 1999 14:36:48 +0000 (+0000)
Subject: * Fix a warning
X-Git-Tag: php-4.0b2~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b2bda778ea18a20f11a458a5f1353e483351b64;p=php

* Fix a warning
* Update ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index 59051d7bdb..c6805288c5 100644
--- 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 cc000f42b4..ea5968e043 100644
--- 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 4da958a50c..fe93f84042 100644
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -792,6 +792,10 @@ InputPath=".\configuration-scanner.l"
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\ChangeLog
+# End Source File
+# Begin Source File
+
 SOURCE=.\LICENSE
 # End Source File
 # Begin Source File