Fixed X-Sendfile for directory (infinite loop) in partial get request

awwit · awwit · commit 88dea46f8e1c · 2015-03-27T18:10:32.000+03:00
diff --git a/httpserver.pro.user b/httpserver.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.2.2, 2015-03-27T17:50:48. -->
+<!-- Written by QtCreator 3.2.2, 2015-03-27T18:07:52. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -61,7 +61,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{c77ee4a2-1c2a-4bac-9185-8378ec4ebf5d}</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
diff --git a/httpserver/Server.cpp b/httpserver/Server.cpp
@@ -226,7 +226,7 @@ namespace HttpServer
 
 					send_size_left -= send_size;
 				}
-				while (false == file.eof() && std::numeric_limits<size_t>::max() != send_size && send_size_left);
+				while (false == file.eof() && false == file.fail() && std::numeric_limits<size_t>::max() != send_size && send_size_left);
 			}
 		}
 
@@ -348,7 +348,7 @@ namespace HttpServer
 				file.read(reinterpret_cast<char *>(buf.data() ), buf.size() );
 				send_size = clientSocket.nonblock_send(buf, file.gcount(), timeout);
 			}
-            while (false == file.eof() && false == file.fail() && std::numeric_limits<size_t>::max() != send_size);
+			while (false == file.eof() && false == file.fail() && std::numeric_limits<size_t>::max() != send_size);
 		}
 
 		file.close();

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ namespace HttpServer`
`226`	`226`
`227`	`227`	`send_size_left -= send_size;`
`228`	`228`	`}`
`229`		`- while (false == file.eof() && std::numeric_limits<size_t>::max() != send_size && send_size_left);`
	`229`	`+ while (false == file.eof() && false == file.fail() && std::numeric_limits<size_t>::max() != send_size && send_size_left);`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`
`@@ -348,7 +348,7 @@ namespace HttpServer`
`348`	`348`	`file.read(reinterpret_cast<char *>(buf.data() ), buf.size() );`
`349`	`349`	`send_size = clientSocket.nonblock_send(buf, file.gcount(), timeout);`
`350`	`350`	`}`
`351`		`- while (false == file.eof() && false == file.fail() && std::numeric_limits<size_t>::max() != send_size);`
	`351`	`+ while (false == file.eof() && false == file.fail() && std::numeric_limits<size_t>::max() != send_size);`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`file.close();`