You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2007/04/13 22:54:13 UTC

svn commit: r528667 - in /apr/apr/branches/1.2.x/poll/unix: kqueue.c port.c

Author: wrowe
Date: Fri Apr 13 13:54:13 2007
New Revision: 528667

URL: http://svn.apache.org/viewvc?view=rev&rev=528667
Log:
Backport r439667/r528659 for nsec conversion errors in poll

Modified:
    apr/apr/branches/1.2.x/poll/unix/kqueue.c
    apr/apr/branches/1.2.x/poll/unix/port.c

Modified: apr/apr/branches/1.2.x/poll/unix/kqueue.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/poll/unix/kqueue.c?view=diff&rev=528667&r1=528666&r2=528667
==============================================================================
--- apr/apr/branches/1.2.x/poll/unix/kqueue.c (original)
+++ apr/apr/branches/1.2.x/poll/unix/kqueue.c Fri Apr 13 13:54:13 2007
@@ -243,7 +243,7 @@
     }
     else {
         tv.tv_sec = (long) apr_time_sec(timeout);
-        tv.tv_nsec = (long) apr_time_msec(timeout);
+        tv.tv_nsec = (long) apr_time_usec(timeout) * 1000;
         tvptr = &tv;
     }
 

Modified: apr/apr/branches/1.2.x/poll/unix/port.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/poll/unix/port.c?view=diff&rev=528667&r1=528666&r2=528667
==============================================================================
--- apr/apr/branches/1.2.x/poll/unix/port.c (original)
+++ apr/apr/branches/1.2.x/poll/unix/port.c Fri Apr 13 13:54:13 2007
@@ -260,7 +260,7 @@
     }
     else {
         tv.tv_sec = (long) apr_time_sec(timeout);
-        tv.tv_nsec = (long) apr_time_msec(timeout);
+        tv.tv_nsec = (long) apr_time_usec(timeout) * 1000;
         tvptr = &tv;
     }