Commit b0fbda6b authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6220

parent d86c807a
OpenLDAP 2.4 Change Log OpenLDAP 2.4 Change Log
OpenLDAP 2.4.18 Engineering OpenLDAP 2.4.18 Engineering
Fixed slapd incorrectly applying writetimeout when not set (ITS#6220)
OpenLDAP 2.4.17 Release (2009/07/13) OpenLDAP 2.4.17 Release (2009/07/13)
Fixed liblber to use ber_strnlen (ITS#6080) Fixed liblber to use ber_strnlen (ITS#6080)
......
...@@ -249,7 +249,7 @@ int connections_timeout_idle(time_t now) ...@@ -249,7 +249,7 @@ int connections_timeout_idle(time_t now)
i++; i++;
continue; continue;
} }
if ( c->c_writewaiter ) { if ( c->c_writewaiter && global_writetimeout ) {
writers = 1; writers = 1;
if( difftime( c->c_activitytime+global_writetimeout, now) < 0 ) { if( difftime( c->c_activitytime+global_writetimeout, now) < 0 ) {
/* close it */ /* close it */
...@@ -260,7 +260,7 @@ int connections_timeout_idle(time_t now) ...@@ -260,7 +260,7 @@ int connections_timeout_idle(time_t now)
} }
} }
connection_done( c ); connection_done( c );
if ( !writers ) if ( old && !writers )
slapd_clr_writetime( old ); slapd_clr_writetime( old );
return i; return i;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment