kuri pushed a commit to branch ecore-1.7.
commit 4b885b9b24de9e188c861422d7d2738b49359d22
Author: Guillaume Friloux <[email protected]>
Date: Wed Jul 17 09:49:36 2013 +0200
This patch fixes ecore_con_server_timeout().
This function was correctly updating the value of the timeout, but left
the timer intact.
Exemples to reproduce the bug and test the fix are available here :
- client.c :
http://0bin.net/paste/hl1B6jFi8VS7aEY-#YJU+p1XXH/hszP+GhqRF7agclc0NQxZg75557NYpgLo=
- server.c :
http://0bin.net/paste/GWytBP1bZQw+MoQ1#L4T8OMUt/mfZYptZbAJbe7X5LZNAP+cGUvaUmQD6fPo=
I looked quickly at the test units for ecore_con and i fear to break a
test by doing the necessary modifications to validate this one.
Can anybody that knows about it can update the test unit to handle this
fix ?
---
ChangeLog | 4 ++++
NEWS | 1 +
src/lib/ecore_con/ecore_con.c | 2 ++
3 files changed, 7 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 4963f84..a8b4924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1181,3 +1181,7 @@
2013-05-24 Daniel Willmann
* Fix srv->start_time (initialization missing). So now
ecore_con_server_uptime_get() is working for plain TCP connections.
+
+2013-07-17 Guillaume Friloux
+ * Fix ecore_con_server_timeout_set(). It was changing the
+ timeout value, but not the timer.
diff --git a/NEWS b/NEWS
index 2dc4c1a..636e24f 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ Fixes:
ecore_con_client_uptime_get() is working.
* Fix srv->start_time (initialization missing). So now
ecore_con_server_uptime_get() is working for plain TCP connections.
+ * Fix use of ecore_con_server_timeout_set() that doesnt refresh the timer.
Ecore 1.7.7
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 158e1b9..01c9767 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -562,6 +562,8 @@ ecore_con_server_timeout_set(Ecore_Con_Server *svr,
svr->client_disconnect_time = timeout;
else
svr->disconnect_time = timeout;
+
+ _ecore_con_server_timer_update(svr);
}
EAPI double
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
