Fixed bug in HTTP: interrupt receiving data

awwit · awwit · commit d23825802feb · 2017-11-11T19:50:46.000+03:00
diff --git a/projects/qt-creator/httpserverapp.qbs.user b/projects/qt-creator/httpserverapp.qbs.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.3.1, 2017-07-28T00:45:22. -->
+<!-- Written by QtCreator 4.4.0, 2017-11-11T18:51:53. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -111,6 +111,7 @@
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Отладка</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qbs.QbsBuildConfiguration</value>
+    <value type="QString" key="Qbs.configName">qtc_Desktop_d1177e0c-debug</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
     <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/media/projects/httpserverapp/build</value>
@@ -157,6 +158,7 @@
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Выпуск</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qbs.QbsBuildConfiguration</value>
+    <value type="QString" key="Qbs.configName">qtc_Desktop_d1177e0c-release</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
diff --git a/src/socket/AdapterTls.cpp b/src/socket/AdapterTls.cpp
@@ -112,9 +112,16 @@ namespace Socket
 	//	::gnutls_record_set_timeout(this->session, static_cast<const unsigned int>(timeout.count() ) );
 
 		Socket sock(this->get_handle() );
-		sock.nonblock_recv_sync();
 
-		return ::gnutls_record_recv(this->session, buf, length);
+		long result;
+
+		do {
+			sock.nonblock_recv_sync();
+			result = ::gnutls_record_recv(this->session, buf, length);
+		}
+		while (result == GNUTLS_E_AGAIN || result == GNUTLS_E_INTERRUPTED);
+
+		return result;
 	}
 
 	long AdapterTls::nonblock_send(const void *buf, const size_t length, const std::chrono::milliseconds &timeout) const noexcept {
diff --git a/src/socket/Socket.cpp b/src/socket/Socket.cpp
@@ -294,7 +294,7 @@ namespace Socket
 	#ifdef WIN32
 		WSAPOLLFD event = {
 			this->socket_handle,
-			POLLRDNORM | POLLRDBAND,
+			POLLIN,
 			0
 		};
 
@@ -344,12 +344,12 @@ namespace Socket
 	#ifdef WIN32
 		WSAPOLLFD event = {
 			socket_handle,
-			POLLWRNORM,
+			POLLOUT,
 			0
 		};
 
 		while (total < length) {
-			if (1 == ::WSAPoll(&event, 1, static_cast<::INT>(timeout.count() ) ) && event.revents & POLLWRNORM) {
+			if (1 == ::WSAPoll(&event, 1, static_cast<::INT>(timeout.count() ) ) && event.revents & POLLOUT) {
 				const long send_size = ::send(socket_handle, reinterpret_cast<const char *>(data) + total, static_cast<const int>(length - total), 0);
 
 				if (send_size < 0) {
@@ -402,7 +402,7 @@ namespace Socket
 	#ifdef WIN32
 		WSAPOLLFD event = {
 			this->socket_handle,
-			POLLWRNORM,
+			POLLOUT,
 			0
 		};
 
