Changeset 2280 for trunk/gsdl/src/w32server/cgiwrapper.cpp

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.

File:

• trunk/gsdl/src/w32server/cgiwrapper.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);