Changeset 2280

Timestamp:

2001-04-04T22:37:36+12:00 (23 years ago)

Author:

sjboddie

Message:

In the process of making some changes to the old fnord webserver code.
Note that this version is BROKEN, I just committed it so I could continue
the work I've been doing on my home PC at work.

Location:

trunk/gsdl/src/w32server

Files:

• cgiwrapper.cpp (modified) (1 diff)
• cgiwrapper.h (modified) (1 diff)
• httpreq.cpp (modified) (2 diffs)
• httpreq.h (modified) (3 diffs)
• httpsend.cpp (modified) (1 diff)

trunk/gsdl/src/w32server/cgiwrapper.cpp

@@ -766 +766 @@
 }
 
-int ExamineURIStr(char *URIStr, RequestInfoT *RequestInfo,
+int ExamineURIStr(text_t &URIStr, RequestInfoT *RequestInfo,
           RequestFieldsT *RequestFields)
 {
   char *protocol, *machine, *rest;  int port;
-  char URICopyA[MAX_URL_SIZE], URICopyB[MAX_URL_SIZE];
+  //  char URICopyA[MAX_URL_SIZE], URICopyB[MAX_URL_SIZE];
 
   if (RequestFields->ContentLength > 0) {
     // POST data
-    int len = strlen (URIStr);
+    URIStr.push_back('?');
+    URIStr += (char*)RequestFields->Content;
+
+    //    int len = strlen (URIStr);
     // fail relatively gracefully (and mysteriously) if POST 
     // arguments are too long
-    if (len + RequestFields->ContentLength + 1 <= MAX_URL_SIZE) {
-      URIStr[len] = '?'; len ++;
-      for (int i = 0; i < RequestFields->ContentLength; i++) {
-    URIStr[len] = RequestFields->Content[i];
-    len ++;
-      }
-      URIStr[len] = '\0';
-    } else {
-      MessageBox (NULL, "POST data too long", "Greenstone Digital Library Software", MB_OK);
-    }
-  }
-
-  strcpy(URICopyA,URIStr);
+    //    if (len + RequestFields->ContentLength + 1 <= MAX_URL_SIZE) {
+    //      URIStr[len] = '?'; len ++;
+    //      for (int i = 0; i < RequestFields->ContentLength; i++) {
+    //  URIStr[len] = RequestFields->Content[i];
+    //  len ++;
+    //      }
+    //      URIStr[len] = '\0';
+    //    } else {
+    //      MessageBox (NULL, "POST data too long", "Greenstone Digital Library Software", MB_OK);
+    //    }
+  }
+  
+  char *URICopyA = URIStr.getcstr();
+  char URICopyB[MAX_URL_SIZE];
+  char *URICopytmp = URIStr.getcstr();
+
+    //  strcpy(URICopyA,URIStr);
   
   if (parse_url(URICopyA,&protocol,&machine,&port,&rest)!=http_ok) {
     /* Alter local file request to address 'gsdl' */
-    fix_prefix(URICopyB, "http://gsdl", URIStr);
+    //    fix_prefix(URICopyB, "http://gsdl", URIStr);
+    fix_prefix(URICopyB, "http://gsdl", URICopytmp);
     URIStr = URICopyB;
     strcpy(URICopyA, URICopyB);

trunk/gsdl/src/w32server/cgiwrapper.h

@@ -34 +34 @@
 extern int libaccessnum;
 
-int ExamineURIStr(char *URIStr,RequestInfoT *RequestInfo,
+int ExamineURIStr(text_t &URIStr,RequestInfoT *RequestInfo,
           RequestFieldsT *RequestFields);
 

trunk/gsdl/src/w32server/httpreq.cpp

@@ -245 +245 @@
     //No version, assume simple request
     //part after method is URI
-    memcpy(RequestFields.URIStr, CurLine + End, strlen(CurLine) + 1 - End);
+    for (int i = 0; i < strlen(CurLine); i++) {
+      RequestFields.URIStr.push_back(CurLine[i]);
+    }
     return GH_SIMPLE_REQUEST;
   }
@@ -252 +254 @@
   //<Method> <WhiteSpace> <URI> <WhiteSpace> <Version> <CRLF>
   //                  End^             Start^
-  int URIStrLen = Start - End;;
-  if (URIStrLen > ReqURIStrLen-1) URIStrLen = ReqURIStrLen - 1;
-  memcpy(RequestFields.URIStr, CurLine + End, URIStrLen);
-  RequestFields.URIStr[URIStrLen] = 0;
-  TrimRight(RequestFields.URIStr); //Remove trailing space
+  text_t spacebuffer;
+  for (int i = End; i < Start; i++) {
+    // do this to remove trailing space
+    if (CurLine[i] == ' ') {
+      spacebuffer.push_back(' ');
+    } else {
+      if (!spacebuffer.empty()) {
+    RequestFields.URIStr += spacebuffer;
+    spacebuffer.clear();
+      }
+      RequestFields.URIStr.push_back(CurLine[i]);
+    }
+  }
   
   //Only accept requests from HTTP/0.9 or HTTP/1.X clients, we'll

trunk/gsdl/src/w32server/httpreq.h

@@ -3 +3 @@
 
 #include "locate.h"
+#include "text_t.h"
 
 /*
@@ -43 +44 @@
 //Length constants for RequestFieldsT
 #define ReqMethodStrLen           24
-#define ReqURIStrLen             255
+//#define ReqURIStrLen             255
 #define ReqVersionStrLen          24
 #define ReqDateStrLen             48
@@ -69 +70 @@
 
 struct RequestHeaderT {
-    char *Var;
-   char *Val;
-    };
+  char *Var;
+  char *Val;
+};
 
 struct RequestFieldsT {
-    //Simple request line info v0.9
-    char MethodStr[ReqMethodStrLen];
+  //Simple request line info v0.9
+  char MethodStr[ReqMethodStrLen];
   //    char URIStr[ReqURIStrLen];
-    char URIStr[MAX_URL_SIZE];
-    //added v1.0
-    char VersionStr[ReqVersionStrLen];
-    //General Header
-    char DateStr[ReqDateStrLen];
-    char MIMEVerStr[ReqMIMEVerStrLen];
-    char PragmaStr[ReqPragmaStrLen];
-    //Request Header
-    char AuthorizationStr[ReqAuthorizationStrLen];
-    char FromStr[ReqFromStrLen];
-    char IfModSinceStr[ReqIfModSinceStrLen];
-    char RefererStr[ReqRefererStrLen];
-    char UserAgentStr[ReqUserAgentStrLen];
-    //Entity Header (Only CGI stuff)
-    char ContentEncodingStr[ReqContentEncodingStrLen];
-    char ContentTypeStr[ReqContentTypeStrLen];
-    char ContentLengthStr[ReqContentLengthStrLen];
-   //v1.0 Optional (the more common ones)
-   char AcceptStr[ReqAcceptStrLen];
-   char AcceptLangStr[ReqAcceptLangStrLen];
-    //v1.1 Exentions
-    char ConnectionStr[ReqConnectionStrLen];
-    //Pointer to buffer containing the content
-    DWORD ContentLength;
-    BYTE *Content;
-
-    //Authorized user, filled in if a user is authorized from Auth..Str above
-    char AuthorizedUserStr[ReqAuthorizedUserStrLen];
-
-   //CGI style fields
-   char PathInfoStr[ReqPathInfoStrLen];
-   char PathTranslatedStr[ReqPathTranslatedStrLen];
-   char ScriptNameStr[ReqScriptNameStrLen];
-
-   //Other Headers
-   int NumOtherHeaders;
-   RequestHeaderT OtherHeaders[MAX_OTHER_HEADERS];
-    };
+  text_t URIStr;
+  //added v1.0
+  char VersionStr[ReqVersionStrLen];
+  //General Header
+  char DateStr[ReqDateStrLen];
+  char MIMEVerStr[ReqMIMEVerStrLen];
+  char PragmaStr[ReqPragmaStrLen];
+  //Request Header
+  char AuthorizationStr[ReqAuthorizationStrLen];
+  char FromStr[ReqFromStrLen];
+  char IfModSinceStr[ReqIfModSinceStrLen];
+  char RefererStr[ReqRefererStrLen];
+  char UserAgentStr[ReqUserAgentStrLen];
+  //Entity Header (Only CGI stuff)
+  char ContentEncodingStr[ReqContentEncodingStrLen];
+  char ContentTypeStr[ReqContentTypeStrLen];
+  char ContentLengthStr[ReqContentLengthStrLen];
+  //v1.0 Optional (the more common ones)
+  char AcceptStr[ReqAcceptStrLen];
+  char AcceptLangStr[ReqAcceptLangStrLen];
+  //v1.1 Exentions
+  char ConnectionStr[ReqConnectionStrLen];
+  //Pointer to buffer containing the content
+  DWORD ContentLength;
+  BYTE *Content;
+  
+  //Authorized user, filled in if a user is authorized from Auth..Str above
+  char AuthorizedUserStr[ReqAuthorizedUserStrLen];
+  
+  //CGI style fields
+  char PathInfoStr[ReqPathInfoStrLen];
+  char PathTranslatedStr[ReqPathTranslatedStrLen];
+  char ScriptNameStr[ReqScriptNameStrLen];
+  
+  //Other Headers
+  int NumOtherHeaders;
+  RequestHeaderT OtherHeaders[MAX_OTHER_HEADERS];
+};
 
 struct RequestInfoT {
-    int ThreadNum;
-
-    //Buffer for IO operations (so we're not constantly reallocating buffers)
-    BYTE *IOBuffer;
-   int IOBufferSize;
-
-    //Socket the request is on and its address
-    SOCKET ClientSocket;
-    SOCKADDR_IN ClientSockAddr;
-    int AddrLen;
-
-    //Should we keep the connection alive?
-    BOOL KeepAlive;
-    };
+  int ThreadNum;
+  
+  //Buffer for IO operations (so we're not constantly reallocating buffers)
+  BYTE *IOBuffer;
+  int IOBufferSize;
+  
+  //Socket the request is on and its address
+  SOCKET ClientSocket;
+  SOCKADDR_IN ClientSockAddr;
+  int AddrLen;
+  
+  //Should we keep the connection alive?
+  BOOL KeepAlive;
+};
 
 

trunk/gsdl/src/w32server/httpsend.cpp

@@ -24 +24 @@
 #include <memory.h>
 #pragma hdrstop
-#include "parse.h"
 #include "netio.h"
 #include "httpreq.h"