diff --git a/ChangeLog b/ChangeLog
index 2f9a53ad5e..e2856848c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 27 11:09:29 2004  FUKUMOTO Atsushi  <fukumoto@nospam.imasy.or.jp>
+
+	* ext/socket/socket.c (s_recvfrom): sending length should be an
+	  invariant while retrying on EAGAIN.  [ruby-talk:89962]
+
 Tue Jan 27 10:35:18 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/win32ole/win32ole.c (set_argv): fix condition.
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 8a1825d795..eb75168cb2 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -416,6 +416,7 @@ s_recvfrom(sock, argc, argv, from)
     char buf[1024];
     socklen_t alen = sizeof buf;
     VALUE len, flg;
+    long buflen;
     long slen;
     int fd, flags;
 
@@ -430,13 +431,13 @@ s_recvfrom(sock, argc, argv, from)
     }
     fd = fileno(fptr->f);
 
-    slen = NUM2INT(len);
-    str = rb_tainted_str_new(0, slen);
+    buflen = NUM2INT(len);
+    str = rb_tainted_str_new(0, buflen);
 
   retry:
     rb_thread_wait_fd(fd);
     TRAP_BEG;
-    slen = recvfrom(fd, RSTRING(str)->ptr, slen, flags, (struct sockaddr*)buf, &alen);
+    slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen);
     TRAP_END;
 
     if (slen < 0) {