spdy: change SPDY_get_timeout to give not seconds but milliseconds as it used to be

3 files changed, 16 insertions, 28 deletions

diff --git a/src/examples/spdy_event_loop.c b/src/examples/spdy_event_loop.c
index a716028f..e5e2a5b1 100644
--- a/src/examples/spdy_event_loop.c
+++ b/src/examples/spdy_event_loop.c
@@ -337,22 +337,17 @@ main (int argc, char *const *argv)
                 FD_ZERO(&except_fd_set);
 
                 ret = SPDY_get_timeout(daemon, &timeoutlong);
-                //printf("tout %i\n",timeoutlong);
-                if(SPDY_NO == ret || timeoutlong > 1)
-                { 
-                        //do sth else
-                        //sleep(1);
-
-                        //try new connection
+                if(SPDY_NO == ret || timeoutlong > 1000)
+                {
                         timeout.tv_sec = 1;
-                        timeout.tv_usec = 0;
+      timeout.tv_usec = 0;
                 }
                 else
                 {
-                        timeout.tv_sec = timeoutlong;
-                        timeout.tv_usec = 0;//(timeoutlong % 1000) * 1000;
+                        timeout.tv_sec = timeoutlong / 1000;
+                        timeout.tv_usec = (timeoutlong % 1000) * 1000;
                 }
-
+    
                 printf("ret=%i; timeoutlong=%i; sec=%i; usec=%i\n", ret, timeoutlong, timeout.tv_sec, timeout.tv_usec);
                 //raise(SIGINT);
 
diff --git a/src/examples/spdy_fileserver.c b/src/examples/spdy_fileserver.c
index eea0930e..f2b8f7b0 100644
--- a/src/examples/spdy_fileserver.c
+++ b/src/examples/spdy_fileserver.c
@@ -287,7 +287,6 @@ main (int argc, char *const *argv)
         }
         
         basedir = argv[3];
-        timeout.tv_usec = 0;
 
         do
         {
@@ -296,17 +295,15 @@ main (int argc, char *const *argv)
                 FD_ZERO(&except_fd_set);
 
                 ret = SPDY_get_timeout(daemon, &timeoutlong);
-                if(SPDY_NO == ret || timeoutlong > 1)
-                { 
-                        //do sth else
-                        //sleep(1);
-
-                        //try new connection
+                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,
diff --git a/src/examples/spdy_response_with_callback.c b/src/examples/spdy_response_with_callback.c
index 21085c78..1a029a64 100644
--- a/src/examples/spdy_response_with_callback.c
+++ b/src/examples/spdy_response_with_callback.c
@@ -180,8 +180,6 @@ main (int argc, char *const *argv)
                 return 1;
         }
         
-        timeout.tv_usec = 0;
-        
         do
         {
                 FD_ZERO(&read_fd_set);
@@ -189,17 +187,15 @@ main (int argc, char *const *argv)
                 FD_ZERO(&except_fd_set);
 
                 ret = SPDY_get_timeout(daemon, &timeoutlong);
-                if(SPDY_NO == ret || timeoutlong > 1)
-                { 
-                        //do sth else
-                        //sleep(1);
-
-                        //try new connection
+                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,