remove force on session clear

diff --git a/ChangeLog b/ChangeLog
index 90aca10a212f80c51a0a8b53b108f998ad7ad882..88fb81eace291621dd1ef7fd043df873605fc1cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@
 -- patched session clear flushed to be forced
 -- fixed up --dump-defaults so that it can be validated unedited
 -- fixed normalizer init of flow
+-- pulled latest from Tom
+-- removed force from session clear
 
 125
 -- discovered can't catch exceptions thrown from Lua to C++; need to

diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index 2491ef831d177494b69113a97009159c84c40975..dc29366cfefa7585ab94128b156dc93097c334ed 100644 (file)
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -5737,10 +5737,7 @@ dupfin:
                         "flushing FROM_SERVER\n"););
             if(talker->seg_bytes_logical)
             {
-                // FIXIT-H temporary force to work around nhttp
-                talker->flags |= TF_FORCE_FLUSH;
                 uint32_t flushed = flush_stream(tcpssn, talker, p, PKT_FROM_CLIENT);
-                talker->flags &= ~TF_FORCE_FLUSH;
 
                 if(flushed)
                 {
@@ -5752,10 +5749,7 @@ dupfin:
 
             if(listener->seg_bytes_logical)
             {
-                // FIXIT-H temporary force to work around nhttp
-                listener->flags |= TF_FORCE_FLUSH;
                 uint32_t flushed = flush_stream(tcpssn, listener, p, PKT_FROM_SERVER);
-                listener->flags &= ~TF_FORCE_FLUSH;
 
                 if(flushed)
                 {
@@ -5770,10 +5764,7 @@ dupfin:
                         "flushing FROM_CLIENT\n"););
             if(listener->seg_bytes_logical)
             {
-                // FIXIT-H temporary force to work around nhttp
-                listener->flags |= TF_FORCE_FLUSH;
                 uint32_t flushed = flush_stream(tcpssn, listener, p, PKT_FROM_CLIENT);
-                listener->flags &= ~TF_FORCE_FLUSH;
 
                 if(flushed)
                 {
@@ -5784,10 +5775,7 @@ dupfin:
 
             if(talker->seg_bytes_logical)
             {
-                // FIXIT-H temporary force to work around nhttp
-                talker->flags |= TF_FORCE_FLUSH;
                 uint32_t flushed = flush_stream(tcpssn, talker, p, PKT_FROM_SERVER);
-                talker->flags &= ~TF_FORCE_FLUSH;
 
                 if(flushed)
                 {