1 files changed, 5 insertions, 5 deletions

diff --git a/src/testspdy/test_requests_with_assets.c b/src/testspdy/test_requests_with_assets.c
index 26d309e8..6ec927e8 100644
--- a/src/testspdy/test_requests_with_assets.c
+++ b/src/testspdy/test_requests_with_assets.c
@@ -226,8 +226,6 @@ parentproc()
                 printf("no daemon\n");
                 return 1;
         }
-        
-        timeout.tv_usec = 0;
 
         do
         {
@@ -239,15 +237,17 @@ parentproc()
                 FD_ZERO(&read_fd_set);
                 FD_ZERO(&write_fd_set);
                 FD_ZERO(&except_fd_set);
-
+    
                 ret = SPDY_get_timeout(daemon, &timeoutlong);
-                if(SPDY_NO == ret || timeoutlong > 1)
+                if(SPDY_NO == ret || timeoutlong > 1000)
                 {
                         timeout.tv_sec = 1;
+      timeout.tv_usec = 0;
                 }
                 else
                 {
-                        timeout.tv_sec = timeoutlong;
+                        timeout.tv_sec = timeoutlong / 1000;
+                        timeout.tv_usec = (timeoutlong % 1000) * 1000;
                 }
                 
                 maxfd = SPDY_get_fdset (daemon,