Merge branch 'removesynccalls' of https://git01.codeplex.com/forks/stevetgates/stgatesdev into development

Author: stgates

Release/src/http/client/http_win7.cpp

@@ -1231,37 +1231,22 @@ class winhttp_client : public _http_client_communicator
                         }
 
                         auto writebuf = p_request_context->_get_writebuffer();
-                        if ( !_check_streambuf(p_request_context, writebuf, _XPLATSTR("Output stream is not open")) )
-                            break;
-
-                        auto after_sync = 
-                            [hRequestHandle, p_request_context]
-                        (pplx::task<void> sync_op)
+                        
+                        if ( p_request_context->is_externally_allocated() )
                         {
-                            try { sync_op.wait(); } catch(...)
-                            {
-                                p_request_context->report_exception(std::current_exception());
-                                return;
-                            }
+                            writebuf.commit(statusInfoLength);
 
                             // Look for more data
-                            if( !WinHttpQueryDataAvailable(hRequestHandle, nullptr))
+                            if (!WinHttpQueryDataAvailable(hRequestHandle, nullptr))
                             {
                                 p_request_context->report_error(GetLastError(), _XPLATSTR("Error querying for http body chunk"));
                                 return;
                             }
-                        };
-
-                        if ( p_request_context->is_externally_allocated() )
-                        {
-                            writebuf.commit(statusInfoLength);
-
-                            writebuf.sync().then(after_sync);
                         }
                         else 
                         {
                             writebuf.putn(p_request_context->m_body_data.get(), statusInfoLength).then(
-                                [hRequestHandle, p_request_context, statusInfoLength, after_sync]
+                                [hRequestHandle, p_request_context, statusInfoLength]
                             (pplx::task<size_t> op)
                             {
                                 size_t written = 0;
@@ -1278,11 +1263,12 @@ class winhttp_client : public _http_client_communicator
                                     return;
                                 }
 
-                                auto wbuf = p_request_context->_get_writebuffer();
-                                if ( !_check_streambuf(p_request_context, wbuf, _XPLATSTR("Output stream is not open")) )
+                                // Look for more data
+                                if (!WinHttpQueryDataAvailable(hRequestHandle, nullptr))
+                                {
+                                    p_request_context->report_error(GetLastError(), _XPLATSTR("Error querying for http body chunk"));
                                     return;
-
-                                wbuf.sync().then(after_sync);
+                                }
                             });
                         }
                     }