You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2018/07/24 15:48:45 UTC

[trafficserver] 01/03: Revert "Fix crashes from early post return fix."

This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit cf353b44e04f7711a2dcb319a6276877ec5be7f1
Author: Bryan Call <bc...@apache.org>
AuthorDate: Tue Jul 17 10:01:35 2018 -0400

    Revert "Fix crashes from early post return fix."
    
    This reverts commit c24378848ca8d083aacd69b6365ab65f291e8149.
---
 proxy/http/HttpSM.cc | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index a423123..d27a59a 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -1813,11 +1813,6 @@ HttpSM::state_read_server_response_header(int event, void *data)
   case VC_EVENT_READ_READY:
   case VC_EVENT_READ_COMPLETE:
     // More data to parse
-
-    // If there is still a post body underway, defer processing until post body is done
-    if (ua_entry->in_tunnel && !server_entry->eos) {
-      return 0;
-    }
     break;
 
   case VC_EVENT_ERROR:
@@ -2693,10 +2688,6 @@ HttpSM::tunnel_handler_post(int event, void *data)
     handle_post_failure();
     break;
   case HTTP_SM_POST_UA_FAIL:
-    // Cancel out the server read if present. Left over attempt to read server response.
-    if (server_entry && server_entry->read_vio && server_session && server_entry->read_vio->cont) {
-      server_entry->read_vio = server_session->do_io_read(nullptr, 0, nullptr);
-    }
     break;
   case HTTP_SM_POST_SUCCESS:
     // It's time to start reading the response
@@ -2708,11 +2699,7 @@ HttpSM::tunnel_handler_post(int event, void *data)
       call_transact_and_set_next_state(HttpTransact::HandleRequestBufferDone);
       break;
     }
-    // Read response already setup
-    // Signal if data is waiting
-    if (server_entry->read_vio && server_entry->read_vio->ndone > 0) {
-      handleEvent(VC_EVENT_READ_READY, server_entry->read_vio);
-    }
+    // Read reasponse already setup
     break;
   default:
     ink_release_assert(0);