Changeset 2353

Timestamp:

2001-05-03T11:44:54+12:00 (23 years ago)

Author:

sjboddie

Message:

Fixed a bug in the old fnord code that was causing problems if POST
data was longer than a certain buffer size. While playing with this
I also discovered that POST data fails when using the crippled billsock
version - not sure how to fix that yet.

Location:

trunk/gsdl/src/w32server

Files:

• httpreq.cpp (modified) (5 diffs)
• netio.cpp (modified) (1 diff)

trunk/gsdl/src/w32server/httpreq.cpp

@@ -40 +40 @@
 #include "httpsend.h"
 #include "cgiwrapper.h"
+#include "d_winsock.h"
 
 /*
@@ -183 +184 @@
     //Get Headers
     GetHeadersResult = GetHTTPHeaders(RequestInfo, RequestFields);
+
     //Figure out what version we're dealing with and deal with it
     switch (GetHeadersResult) {
@@ -275 +277 @@
     }
   }
-  
+
   //Only accept requests from HTTP/0.9 or HTTP/1.X clients, we'll
   //assume that anything else will require an upgrade or patch
@@ -385 +387 @@
     RequestFields.ContentLength = atol(RequestFields.ContentLengthStr);
     if (RequestFields.ContentLength > 0) {
-      
+
       //Allocate memory
       RequestFields.Content = new BYTE[RequestFields.ContentLength];
@@ -400 +402 @@
       
       while (NumRecv < RequestFields.ContentLength) {
-    NumRecv = GetData(RequestInfo.ClientSocket,
-              RequestFields.Content + NumRecv,
-              RequestFields.ContentLength - NumRecv,
-              RequestInfo.ThreadNum);
+    NumRecv += GetData(RequestInfo.ClientSocket,
+               RequestFields.Content + NumRecv,
+               RequestFields.ContentLength - NumRecv,
+               RequestInfo.ThreadNum);
     if (NumRecv < 0) return GH_ERROR;
       }
+
+      // It seems to be important on NT that all available data was read
+      // from the socket before the socket is closed (otherwise netscape
+      // throws a "connection reset by peer" error). Since netscape seems
+      // to send a few extra bytes in certain situations we'll make sure we
+      // slurp it all up here.
+      char *tmpbuffer = new char(100);
+      d_recv(RequestInfo.ClientSocket, tmpbuffer, 100, 0);
+      delete tmpbuffer;
+
     }
     else {

trunk/gsdl/src/w32server/netio.cpp

@@ -79 +79 @@
 
   //Clean up Winsock
-  d_WSACleanup() == SOCKET_ERROR;
+  d_WSACleanup();
 }