cvs: /php4 ChangeLog php4dllts.dsp /php4/ext/standard fsock.c

zeev Sat Jul 24 10:36:48 1999 EDT Modified files: /php4 ChangeLog php4dllts.dsp /php4/ext/standard fsock.c Log: * Fix a warning * Update ChangeLog Index: php4/ChangeLog diff -u php4/ChangeLog:1.19 php4/ChangeLog:1.20 --- php4/ChangeLog:1.19 Fri Jul 23 22:44:53 1999 +++ php4/ChangeLog Sat Jul 24 10:36:47 1999 @@ -2,6 +2,10 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ??? ?? 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 Index: php4/php4dllts.dsp diff -u php4/php4dllts.dsp:1.16 php4/php4dllts.dsp:1.17 --- php4/php4dllts.dsp:1.16 Sat Jul 17 13:35:44 1999 +++ php4/php4dllts.dsp Sat Jul 24 10:36:48 1999 @@ -792,6 +792,10 @@ # PROP Default_Filter "" # Begin Source File +SOURCE=.\ChangeLog +# End Source File +# Begin Source File + SOURCE=.\LICENSE # End Source File # Begin Source File Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.15 php4/ext/standard/fsock.c:1.16 --- php4/ext/standard/fsock.c:1.15 Wed Jul 21 12:12:13 1999 +++ php4/ext/standard/fsock.c Sat Jul 24 10:36:48 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.15 1999/07/21 16:12:13 sas Exp $ */ +/* $Id: fsock.c,v 1.16 1999/07/24 14:36:48 zeev Exp $ */ /* Synced with php3 revision 1.121 1999-06-18 [ssb] */ /* Synced with php3 revision 1.133 1999-07-21 [sas] */ @@ -248,7 +248,7 @@ 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 */